From a8f7a06d8f962e1a8fc0935e6086fd046fcaa790 Mon Sep 17 00:00:00 2001 From: Manoel Benedito Neto Date: Fri, 24 Feb 2023 08:50:23 -0300 Subject: [PATCH] Update debian packages for pkg-versioning The Debian packaging has been changed to reflect all the latest git commits under the directory, pointed as usable, and to improve pkg-versioning addressing the first commit as start point to debian build packages. This commit add GITREVCOUNT and remove PKG_GITREVCOUNT of the packages to calculate git revisions relative to package's source git repository, instead of count git revisions relative only to package's debian folder. This ensures that any new code submissions under those directories will increment the versions. The commit SHA 9b545c5e19 was chosen to be the BASE_SRCREV of the base-passwd's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained base-passwd version .stx.8) The commit SHA 698c14ccef was chosen to be the BASE_SRCREV of the puppet-ldap's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained puppet-ldap version .stx.2) The commit SHA 39bc6c35f1 was chosen to be the BASE_SRCREV of the ldapscripts's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained ldapscripts version .stx.4) The commit SHA 2821680c8b was chosen to be the BASE_SRCREV of the openldap's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained openldap version .stx.9) The commit SHA f043585c65 was chosen to be the BASE_SRCREV of the openscap's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained openscap version .stx.3) The commit SHA de2af4d74d was chosen to be the BASE_SRCREV of the keyrings.alt's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained keyring.alt version .stx.4) The commit SHA de2af4d74d was chosen to be the BASE_SRCREV of the python-keyring's metadata because is the commit that creates the debian directory with build files structure for this package. (maintained python-keyring version .stx.4) Test Plan: PASS: Verify package versions are updated as expected. PASS: build-pkgs -c -p base-passwd PASS: build-pkgs -c -p puppet-ldap PASS: build-pkgs -c -p ldapscripts PASS: build-pkgs -c -p openldap PASS: build-pkgs -c -p openscap PASS: build-pkgs -c -p keyrings.alt PASS: build-pkgs -c -p python-keyrings Story: 2010550 Task: 47496 Signed-off-by: Manoel Benedito Neto Change-Id: I32b47348ece39ea88b3c5aeb0d1e64c6d3e7a6b5 --- base/base-passwd/debian/meta_data.yaml | 3 ++- config/puppet-modules/puppet-ldap/debian/meta_data.yaml | 3 ++- ldap/ldapscripts/debian/meta_data.yaml | 3 ++- ldap/openldap/debian/meta_data.yaml | 3 ++- security/keyrings.alt/debian/meta_data.yaml | 5 +++-- security/openscap/debian/meta_data.yaml | 3 ++- security/python-keyring/debian/meta_data.yaml | 3 ++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/base/base-passwd/debian/meta_data.yaml b/base/base-passwd/debian/meta_data.yaml index 2c41dd72b..8f69e11c7 100644 --- a/base/base-passwd/debian/meta_data.yaml +++ b/base/base-passwd/debian/meta_data.yaml @@ -7,4 +7,5 @@ dl_path: sha256sum: 7dda1771ce9107290fea9fca0c11e69334385d614a7c21cbeb50ce9437dd561f revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 9b545c5e197a424d08ed062ca6f11efe7bc824b4 diff --git a/config/puppet-modules/puppet-ldap/debian/meta_data.yaml b/config/puppet-modules/puppet-ldap/debian/meta_data.yaml index e3d37bc02..3caef3acc 100644 --- a/config/puppet-modules/puppet-ldap/debian/meta_data.yaml +++ b/config/puppet-modules/puppet-ldap/debian/meta_data.yaml @@ -8,4 +8,5 @@ dl_path: sha256sum: baa275b08ad8f6ce50eb66b22ae98276d6153f4937d551d652e075f769a5578a revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 698c14ccef1ccb9bb93edca275aa7d5c3d926424 diff --git a/ldap/ldapscripts/debian/meta_data.yaml b/ldap/ldapscripts/debian/meta_data.yaml index c540468cf..aa3ff261b 100644 --- a/ldap/ldapscripts/debian/meta_data.yaml +++ b/ldap/ldapscripts/debian/meta_data.yaml @@ -7,4 +7,5 @@ dl_path: sha256sum: 68c189714d9ba4cc57d461654f3019b524b6094af167ff998133683542b01ec3 revision: dist: $STX_DIST - PKG_GITREVCOUNT: + GITREVCOUNT: + BASE_SRCREV: 39bc6c35f15dc90edd5160a9e6486222cb2748ab diff --git a/ldap/openldap/debian/meta_data.yaml b/ldap/openldap/debian/meta_data.yaml index 1e8897220..a89bb700d 100644 --- a/ldap/openldap/debian/meta_data.yaml +++ b/ldap/openldap/debian/meta_data.yaml @@ -13,4 +13,5 @@ dl_files: sha256sum: 5a6e0222e948cb3cbafef769ecbbea718d2f724f9c34b8dfb0a2266735a451c9 revision: dist: $STX_DIST - PKG_GITREVCOUNT: + GITREVCOUNT: + BASE_SRCREV: 2821680c8bafa185b55bfb789b5ba5d19cfe8b65 diff --git a/security/keyrings.alt/debian/meta_data.yaml b/security/keyrings.alt/debian/meta_data.yaml index 7d12bb307..86436f482 100644 --- a/security/keyrings.alt/debian/meta_data.yaml +++ b/security/keyrings.alt/debian/meta_data.yaml @@ -1,5 +1,5 @@ --- -ver: 4.0.2-1 +debver: 4.0.2-1 dl_path: name: keyrings.alt-debian-4.0.2-1.tar.gz url: https://salsa.debian.org/python-team/packages/keyrings.alt/-/archive/debian/4.0.2-1/keyrings.alt-debian-4.0.2-1.tar.gz @@ -7,4 +7,5 @@ dl_path: sha256sum: 2204421931893aab191d78e21a849a269c301681a6911193d2852bb4e77e9ffc revision: dist: $STX_DIST - PKG_GITREVCOUNT: + GITREVCOUNT: + BASE_SRCREV: de2af4d74df8d7b1d37d07d5f7dbc990e2fda390 diff --git a/security/openscap/debian/meta_data.yaml b/security/openscap/debian/meta_data.yaml index d7c93bd1a..66147550d 100644 --- a/security/openscap/debian/meta_data.yaml +++ b/security/openscap/debian/meta_data.yaml @@ -7,4 +7,5 @@ dl_path: sha256sum: 40634f2e27a542b112d2e3b374ebbef7e56af18a3d8ae78da2462ab0b1e4e6b7 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: f043585c651e342b9fbf5335811604e013d829db diff --git a/security/python-keyring/debian/meta_data.yaml b/security/python-keyring/debian/meta_data.yaml index e81950f51..9fe1c418f 100644 --- a/security/python-keyring/debian/meta_data.yaml +++ b/security/python-keyring/debian/meta_data.yaml @@ -7,4 +7,5 @@ dl_path: md5sum: b75d88573226d73cc9dbefa0128bb042 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: de2af4d74df8d7b1d37d07d5f7dbc990e2fda390