Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

base-files: add the upstream version both to the artifact_version and the reversioned; possibly fixes #5702 #5766

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Oct 2, 2023

base-files: add the upstream version both to the artifact_version and the reversioned; possibly fixes #5702

… the reversioned; possibly fixes armbian#5702

- OCI tags can't have "+" or "~" so replace those with "--" before using in OCI tag
- apt (repo) version will have whatever upstream has, including "+" and/or "~"
@rpardini
Copy link
Member Author

rpardini commented Oct 2, 2023

This needs extensive testing in BETA repo before being pushed to stable

@rpardini rpardini marked this pull request as ready for review October 2, 2023 21:07
@rpardini rpardini requested a review from a team as a code owner October 2, 2023 21:07
Copy link
Member

@igorpecovnik igorpecovnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets test in beta then

@igorpecovnik igorpecovnik added the Ready to merge Reviewed, tested and ready for merge label Oct 3, 2023
@igorpecovnik igorpecovnik merged commit 1dfc8da into armbian:main Oct 3, 2023
5 checks passed
@adeepn
Copy link
Member

adeepn commented Oct 3, 2023

@rpardini
Maybe change from
B${bash_hash_short}-U${base_files_cleaned_upstream_version_tag}
to
U${base_files_cleaned_upstream_version_tag}-B${bash_hash_short}
?

@rpardini
Copy link
Member Author

@rpardini
Maybe change from
B${bash_hash_short}-U${base_files_cleaned_upstream_version_tag}
to
U${base_files_cleaned_upstream_version_tag}-B${bash_hash_short}
?

Could be, but

  1. why?
  2. does not impact final packages, since hash version is not used in final version

@adeepn
Copy link
Member

adeepn commented Nov 27, 2023

@rpardini
Maybe change from
B${bash_hash_short}-U${base_files_cleaned_upstream_version_tag}
to
U${base_files_cleaned_upstream_version_tag}-B${bash_hash_short}
?

Could be, but

  1. why?
  2. does not impact final packages, since hash version is not used in final version

semver sorting based on tag first, then unsorted hash

@rpardini
Copy link
Member Author

semver sorting based on tag first, then unsorted hash

There is no semver sorting of any sort (pun) done on hashes, since reversioning was introduced a few months ago.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready to merge Reviewed, tested and ready for merge
Development

Successfully merging this pull request may close these issues.

base-files package version string prevents full Debian distro upgrades
3 participants