-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
openssh: Use apk-compatible versioning #24906
Conversation
OpenWrt will change to the APK package manager which requires The PKG_RELEASE should be an integer and not contain any letters or special characters.
|
@aparcar
in router the version is tested ok by apk, (and the OpenWrt build system also accepted it into the image)
The CI apparently does not evaluate a calculated PKG_VERSION correctly... |
Adjust openssh's versioning to be compatible with apk: 8.9p1-r2 --> 8.9_p1-r2 "_p" is an allowed semantic suffix, so use that. (Alternative might have been 8.9.1-r2) Signed-off-by: Hannu Nyman <[email protected]>
@@ -8,13 +8,15 @@ | |||
include $(TOPDIR)/rules.mk | |||
|
|||
PKG_NAME:=openssh | |||
PKG_VERSION:=9.8p1 | |||
PKG_REALVERSION:=9.8p1 | |||
PKG_VERSION:=9.8_p1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PKG_VERSION:=$(subst p,_p,$(PKG_REALVERSION))
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my original approach in e655193, but CI rejected it, so I moved to manual strategy to avoid CI trouble in future...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm? That should evaluate to the same thing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, in actual make it does evaluate ok (and was ok in my original commit), but the CI workflow takes the string from Makefile as it is, and passes it to apk for verification, so using variables fails in CI.
PKG_VERSION=$(grep -E '^PKG_VERSION' "$ROOT/Makefile" | cut -f 2 -d '=') |
I had it with "subst" in e655193 , but dropped that to avoid CI trouble in all forthcoming version upgrades.
Adjust openssh's versioning to be compatible with apk: 8.9p1-r2 --> 8.9_p1-r2
"_p" is an allowed semantic suffix, so use that, although the p in upstream versioning means "portable" instead of patch level.
(Alternative might have been 8.9.1-r2)
PKG_REALVERSION will have the upstream version and internal PKG_VERSION is calculated from that.
Maintainer: nobody
Compile & run tested: mediatek/filogic MT6000 r27279-8b6c63cfaf