From c73c2272c5bb0ef8bd7b5e706ad4f6bfa781c245 Mon Sep 17 00:00:00 2001 From: Luis Sampaio Date: Tue, 14 Feb 2023 12:32:13 -0800 Subject: [PATCH] Update debian package versions to use git commits The Debian packaging has been changed to reflect all the git commits under the directory, and not just the commits to the metadata folder. This ensures that any new code submissions under those directories will increment the versions. Test Plan: Pass: build-pkgs -p linux-rt Pass: build-pkgs -p kernel-std-signed Pass: build-pkgs -p kernel-rt-signed Pass: build-pkgs -p mlnx-ofed-kernel Pass: build-pkgs -p igb-uio Pass: build-pkgs -p i40e Pass: build-pkgs -p ice-cvl-2.54 Pass: build-pkgs -p kmod-opae-fpga-driver Pass: build-pkgs -p qat1.7.l Pass: build-pkgs -p i40e-cvl-2.54 Pass: build-pkgs -p bnxt-en Pass: build-pkgs -p iqvlinux Pass: build-pkgs -p iavf Pass: build-pkgs -p ice Pass: build-pkgs -p iavf-cvl-2.54 Pass: build-pkgs -p libbnxt-re Pass: build-pkgs -p mlnx-tools Pass: build-pkgs -p rdma-core Pass: build-pkgs -p mstflint Pass: build-pkgs -p initramfs-trigger Pass: build-pkgs -p linux Story: 2010550 Task: 47342 Signed-off-by: Luis Sampaio Change-Id: I315231dba51badaf514458243555aa20b0a774da --- kernel-modules/bnxt_en/debian/meta_data.yaml | 4 +++- kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml | 4 +++- kernel-modules/intel-i40e-cvl-4.10/debian/meta_data.yaml | 4 +++- kernel-modules/intel-i40e/debian/meta_data.yaml | 4 +++- kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml | 4 +++- kernel-modules/intel-iavf-cvl-4.10/debian/meta_data.yaml | 4 +++- kernel-modules/intel-iavf/debian/meta_data.yaml | 4 +++- kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml | 4 +++- kernel-modules/intel-ice-cvl-4.10/debian/meta_data.yaml | 4 +++- kernel-modules/intel-ice/debian/meta_data.yaml | 4 +++- kernel-modules/intel-igb_uio/debian/meta_data.yaml | 4 +++- kernel-modules/intel-opae-fpga/debian/meta_data.yaml | 4 +++- kernel-modules/intel-qv/debian/meta_data.yaml | 4 +++- kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml | 4 +++- kernel-modules/qat17/debian/meta_data.yaml | 4 +++- kernel-rt/debian/meta_data.yaml | 4 +++- kernel-signed/kernel-rt-signed/debian/meta_data.yaml | 4 +++- kernel-signed/kernel-std-signed/debian/meta_data.yaml | 4 +++- kernel-std/debian/meta_data.yaml | 4 +++- livepatch/kpatch-prebuilt/debian/meta_data.yaml | 4 +++- userspace/broadcom/libbnxt_re/debian/meta_data.yaml | 4 +++- userspace/initramfs-trigger/debian/meta_data.yaml | 4 +++- userspace/mellanox/mlnx-tools/debian/meta_data.yaml | 4 +++- userspace/mellanox/mstflint/debian/meta_data.yaml | 4 +++- userspace/mellanox/rdma-core/debian/meta_data.yaml | 4 +++- 25 files changed, 75 insertions(+), 25 deletions(-) diff --git a/kernel-modules/bnxt_en/debian/meta_data.yaml b/kernel-modules/bnxt_en/debian/meta_data.yaml index 180a0e7f..d15c81e0 100644 --- a/kernel-modules/bnxt_en/debian/meta_data.yaml +++ b/kernel-modules/bnxt_en/debian/meta_data.yaml @@ -11,4 +11,6 @@ dl_files: sha256sum: 85bdfc30b4bd3e184e3b57a48055c11085e3b97593f7b4a8347fa50a9d571336 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e8cb7ff3ee3cee16c15287fe91204a448786acfa + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/bnxt_en diff --git a/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml b/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml index 5cb1348d..6f4e05c0 100644 --- a/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: a01db716777ec2063f5537c304aff1dfd7bcc3400012a2c3b4d3d5b3bf5e6915 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9115414b859534dab0c8e75c2f04dcf802c23de3 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-i40e-cvl-2.54 diff --git a/kernel-modules/intel-i40e-cvl-4.10/debian/meta_data.yaml b/kernel-modules/intel-i40e-cvl-4.10/debian/meta_data.yaml index 0287e97a..d1c8e366 100644 --- a/kernel-modules/intel-i40e-cvl-4.10/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e-cvl-4.10/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: db59d21f5af7c0bebf361d61c8debce3021ac40e10133bec24e7e95987ea0678 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9781c5567d6667ba4a1ec6588e6b86f5dea3945a + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-i40e-cvl-4.10 diff --git a/kernel-modules/intel-i40e/debian/meta_data.yaml b/kernel-modules/intel-i40e/debian/meta_data.yaml index c89f385a..70ce4480 100644 --- a/kernel-modules/intel-i40e/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: 11419e81b85946575338ab2b78260a647dc458753d6c10de68dc8a199425b8ec revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e7d9eb420228a86dcecd578de13d5a7c4e236b79 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-i40e diff --git a/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml b/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml index b0201cf7..4039869b 100644 --- a/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: 6e64f60115d5aa7814dea9ae1b9471859fb1116fcabd0d6e61905bb46d70d741 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9115414b859534dab0c8e75c2f04dcf802c23de3 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-iavf-cvl-2.54 diff --git a/kernel-modules/intel-iavf-cvl-4.10/debian/meta_data.yaml b/kernel-modules/intel-iavf-cvl-4.10/debian/meta_data.yaml index e7a37d71..0cfe5355 100644 --- a/kernel-modules/intel-iavf-cvl-4.10/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf-cvl-4.10/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 03374f4277d6a09bdfdfbe3df4908c5cb9221160b2d9f816856dba2b048ca6f9 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9781c5567d6667ba4a1ec6588e6b86f5dea3945a + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-iavf-cvl-4.10 diff --git a/kernel-modules/intel-iavf/debian/meta_data.yaml b/kernel-modules/intel-iavf/debian/meta_data.yaml index c7cc67ff..f9691b29 100644 --- a/kernel-modules/intel-iavf/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: 48e6b4efeb33e3ee256adcd262c6ce460cf3f43d1a87590836f504c05af9f1c2 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 87d7b62eb2e95f28935588946b07a459ad393570 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-iavf diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml b/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml index a4042c80..9927a302 100644 --- a/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml +++ b/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: f0e817abbcbbc7cb0676c159e5064afa89e86ace0bd1b66b644c728d344467ee revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9115414b859534dab0c8e75c2f04dcf802c23de3 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-ice-cvl-2.54 diff --git a/kernel-modules/intel-ice-cvl-4.10/debian/meta_data.yaml b/kernel-modules/intel-ice-cvl-4.10/debian/meta_data.yaml index f2bdf85f..2c2d401d 100644 --- a/kernel-modules/intel-ice-cvl-4.10/debian/meta_data.yaml +++ b/kernel-modules/intel-ice-cvl-4.10/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 62e6f02a9d6fe3546f83f178dbf50d7a9ddf6816549176a926fb1b846afd013b revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9781c5567d6667ba4a1ec6588e6b86f5dea3945a + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-ice-cvl-4.10 diff --git a/kernel-modules/intel-ice/debian/meta_data.yaml b/kernel-modules/intel-ice/debian/meta_data.yaml index b2699e10..380eaa73 100644 --- a/kernel-modules/intel-ice/debian/meta_data.yaml +++ b/kernel-modules/intel-ice/debian/meta_data.yaml @@ -16,4 +16,6 @@ dl_files: sha256sum: ee048ea47cd9d1f33b628131e8adc3751cc850bf89040cb8ebaa845d1a85508e revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: d219f2aec116bef15ff00df9df1bee82a5db3a93 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-ice diff --git a/kernel-modules/intel-igb_uio/debian/meta_data.yaml b/kernel-modules/intel-igb_uio/debian/meta_data.yaml index 83b21eae..c3b9bbd1 100644 --- a/kernel-modules/intel-igb_uio/debian/meta_data.yaml +++ b/kernel-modules/intel-igb_uio/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: md5sum: 1ae270026cda66789eb7e92aa236a489 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 23c4b6e7dd5788419cbad912ceb6a76849b89fe2 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-igb_uio diff --git a/kernel-modules/intel-opae-fpga/debian/meta_data.yaml b/kernel-modules/intel-opae-fpga/debian/meta_data.yaml index 21a122e9..9cff575c 100644 --- a/kernel-modules/intel-opae-fpga/debian/meta_data.yaml +++ b/kernel-modules/intel-opae-fpga/debian/meta_data.yaml @@ -11,4 +11,6 @@ dl_files: md5sum: 389888f2bb3e8cfb002a1ba880fc6823 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9f11519ae0d92019a8718693e110c11746223222 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-opae-fpga diff --git a/kernel-modules/intel-qv/debian/meta_data.yaml b/kernel-modules/intel-qv/debian/meta_data.yaml index 4143b9cc..5ba10a47 100644 --- a/kernel-modules/intel-qv/debian/meta_data.yaml +++ b/kernel-modules/intel-qv/debian/meta_data.yaml @@ -10,4 +10,6 @@ dl_path: dl_hook: dl_hook revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 6bc25e523948015fb80eac77bd946a9000955241 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/intel-qv diff --git a/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml b/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml index 9901b35a..dd239c9a 100644 --- a/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml +++ b/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: 50674ca9cb2905a0dd2077c782a0fcfe31d64f9e1e1ebdb5e0353a23dd9c36db revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 4937b3712f6ada593a2cfd78e06cdd9452403868 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/mlnx-ofa_kernel diff --git a/kernel-modules/qat17/debian/meta_data.yaml b/kernel-modules/qat17/debian/meta_data.yaml index cead9379..dbf4fe08 100644 --- a/kernel-modules/qat17/debian/meta_data.yaml +++ b/kernel-modules/qat17/debian/meta_data.yaml @@ -7,4 +7,6 @@ dl_path: md5sum: a6ff665184159583542dac89b9226f09 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 3a55c2449120d1682351c4b9af671768ba3dae51 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/qat17 diff --git a/kernel-rt/debian/meta_data.yaml b/kernel-rt/debian/meta_data.yaml index d98dfb23..624eab1f 100644 --- a/kernel-rt/debian/meta_data.yaml +++ b/kernel-rt/debian/meta_data.yaml @@ -17,4 +17,6 @@ dl_files: sha256sum: 1367a40724054a540c4d9c92f0ea6f73e9e50b2a99e46b59a987be15bdc4c4b7 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: feaa9fddd6d799f01f251af488aeb03786c38bb1 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-rt diff --git a/kernel-signed/kernel-rt-signed/debian/meta_data.yaml b/kernel-signed/kernel-rt-signed/debian/meta_data.yaml index cd1d9250..148a4638 100644 --- a/kernel-signed/kernel-rt-signed/debian/meta_data.yaml +++ b/kernel-signed/kernel-rt-signed/debian/meta_data.yaml @@ -4,4 +4,6 @@ debname: kernel-rt-signed dl_hook: dl_hook revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 4f3e32ce75cd9772e7973bf63cff07ed89503b35 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-signed/kernel-rt-signed diff --git a/kernel-signed/kernel-std-signed/debian/meta_data.yaml b/kernel-signed/kernel-std-signed/debian/meta_data.yaml index ab17ce51..18dcacef 100644 --- a/kernel-signed/kernel-std-signed/debian/meta_data.yaml +++ b/kernel-signed/kernel-std-signed/debian/meta_data.yaml @@ -4,4 +4,6 @@ debname: kernel-std-signed dl_hook: dl_hook revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 4f3e32ce75cd9772e7973bf63cff07ed89503b35 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-signed/kernel-std-signed diff --git a/kernel-std/debian/meta_data.yaml b/kernel-std/debian/meta_data.yaml index 667140e0..9ab5fca0 100644 --- a/kernel-std/debian/meta_data.yaml +++ b/kernel-std/debian/meta_data.yaml @@ -17,4 +17,6 @@ dl_files: sha256sum: 1367a40724054a540c4d9c92f0ea6f73e9e50b2a99e46b59a987be15bdc4c4b7 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 92efe6f6668a66b7a16261a7bd40a1f648764590 + SRC_DIR: ${MY_REPO}/stx/kernel/kernel-std diff --git a/livepatch/kpatch-prebuilt/debian/meta_data.yaml b/livepatch/kpatch-prebuilt/debian/meta_data.yaml index 553d28e1..b5f18bdb 100644 --- a/livepatch/kpatch-prebuilt/debian/meta_data.yaml +++ b/livepatch/kpatch-prebuilt/debian/meta_data.yaml @@ -4,4 +4,6 @@ serial: true src_path: source revision: dist: $STX_DIST - PKG_GITREVCOUNT: True + GITREVCOUNT: + BASE_SRCREV: e0bb6f65d7f3fe8c77089e1a447ab8d58b8bb2de + SRC_DIR: ${MY_REPO}/stx/kernel/livepatch/kpatch-prebuilt diff --git a/userspace/broadcom/libbnxt_re/debian/meta_data.yaml b/userspace/broadcom/libbnxt_re/debian/meta_data.yaml index f9012a0a..5ba59e9e 100644 --- a/userspace/broadcom/libbnxt_re/debian/meta_data.yaml +++ b/userspace/broadcom/libbnxt_re/debian/meta_data.yaml @@ -11,4 +11,6 @@ dl_files: sha256sum: 85bdfc30b4bd3e184e3b57a48055c11085e3b97593f7b4a8347fa50a9d571336 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e8cb7ff3ee3cee16c15287fe91204a448786acfa + SRC_DIR: ${MY_REPO}/stx/kernel/userspace/broadcom/libbnxt_re diff --git a/userspace/initramfs-trigger/debian/meta_data.yaml b/userspace/initramfs-trigger/debian/meta_data.yaml index 11d07d23..f8addd12 100644 --- a/userspace/initramfs-trigger/debian/meta_data.yaml +++ b/userspace/initramfs-trigger/debian/meta_data.yaml @@ -4,4 +4,6 @@ debname: initramfs-trigger src_path: src revision: dist: $STX_DIST - PKG_GITREVCOUNT: + GITREVCOUNT: + BASE_SRCREV: 4dd2b4a96084663c94b631409e9c7fcc6175ba92 + SRC_DIR: ${MY_REPO}/stx/kernel/userspace/initramfs-trigger diff --git a/userspace/mellanox/mlnx-tools/debian/meta_data.yaml b/userspace/mellanox/mlnx-tools/debian/meta_data.yaml index 313e7ef7..d64cb713 100644 --- a/userspace/mellanox/mlnx-tools/debian/meta_data.yaml +++ b/userspace/mellanox/mlnx-tools/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: db0246a22ffe0e75f64dfb41736ea4a21931f4f67fb971f519834eeab9176932 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e42c4c49aa62d86c180c8430ea4dcf6a221ba805 + SRC_DIR: ${MY_REPO}/stx/kernel/userspace/mellanox/mlnx-tools diff --git a/userspace/mellanox/mstflint/debian/meta_data.yaml b/userspace/mellanox/mstflint/debian/meta_data.yaml index 581adb70..32446587 100644 --- a/userspace/mellanox/mstflint/debian/meta_data.yaml +++ b/userspace/mellanox/mstflint/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: d24ea5b2265ad6260e142add4b87ac869a2e4414c66a2922017b4ad11f4f1fed revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e42c4c49aa62d86c180c8430ea4dcf6a221ba805 + SRC_DIR: ${MY_REPO}/stx/kernel/userspace/mellanox/mstflint diff --git a/userspace/mellanox/rdma-core/debian/meta_data.yaml b/userspace/mellanox/rdma-core/debian/meta_data.yaml index aa9af81e..1076e37b 100644 --- a/userspace/mellanox/rdma-core/debian/meta_data.yaml +++ b/userspace/mellanox/rdma-core/debian/meta_data.yaml @@ -9,4 +9,6 @@ dl_path: sha256sum: 865726dce11113b89d4563e5bc988dccf507d8f687ee6550dd2b0cede116465c revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 966d2f51b1229f3269febbd4bee0d54f1755be73 + SRC_DIR: ${MY_REPO}/stx/kernel/userspace/mellanox/rdma-core