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

Jump to bottom

Re-enable installonlypkgs on tdnf for Azure Linux 3.0 #10700

Merged
merged 3 commits into from
Oct 23, 2024
+55 −25
Merged

Re-enable installonlypkgs on tdnf for Azure Linux 3.0 #10700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d82d71
add installonlypkgs to tdnf.conf
sameluch Oct 11, 2024
892308e
adjust install only packages for no longer used kernel packages
sameluch Oct 11, 2024
56379e9
add kernel-uki to installonlypkgs for 3.0
sameluch Oct 23, 2024
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
24 changes: 24 additions & 0 deletions SPECS/tdnf/tdnf-add-installonlypkgs-config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From de620a8166329c2f7b6eaecb5b4e24af1db95e4d Mon Sep 17 00:00:00 2001
From: Sam Meluch <sam.meluch@microsoft.com>
Date: Tue, 19 Dec 2023 12:04:36 -0800
Subject: [PATCH] Add installonlypkgs to tdnf.conf for mariner kernel packages

---
etc/tdnf/tdnf.conf | 1 +
1 file changed, 1 insertion(+)

diff --git a/etc/tdnf/tdnf.conf b/etc/tdnf/tdnf.conf
index 67c4d51..8ec4003 100644
--- a/etc/tdnf/tdnf.conf
+++ b/etc/tdnf/tdnf.conf
@@ -1,7 +1,8 @@
[main]
gpgcheck=1
installonly_limit=3
+installonlypkgs=kernel kernel-mshv kernel-uvm kernel-uki
clean_requirements_on_remove=0
repodir=/etc/yum.repos.d
cachedir=/var/cache/tdnf
plugins=1
--
2.34.1
8 changes: 7 additions & 1 deletion SPECS/tdnf/tdnf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Summary: dnf equivalent using C libs
Name: tdnf
Version: 3.5.8
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2.1 AND GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -29,6 +29,9 @@ Patch4: tdnf-sqlite-library.patch
Patch5: virtual-repo-snapshot.patch
Patch6: fix-tests-for-azl.patch

# Install only package configuration
Patch7: tdnf-add-installonlypkgs-config.patch

#Cmake requires binutils
BuildRequires: binutils
BuildRequires: cmake
Expand Down Expand Up @@ -237,6 +240,9 @@ fi
/%{_lib}/systemd/system/tdnf*

%changelog
* Thu Oct 10 2024 Sam Meluch <sammeluch@microsoft.com> - 3.5.8-4
- Add install only packages to tdnf.conf

