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.

Sign up for GitHub

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

Jump to bottom

openssh: Use apk-compatible versioning #24906

Merged
merged 1 commit into from
Sep 5, 2024
Merged

openssh: Use apk-compatible versioning #24906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions net/openssh/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=openssh
PKG_VERSION:=9.8p1
PKG_REALVERSION:=9.8p1
PKG_VERSION:=9.8_p1
Copy link
Contributor

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))

Copy link
Contributor Author

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...

Copy link
Contributor

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.

Copy link
Contributor Author

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.

packages/.github/workflows/check-apk-valid-version.yml

Line 56 in f9b1adf

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.

PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
PKG_HASH:=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)-$(PKG_REALVERSION)

PKG_LICENSE:=BSD ISC
PKG_LICENSE_FILES:=LICENCE
Expand Down