Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing rpm calls from tdnf scripts. #2947

Merged
merged 1 commit into from
May 3, 2022
Merged

Removing rpm calls from tdnf scripts. #2947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions SPECS/tdnf/tdnf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -184,6 +178,9 @@ done
%{_bindir}/tdnf-automatic

%changelog
* Tue May 03 2022 Pawel Winogrodzki <[email protected]> - 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 <[email protected]> - 3.2.2-3
- Update required dependecies for tdnf package which needs rpm-libs.

Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down