From 611cb9317c168dced5741d7b305fa53385723ebb Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Thu, 26 Jan 2023 15:47:54 +0000 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. Note: nfv uses GITREVCOUNT because its src_path is 'None' Test Plan: PASS: build-iso and unlock AIO-SX PASS: build-pkgs -p nfv PASS: build-pkgs -p nova-api-proxy PASS: commit a file change under nfv, and rebuild and see that the nfv version has increased. PASS: commit a file change one directory before nfv, and rebuild and see that the nfv version has not increased. Story: 2010550 Task: 47222 Signed-off-by: Al Bailey Change-Id: I06804af6e356174b608b18219b1f1c8176c99375 --- mtce-guest/debian/meta_data.yaml | 2 ++ nfv/debian/meta_data.yaml | 4 +++- nova-api-proxy/debian/meta_data.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mtce-guest/debian/meta_data.yaml b/mtce-guest/debian/meta_data.yaml index 6b15331d..3702146a 100644 --- a/mtce-guest/debian/meta_data.yaml +++ b/mtce-guest/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: src revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 20130b3e07c16b048918d6ab799f65f22e978576 diff --git a/nfv/debian/meta_data.yaml b/nfv/debian/meta_data.yaml index 2c970c87..d21a93b4 100644 --- a/nfv/debian/meta_data.yaml +++ b/nfv/debian/meta_data.yaml @@ -12,4 +12,6 @@ src_files: - nfv-vim revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: a2d39ebd1f3453aa36bc0b789930be18242f6ed2 + SRC_DIR: ${MY_REPO}/stx/nfv/nfv diff --git a/nova-api-proxy/debian/meta_data.yaml b/nova-api-proxy/debian/meta_data.yaml index f87ea023..64911faa 100644 --- a/nova-api-proxy/debian/meta_data.yaml +++ b/nova-api-proxy/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: nova-api-proxy revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 20130b3e07c16b048918d6ab799f65f22e978576