* Fri Sep 20 2024 Sam Meluch <sammeluch@microsoft.com> - 3.5.8-3
- Fix an issue with snapshottime config option

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 @@ -211,10 +211,10 @@ lua-5.4.6-1.azl3.aarch64.rpm
lua-libs-5.4.6-1.azl3.aarch64.rpm
azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
azurelinux-check-macros-3.0-7.azl3.noarch.rpm
tdnf-3.5.8-3.azl3.aarch64.rpm
tdnf-cli-libs-3.5.8-3.azl3.aarch64.rpm
tdnf-devel-3.5.8-3.azl3.aarch64.rpm
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.aarch64.rpm
tdnf-3.5.8-4.azl3.aarch64.rpm
tdnf-cli-libs-3.5.8-4.azl3.aarch64.rpm
tdnf-devel-3.5.8-4.azl3.aarch64.rpm
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.aarch64.rpm
libassuan-2.5.6-1.azl3.aarch64.rpm
libassuan-devel-2.5.6-1.azl3.aarch64.rpm
libgpg-error-1.47-1.azl3.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 @@ -211,10 +211,10 @@ lua-5.4.6-1.azl3.x86_64.rpm
lua-libs-5.4.6-1.azl3.x86_64.rpm
azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
azurelinux-check-macros-3.0-7.azl3.noarch.rpm
tdnf-3.5.8-3.azl3.x86_64.rpm
tdnf-cli-libs-3.5.8-3.azl3.x86_64.rpm
tdnf-devel-3.5.8-3.azl3.x86_64.rpm
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.x86_64.rpm
tdnf-3.5.8-4.azl3.x86_64.rpm
tdnf-cli-libs-3.5.8-4.azl3.x86_64.rpm
tdnf-devel-3.5.8-4.azl3.x86_64.rpm
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.x86_64.rpm
libassuan-2.5.6-1.azl3.x86_64.rpm
libassuan-devel-2.5.6-1.azl3.x86_64.rpm
libgpg-error-1.47-1.azl3.x86_64.rpm
Expand Down
16 changes: 8 additions & 8 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 @@ -584,14 +584,14 @@ systemd-bootstrap-libs-250.3-17.azl3.aarch64.rpm
systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
tar-1.35-1.azl3.aarch64.rpm
tar-debuginfo-1.35-1.azl3.aarch64.rpm
tdnf-3.5.8-3.azl3.aarch64.rpm
tdnf-autoupdate-3.5.8-3.azl3.aarch64.rpm
tdnf-cli-libs-3.5.8-3.azl3.aarch64.rpm
tdnf-debuginfo-3.5.8-3.azl3.aarch64.rpm
tdnf-devel-3.5.8-3.azl3.aarch64.rpm
tdnf-plugin-metalink-3.5.8-3.azl3.aarch64.rpm
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.aarch64.rpm
tdnf-python-3.5.8-3.azl3.aarch64.rpm
tdnf-3.5.8-4.azl3.aarch64.rpm
tdnf-autoupdate-3.5.8-4.azl3.aarch64.rpm
tdnf-cli-libs-3.5.8-4.azl3.aarch64.rpm
tdnf-debuginfo-3.5.8-4.azl3.aarch64.rpm
tdnf-devel-3.5.8-4.azl3.aarch64.rpm
tdnf-plugin-metalink-3.5.8-4.azl3.aarch64.rpm
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.aarch64.rpm
tdnf-python-3.5.8-4.azl3.aarch64.rpm
texinfo-7.0.3-1.azl3.aarch64.rpm
texinfo-debuginfo-7.0.3-1.azl3.aarch64.rpm
unzip-6.0-20.azl3.aarch64.rpm
Expand Down
16 changes: 8 additions & 8 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 @@ -590,14 +590,14 @@ systemd-bootstrap-libs-250.3-17.azl3.x86_64.rpm
systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
tar-1.35-1.azl3.x86_64.rpm
tar-debuginfo-1.35-1.azl3.x86_64.rpm
tdnf-3.5.8-3.azl3.x86_64.rpm
tdnf-autoupdate-3.5.8-3.azl3.x86_64.rpm
tdnf-cli-libs-3.5.8-3.azl3.x86_64.rpm
tdnf-debuginfo-3.5.8-3.azl3.x86_64.rpm
tdnf-devel-3.5.8-3.azl3.x86_64.rpm
tdnf-plugin-metalink-3.5.8-3.azl3.x86_64.rpm
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.x86_64.rpm
tdnf-python-3.5.8-3.azl3.x86_64.rpm
tdnf-3.5.8-4.azl3.x86_64.rpm
tdnf-autoupdate-3.5.8-4.azl3.x86_64.rpm
tdnf-cli-libs-3.5.8-4.azl3.x86_64.rpm
tdnf-debuginfo-3.5.8-4.azl3.x86_64.rpm
tdnf-devel-3.5.8-4.azl3.x86_64.rpm
tdnf-plugin-metalink-3.5.8-4.azl3.x86_64.rpm
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.x86_64.rpm
tdnf-python-3.5.8-4.azl3.x86_64.rpm
texinfo-7.0.3-1.azl3.x86_64.rpm
texinfo-debuginfo-7.0.3-1.azl3.x86_64.rpm
unzip-6.0-20.azl3.x86_64.rpm
Expand Down
Loading