From 1ae543092a44d5ea5754f9cf4913a5a68baf4537 Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Mon, 24 Jun 2024 20:33:28 -0400 Subject: [PATCH] treewide: Refactor for APK based builds Update to comply with APK's `pkgver` format. Rather than stick with the same convention as upstream `qca-ssdk` and `qca-nss-dp` which uses: ``` $(PKG_NAME)-$(PKG_SOURCE_DATE)~$(PKG_SOURCE_VERSION) ``` i.e. `qca-ssdk-2024.06.13~c451136b.tar.zst` Add in the QSDK version as part of the release since we have options to build for both 11.4 and 12.5. This makes it easier to debug build related issues, by knowing exactly which QSDK version is being built against. Example: ``` qca-nss-drv-11.4.0.5.2021.06.24~dc14ca2.tar.zst qca-nss-drv-12.5.2024.04.06~53a0dc1.tar.zst qca-nss-clients-11.4.0.5.2021.08.17~153998d.tar.zst qca-nss-clients-12.5.2024.03.05~9a53b18.tar.zst ``` Signed-off-by: Sean Khan --- qca-mcs/Makefile | 4 ++-- qca-nss-cfi/Makefile | 4 ++-- qca-nss-clients/Makefile | 8 ++++---- qca-nss-crypto/Makefile | 4 ++-- qca-nss-drv/Makefile | 8 ++++---- qca-nss-ecm/Makefile | 4 ++-- qca-nss-macsec/Makefile | 6 ++++-- qca-ssdk-shell/Makefile | 4 ++-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/qca-mcs/Makefile b/qca-mcs/Makefile index 14393af..fb6eb49 100644 --- a/qca-mcs/Makefile +++ b/qca-mcs/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-mcs.git PKG_SOURCE_DATE:=2024-02-27 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=26d6424 -PKG_MIRROR_HASH:=29378ca75358d85ab04d0f7c5c63988bac4a02477ba29f983085ff99fc4f337e +PKG_MIRROR_HASH:=e13993cb5bfb5e0b6a2fd790c079009f8c6fbf74c93d93c1e19690b70865919d QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 diff --git a/qca-nss-cfi/Makefile b/qca-nss-cfi/Makefile index fed8c16..844769b 100644 --- a/qca-nss-cfi/Makefile +++ b/qca-nss-cfi/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-cfi.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-12-15 PKG_SOURCE_VERSION:=5cd07ce -PKG_MIRROR_HASH:=2f13bf2c61a2da1cdb61a6dbeceb731c0b934388d53c0c84d278de3f9f6359fd +PKG_MIRROR_HASH:=852129b4bc2a14e05c8a27e9c8904f9b7647a8aeeeaa764fd3747b5b5e441a0b QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 diff --git a/qca-nss-clients/Makefile b/qca-nss-clients/Makefile index bd408ea..79c63fd 100644 --- a/qca-nss-clients/Makefile +++ b/qca-nss-clients/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2024-03-05 PKG_SOURCE_VERSION:=9a53b18 -PKG_MIRROR_HASH:=79560a2e89147b19b9d76fbecbca867d66acf37b8ae0911b745ae98d1dfb46cb +PKG_MIRROR_HASH:=6d60fa6d8d373bc28fbebc72b331e7d4e0c831cd4821106e255c9ad506499f90 QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 @@ -54,10 +54,10 @@ PKG_CONFIG_DEPENDS:=\ ifdef CONFIG_NSS_FIRMWARE_VERSION_11_4 PKG_SOURCE_DATE:=2021-08-17 PKG_SOURCE_VERSION:=153998d -PKG_MIRROR_HASH:=14b6a954c0a6e5ed43f4378edecaa2c83444f27236d0a29fb6780ef1f67ec599 +PKG_MIRROR_HASH:=57511079f6ab5cfd17769e03ca60b7ed5f7ea87cbf3b7d610c08b8ab43c6c5a5 PATCH_DIR:=$(CURDIR)/patches-11.4 QSDK_VERSION:=11.4.0.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) endif include $(INCLUDE_DIR)/kernel.mk diff --git a/qca-nss-crypto/Makefile b/qca-nss-crypto/Makefile index 662fd1d..c099903 100644 --- a/qca-nss-crypto/Makefile +++ b/qca-nss-crypto/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-crypto.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-12-15 PKG_SOURCE_VERSION:=3c5a574 -PKG_MIRROR_HASH:=9788743ad04c552c743380ced2c95b1a819024b205c91f4c224b9dbb85472a9c +PKG_MIRROR_HASH:=a195ba22016d91cd1711fe8f5167d65cfbd03feee5a9089929cb0d2180bf4047 QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 diff --git a/qca-nss-drv/Makefile b/qca-nss-drv/Makefile index e3841cf..436db61 100644 --- a/qca-nss-drv/Makefile +++ b/qca-nss-drv/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2024-04-06 PKG_SOURCE_VERSION:=53a0dc1 -PKG_MIRROR_HASH:=51f27c886863acaca308ff24fb57a3c776e3c3dd84360a752cb5359a5f47a9e0 +PKG_MIRROR_HASH:=9b7774407f950f4ae8390e77e67ecdbeb0af5575191645666a0b5caa6e3bd413 QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 PKG_FLAGS:=nonshared @@ -64,10 +64,10 @@ PKG_CONFIG_DEPENDS:= \ ifdef CONFIG_NSS_FIRMWARE_VERSION_11_4 PKG_SOURCE_DATE:=2021-06-24 PKG_SOURCE_VERSION:=dc14ca2 -PKG_MIRROR_HASH:=46c668194fbceb6308458c10df80c5a60c143151b2b6f8737a9d40e70b6d4617 +PKG_MIRROR_HASH:=11bff5afcf6037a4f79fc212a50ed42dbe6db5f93099050a5b3f55d85f5279ad PATCH_DIR:=$(CURDIR)/patches-11.4 QSDK_VERSION:=11.4.0.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) endif include $(INCLUDE_DIR)/kernel.mk diff --git a/qca-nss-ecm/Makefile b/qca-nss-ecm/Makefile index b2d6258..db4a209 100644 --- a/qca-nss-ecm/Makefile +++ b/qca-nss-ecm/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2024-06-17 PKG_SOURCE_VERSION:=937d47c -PKG_MIRROR_HASH:=c2f7c500f6434537ba4b583d9034c87fafae5d5abe1514a6ff61949b64ed8f84 +PKG_MIRROR_HASH:=f8d71d61e991e70b1dc52d625f7f441c3d6dee329d34a3ddae0ba12ed78ef99d QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 PKG_FLAGS:=nonshared diff --git a/qca-nss-macsec/Makefile b/qca-nss-macsec/Makefile index de99d6e..c17c4bf 100644 --- a/qca-nss-macsec/Makefile +++ b/qca-nss-macsec/Makefile @@ -5,8 +5,10 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-macsec PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2023-10-16 -PKG_SOURCE_VERSION:=b94e22d8b05dc7b78bdafade1e313ca0bb44c596 -PKG_MIRROR_HASH:=ed9f31d771e5a8d4e11331ec1afff0aa1c23839bdbf9f3c2da4721bf773b6b6f +PKG_SOURCE_VERSION:=b94e22d +PKG_MIRROR_HASH:=cd46607ecfcb4997d4ff783ed4baf08f6ba02ad126cd479beb4f21179145dfb7 +QSDK_VERSION:=12.4.5 +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 PKG_FLAGS:=nonshared diff --git a/qca-ssdk-shell/Makefile b/qca-ssdk-shell/Makefile index 0da7bc8..1013359 100644 --- a/qca-ssdk-shell/Makefile +++ b/qca-ssdk-shell/Makefile @@ -7,9 +7,9 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/ssdk-shell.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2024-05-06 PKG_SOURCE_VERSION:=83c1a4a -PKG_MIRROR_HASH:=527801f679ea4b544eada6a5e8f581f472b76a8e1ecd6e38bd6271108250bafd +PKG_MIRROR_HASH:=f555def79b0da9cdb5a2999ae7d3405bf4f9c4e389d5d7e7735e063060e1746d QSDK_VERSION:=12.5 -PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION) +PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION) include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk