From 99801ab09cb3f2881883c366c2e856ab638b413e Mon Sep 17 00:00:00 2001 From: Thales Elero Cervi Date: Wed, 22 Feb 2023 15:38:14 -0300 Subject: [PATCH] Update debian package revision counter The Debian packaging has been changed to reflect all the git commits under the directory, and not just the commits to the metadata folder. Also, it was noticed that the dpdk dl_path url was pointing to /archive/bullseye/dpdk-bullseye.tar.gz and setting debver to 20.11.6-1~deb11u1. This version should be the one officially supported on bullseye at that time, and stills the one pointed on the packages.debian page [1]. The page might be outdated now, since according to the debian dpdk repository this is no longer the version tagged for bullseye [2]. In fact, the 20.11.6-1~deb11u1 no longer exists [3] as a valid debian tag. So, pointing the url to /archive/bullseye/dpdk-bullseye.tar.gz is already downloading the archive of the Debian release 20.11.7-1~deb11u1. This change fixes the debver to 20.11.7-1~deb11u1 and sets the url to explicitly download that version, so this mismatch between debver and downloaded source is no longer a possibility. [1] https://packages.debian.org/bullseye/dpdk [2] https://salsa.debian.org/debian/dpdk/-/commits/bullseye [3] https://salsa.debian.org/debian/dpdk/-/tags?sort=updated_desc&search=debian%2F TEST PLAN: PASS - build-pkgs -c -p dpdk PASS - build-pkgs -c -p openvswitch Story: 2010550 Task: 47479 Signed-off-by: Thales Elero Cervi Change-Id: Idaa90e308fc49efe8d5894f6e458bd786742b96e --- networking/dpdk/debian/meta_data.yaml | 16 +++++++++------- networking/openvswitch/debian/meta_data.yaml | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/networking/dpdk/debian/meta_data.yaml b/networking/dpdk/debian/meta_data.yaml index 77e581320..ced4ff4ac 100644 --- a/networking/dpdk/debian/meta_data.yaml +++ b/networking/dpdk/debian/meta_data.yaml @@ -1,11 +1,13 @@ --- debname: dpdk -debver: 20.11.6-1~deb11u1 +debver: 20.11.7-1~deb11u1 dl_path: - name: dpdk-bullseye.tar.gz - url: https://salsa.debian.org/debian/dpdk/-/archive/bullseye/dpdk-bullseye.tar.gz - md5sum: 47a96b2c0f2484d62f80a08dd88c987b - sha256sum: bd8ba4fbdf3608f935c854e143184f80417ec0280dd34c6a01be01a57f29fb56 + name: dpdk-debian-20.11.7-1_deb11u1.tar.gz + url: https://salsa.debian.org/debian/dpdk/-/archive/debian/20.11.7-1_deb11u1/dpdk-debian-20.11.7-1_deb11u1.tar.gz + md5sum: 4bb547ab663ec787833cd43fe3d20f1c + sha256sum: ae62bc916a41f14e957ee7440b94dfb0e22a1d0dd6c1371cb628eab4fb74befd revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true + dist: $STX_DIST + GITREVCOUNT: + BASE_SRCREV: a806d997496740f2cec02db121c609e3c743c003 + SRC_DIR: ${MY_REPO}/stx/integ/networking/dpdk diff --git a/networking/openvswitch/debian/meta_data.yaml b/networking/openvswitch/debian/meta_data.yaml index be1b4f6f4..d025afa8c 100644 --- a/networking/openvswitch/debian/meta_data.yaml +++ b/networking/openvswitch/debian/meta_data.yaml @@ -2,10 +2,12 @@ debname: openvswitch debver: 2.15.0+ds1-2+deb11u2 dl_path: - name: openvswitch-debian-2.15.0+ds1-2+deb11u2.tar.gz - url: https://salsa.debian.org/openstack-team/third-party/openvswitch/-/archive/debian/2.15.0+ds1-2+deb11u2/openvswitch-debian-2.15.0+ds1-2+deb11u2.tar.gz - md5sum: 1df5943cd57810cb577781f054f92f3b - sha256sum: 7514a10ba2d144feb29e09b5e2d4ca506bda023d75aba9387f8681fe2aabee52 + name: openvswitch-debian-2.15.0+ds1-2+deb11u2.tar.gz + url: https://salsa.debian.org/openstack-team/third-party/openvswitch/-/archive/debian/2.15.0+ds1-2+deb11u2/openvswitch-debian-2.15.0+ds1-2+deb11u2.tar.gz + md5sum: 1df5943cd57810cb577781f054f92f3b + sha256sum: 7514a10ba2d144feb29e09b5e2d4ca506bda023d75aba9387f8681fe2aabee52 revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true + dist: $STX_DIST + GITREVCOUNT: + BASE_SRCREV: a806d997496740f2cec02db121c609e3c743c003 + SRC_DIR: ${MY_REPO}/stx/integ/networking/openvswitch