From 9ffeea6a764e1898f1c4af4bc61bef4bf2055d1d Mon Sep 17 00:00:00 2001 From: Rafael Falcao Date: Tue, 21 Feb 2023 16:19:06 -0300 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. - The commit "Add debian package for virt/cloud-init" (SHA 6d1244bda9) was choosen to be the SRC_BASE_SRCREV of the cloud-init's metadata because is the commit that creates the debian directory with build files structure. - The commit "Add debian package for virt/kvm-timer-advance" (SHA 4cb5d17a7f) was choosen to be the SRC_BASE_SRCREV of the kvm-timer-advance's metadata because is commit creates the debian directory with build files structure. - The commit "Add debian package for virt/libvirt-python" (SHA 6420a976d3) was choosen to be the SRC_BASE_SRCREV of the libvirt-python's metadata because is the commit that creates the debian directory with build files structure. - The commit "Debian: Add build structure for virt/libvirt" (SHA 1f37f8b5d4) was choosen to be the SRC_BASE_SRCREV of the libvirt's metadata because is the commit that creates the debian directory with build files structure. - The commit "Debian: Add build structure for virt/qemu" (SHA 75a234904f) was choosen to be the SRC_BASE_SRCREV of the qemu's metadata because is the commit that creates the debian directory with build files structure. Test Plan: PASS: build-image PASS: build-pkgs -c -p cloud-init PASS: build-pkgs -c -p kvm-timer-advance PASS: build-pkgs -c -p libvirt-python PASS: build-pkgs -c -p libvirt PASS: build-pkgs -c -p qemu PASS: commit a file change under cloud-init, rebuild and see that the cloud-init version has increased. Story: 2010550 Task: 47468 Signed-off-by: Rafael Falcao Change-Id: Ica6638b220e6366a9fb1be47d5380fa44046ed84 --- virt/cloud-init/debian/meta_data.yaml | 5 ++++- virt/kvm-timer-advance/debian/meta_data.yaml | 2 ++ virt/libvirt-python/debian/meta_data.yaml | 5 ++++- virt/libvirt/debian/meta_data.yaml | 4 +++- virt/qemu/debian/meta_data.yaml | 4 +++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/virt/cloud-init/debian/meta_data.yaml b/virt/cloud-init/debian/meta_data.yaml index b268ada4b..abe9d16f0 100644 --- a/virt/cloud-init/debian/meta_data.yaml +++ b/virt/cloud-init/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debname: cloud-init debver: 20.4.1-2+deb11u1 dl_path: @@ -6,4 +7,6 @@ dl_path: md5sum: e125f0b7651386430cbf6a5e80789b8e revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 6d1244bda94fafc5817aec1848d86ed48f259ca5 + SRC_DIR: ${MY_REPO}/stx/integ/virt/cloud-init diff --git a/virt/kvm-timer-advance/debian/meta_data.yaml b/virt/kvm-timer-advance/debian/meta_data.yaml index febabf969..68ae6cb98 100644 --- a/virt/kvm-timer-advance/debian/meta_data.yaml +++ b/virt/kvm-timer-advance/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: files revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 4cb5d17a7f3e9b4a9d10dcb188a29a43601f524d diff --git a/virt/libvirt-python/debian/meta_data.yaml b/virt/libvirt-python/debian/meta_data.yaml index fb04162ae..3ca1b4853 100644 --- a/virt/libvirt-python/debian/meta_data.yaml +++ b/virt/libvirt-python/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debname: libvirt-python debver: 7.0.0-2 dl_path: @@ -6,4 +7,6 @@ dl_path: md5sum: 3053719493a919560d6929fc86bcf2b3 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 6420a976d31c90b4f5b6f3d698a7dc2811d1b62b + SRC_DIR: ${MY_REPO}/stx/integ/virt/libvirt-python diff --git a/virt/libvirt/debian/meta_data.yaml b/virt/libvirt/debian/meta_data.yaml index 6f978b726..ec2795ba9 100644 --- a/virt/libvirt/debian/meta_data.yaml +++ b/virt/libvirt/debian/meta_data.yaml @@ -13,4 +13,6 @@ src_files: - libvirt/hooks/qemu revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 1f37f8b5d4c953a71070410745195f33d58a7a60 + SRC_DIR: ${MY_REPO}/stx/integ/virt/libvirt diff --git a/virt/qemu/debian/meta_data.yaml b/virt/qemu/debian/meta_data.yaml index 79f24b239..7ce527b4e 100644 --- a/virt/qemu/debian/meta_data.yaml +++ b/virt/qemu/debian/meta_data.yaml @@ -4,4 +4,6 @@ debver: 5.2+dfsg-11+deb11u2 archive: https://snapshot.debian.org/archive/debian/20221109T211529Z/pool/main/q/qemu/ revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 75a234904ff66d8656bcac85c54b93cfc9f058df + SRC_DIR: ${MY_REPO}/stx/integ/virt/qemu