diff options
| author | Paul Spooren <mail@aparcar.org> | 2024-03-17 18:43:10 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2024-03-22 22:14:22 +0100 |
| commit | e8725a932e16eaf6ec51add8c084d959cbe32ff2 (patch) | |
| tree | 1e6e0a3731bf9c4860b6d13fa08bea226f999a6f /include | |
| parent | 36acf88fe0d974a7de5c3be5d3303048c54ce6fb (diff) | |
| download | openwrt-e8725a932e16eaf6ec51add8c084d959cbe32ff2.tar.gz openwrt-e8725a932e16eaf6ec51add8c084d959cbe32ff2.tar.bz2 openwrt-e8725a932e16eaf6ec51add8c084d959cbe32ff2.zip | |
treewide: use APK compatible version schema
Different from OPKG, APK uses a deterministic version schema which chips
the version into chunks and compares them individually. This enforces a
certain schema which was previously entirely flexible.
- Releases are added at the very and end prefixed with an `r` like
`1.2.3-r3`.
- Hashes are prefixed with a `~` like `1.2.3~abc123`.
- Dates become semantic versions, like `2024.04.01`
- Extra tags are possible like `_git`, `_alpha` and more.
For full details see the APK test list:
https://gitlab.alpinelinux.org/alpine/apk-tools/-/blob/master/test/version.data
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/download.mk | 2 | ||||
| -rw-r--r-- | include/kernel.mk | 4 | ||||
| -rw-r--r-- | include/package-defaults.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/download.mk b/include/download.mk index e261b14035..d9edcb1c3a 100644 --- a/include/download.mk +++ b/include/download.mk @@ -10,7 +10,7 @@ LEDE_GIT = $(PROJECT_GIT) ifdef PKG_SOURCE_VERSION ifndef PKG_VERSION - PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION)) + PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(subst -,.,$(PKG_SOURCE_DATE)),0)~$(call version_abbrev,$(PKG_SOURCE_VERSION)) endif PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz diff --git a/include/kernel.mk b/include/kernel.mk index 8236416132..9969c519dd 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -211,8 +211,8 @@ define KernelPackage SECTION:=kernel CATEGORY:=Kernel modules DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)) - VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE)) + VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),.$(PKG_VERSION))-r$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) PKGFLAGS:=$(PKGFLAGS) $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(BOARD)) diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 392aad0d5d..37de9f0ccb 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,7 +23,7 @@ define Package/Default SOURCE:=$(patsubst $(TOPDIR)/%,%,$(patsubst $(TOPDIR)/package/%,feeds/base/%,$(CURDIR))) ifneq ($(PKG_VERSION),) ifneq ($(PKG_RELEASE),) - VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) + VERSION:=$(PKG_VERSION)-r$(PKG_RELEASE) else VERSION:=$(PKG_VERSION) endif |