From 0067955905eac16f89f731415f2afa3f1301b69f Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Tue, 3 May 2022 12:40:19 -0700 Subject: [PATCH] Removing 'rpm' calls from 'tdnf' scripts. --- SPECS/tdnf/tdnf.spec | 11 ++++------- .../manifests/package/pkggen_core_aarch64.txt | 8 ++++---- .../manifests/package/pkggen_core_x86_64.txt | 8 ++++---- .../manifests/package/toolchain_aarch64.txt | 14 +++++++------- .../manifests/package/toolchain_x86_64.txt | 14 +++++++------- 5 files changed, 26 insertions(+), 29 deletions(-) diff --git a/SPECS/tdnf/tdnf.spec b/SPECS/tdnf/tdnf.spec index 90e7191bd52..c0796d1c551 100644 --- a/SPECS/tdnf/tdnf.spec +++ b/SPECS/tdnf/tdnf.spec @@ -1,7 +1,7 @@ Summary: dnf/yum equivalent using C libs Name: tdnf Version: 3.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2.1 AND GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -133,12 +133,6 @@ find %{buildroot} -name '*.pyc' -delete %ldconfig_scriptlets -%triggerin -n %{name} -- mariner-repos-shared -for gpg_key in $(rpm -q -l mariner-repos-shared | grep "rpm-gpg") -do - rpm --import "$gpg_key" -done - %files %license COPYING %defattr(-,root,root,0755) @@ -184,6 +178,9 @@ done %{_bindir}/tdnf-automatic %changelog +* Tue May 03 2022 Pawel Winogrodzki - 3.2.2-4 +- Reverting usage of "rpm" in RPM scripts since "/var/lib/rpm/.rpm.lock" is always taken. + * Wed Apr 13 2022 Suresh Babu Chalamalasetty - 3.2.2-3 - Update required dependecies for tdnf package which needs rpm-libs. diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index db74bcce8b1..87a5a3fe74d 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -193,10 +193,10 @@ krb5-1.19.2-1.cm2.aarch64.rpm curl-7.82.0-1.cm2.aarch64.rpm curl-devel-7.82.0-1.cm2.aarch64.rpm curl-libs-7.82.0-1.cm2.aarch64.rpm -tdnf-3.2.2-3.cm2.aarch64.rpm -tdnf-cli-libs-3.2.2-3.cm2.aarch64.rpm -tdnf-devel-3.2.2-3.cm2.aarch64.rpm -tdnf-plugin-repogpgcheck-3.2.2-3.cm2.aarch64.rpm +tdnf-3.2.2-4.cm2.aarch64.rpm +tdnf-cli-libs-3.2.2-4.cm2.aarch64.rpm +tdnf-devel-3.2.2-4.cm2.aarch64.rpm +tdnf-plugin-repogpgcheck-3.2.2-4.cm2.aarch64.rpm createrepo_c-0.17.5-1.cm2.aarch64.rpm libxml2-2.9.13-1.cm2.aarch64.rpm libxml2-devel-2.9.13-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 7abc204e0c1..f05908f2ce3 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -193,10 +193,10 @@ krb5-1.19.2-1.cm2.x86_64.rpm curl-7.82.0-1.cm2.x86_64.rpm curl-devel-7.82.0-1.cm2.x86_64.rpm curl-libs-7.82.0-1.cm2.x86_64.rpm -tdnf-3.2.2-3.cm2.x86_64.rpm -tdnf-cli-libs-3.2.2-3.cm2.x86_64.rpm -tdnf-devel-3.2.2-3.cm2.x86_64.rpm -tdnf-plugin-repogpgcheck-3.2.2-3.cm2.x86_64.rpm +tdnf-3.2.2-4.cm2.x86_64.rpm +tdnf-cli-libs-3.2.2-4.cm2.x86_64.rpm +tdnf-devel-3.2.2-4.cm2.x86_64.rpm +tdnf-plugin-repogpgcheck-3.2.2-4.cm2.x86_64.rpm createrepo_c-0.17.5-1.cm2.x86_64.rpm libxml2-2.9.13-1.cm2.x86_64.rpm libxml2-devel-2.9.13-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 3ae755ebaef..a8188a91b8b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -549,13 +549,13 @@ systemd-bootstrap-devel-250.3-3.cm2.aarch64.rpm systemd-bootstrap-rpm-macros-250.3-3.cm2.noarch.rpm tar-1.34-1.cm2.aarch64.rpm tar-debuginfo-1.34-1.cm2.aarch64.rpm -tdnf-3.2.2-3.cm2.aarch64.rpm -tdnf-autoupdate-3.2.2-3.cm2.aarch64.rpm -tdnf-cli-libs-3.2.2-3.cm2.aarch64.rpm -tdnf-debuginfo-3.2.2-3.cm2.aarch64.rpm -tdnf-devel-3.2.2-3.cm2.aarch64.rpm -tdnf-plugin-repogpgcheck-3.2.2-3.cm2.aarch64.rpm -tdnf-python-3.2.2-3.cm2.aarch64.rpm +tdnf-3.2.2-4.cm2.aarch64.rpm +tdnf-autoupdate-3.2.2-4.cm2.aarch64.rpm +tdnf-cli-libs-3.2.2-4.cm2.aarch64.rpm +tdnf-debuginfo-3.2.2-4.cm2.aarch64.rpm +tdnf-devel-3.2.2-4.cm2.aarch64.rpm +tdnf-plugin-repogpgcheck-3.2.2-4.cm2.aarch64.rpm +tdnf-python-3.2.2-4.cm2.aarch64.rpm texinfo-6.8-1.cm2.aarch64.rpm texinfo-debuginfo-6.8-1.cm2.aarch64.rpm unzip-6.0-19.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 32a2f84bfd1..45ddba076db 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -549,13 +549,13 @@ systemd-bootstrap-devel-250.3-3.cm2.x86_64.rpm systemd-bootstrap-rpm-macros-250.3-3.cm2.noarch.rpm tar-1.34-1.cm2.x86_64.rpm tar-debuginfo-1.34-1.cm2.x86_64.rpm -tdnf-3.2.2-3.cm2.x86_64.rpm -tdnf-autoupdate-3.2.2-3.cm2.x86_64.rpm -tdnf-cli-libs-3.2.2-3.cm2.x86_64.rpm -tdnf-debuginfo-3.2.2-3.cm2.x86_64.rpm -tdnf-devel-3.2.2-3.cm2.x86_64.rpm -tdnf-plugin-repogpgcheck-3.2.2-3.cm2.x86_64.rpm -tdnf-python-3.2.2-3.cm2.x86_64.rpm +tdnf-3.2.2-4.cm2.x86_64.rpm +tdnf-autoupdate-3.2.2-4.cm2.x86_64.rpm +tdnf-cli-libs-3.2.2-4.cm2.x86_64.rpm +tdnf-debuginfo-3.2.2-4.cm2.x86_64.rpm +tdnf-devel-3.2.2-4.cm2.x86_64.rpm +tdnf-plugin-repogpgcheck-3.2.2-4.cm2.x86_64.rpm +tdnf-python-3.2.2-4.cm2.x86_64.rpm texinfo-6.8-1.cm2.x86_64.rpm texinfo-debuginfo-6.8-1.cm2.x86_64.rpm unzip-6.0-19.cm2.x86_64.rpm