Skip to content

Commit 8dd677a

Browse files
authored
Re-enable installonlypkgs on tdnf for Azure Linux 3.0 (#10700)
1 parent 08234b6 commit 8dd677a

6 files changed

Lines changed: 55 additions & 25 deletions

File tree

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From de620a8166329c2f7b6eaecb5b4e24af1db95e4d Mon Sep 17 00:00:00 2001
2+
From: Sam Meluch <sam.meluch@microsoft.com>
3+
Date: Tue, 19 Dec 2023 12:04:36 -0800
4+
Subject: [PATCH] Add installonlypkgs to tdnf.conf for mariner kernel packages
5+
6+
---
7+
etc/tdnf/tdnf.conf | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/etc/tdnf/tdnf.conf b/etc/tdnf/tdnf.conf
11+
index 67c4d51..8ec4003 100644
12+
--- a/etc/tdnf/tdnf.conf
13+
+++ b/etc/tdnf/tdnf.conf
14+
@@ -1,7 +1,8 @@
15+
[main]
16+
gpgcheck=1
17+
installonly_limit=3
18+
+installonlypkgs=kernel kernel-mshv kernel-uvm kernel-uki
19+
clean_requirements_on_remove=0
20+
repodir=/etc/yum.repos.d
21+
cachedir=/var/cache/tdnf
22+
plugins=1
23+
--
24+
2.34.1

SPECS/tdnf/tdnf.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: dnf equivalent using C libs
55
Name: tdnf
66
Version: 3.5.8
7-
Release: 3%{?dist}
7+
Release: 4%{?dist}
88
License: LGPLv2.1 AND GPLv2
99
Vendor: Microsoft Corporation
1010
Distribution: Azure Linux
@@ -29,6 +29,9 @@ Patch4: tdnf-sqlite-library.patch
2929
Patch5: virtual-repo-snapshot.patch
3030
Patch6: fix-tests-for-azl.patch
3131

32+
# Install only package configuration
33+
Patch7: tdnf-add-installonlypkgs-config.patch
34+
3235
#Cmake requires binutils
3336
BuildRequires: binutils
3437
BuildRequires: cmake
@@ -237,6 +240,9 @@ fi
237240
/%{_lib}/systemd/system/tdnf*
238241

239242
%changelog
243+
* Thu Oct 10 2024 Sam Meluch <sammeluch@microsoft.com> - 3.5.8-4
244+
- Add install only packages to tdnf.conf
245+
240246
* Fri Sep 20 2024 Sam Meluch <sammeluch@microsoft.com> - 3.5.8-3
241247
- Fix an issue with snapshottime config option
242248

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ lua-5.4.6-1.azl3.aarch64.rpm
211211
lua-libs-5.4.6-1.azl3.aarch64.rpm
212212
azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
213213
azurelinux-check-macros-3.0-7.azl3.noarch.rpm
214-
tdnf-3.5.8-3.azl3.aarch64.rpm
215-
tdnf-cli-libs-3.5.8-3.azl3.aarch64.rpm
216-
tdnf-devel-3.5.8-3.azl3.aarch64.rpm
217-
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.aarch64.rpm
214+
tdnf-3.5.8-4.azl3.aarch64.rpm
215+
tdnf-cli-libs-3.5.8-4.azl3.aarch64.rpm
216+
tdnf-devel-3.5.8-4.azl3.aarch64.rpm
217+
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.aarch64.rpm
218218
libassuan-2.5.6-1.azl3.aarch64.rpm
219219
libassuan-devel-2.5.6-1.azl3.aarch64.rpm
220220
libgpg-error-1.47-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ lua-5.4.6-1.azl3.x86_64.rpm
211211
lua-libs-5.4.6-1.azl3.x86_64.rpm
212212
azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
213213
azurelinux-check-macros-3.0-7.azl3.noarch.rpm
214-
tdnf-3.5.8-3.azl3.x86_64.rpm
215-
tdnf-cli-libs-3.5.8-3.azl3.x86_64.rpm
216-
tdnf-devel-3.5.8-3.azl3.x86_64.rpm
217-
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.x86_64.rpm
214+
tdnf-3.5.8-4.azl3.x86_64.rpm
215+
tdnf-cli-libs-3.5.8-4.azl3.x86_64.rpm
216+
tdnf-devel-3.5.8-4.azl3.x86_64.rpm
217+
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.x86_64.rpm
218218
libassuan-2.5.6-1.azl3.x86_64.rpm
219219
libassuan-devel-2.5.6-1.azl3.x86_64.rpm
220220
libgpg-error-1.47-1.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -584,14 +584,14 @@ systemd-bootstrap-libs-250.3-17.azl3.aarch64.rpm
584584
systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
585585
tar-1.35-1.azl3.aarch64.rpm
586586
tar-debuginfo-1.35-1.azl3.aarch64.rpm
587-
tdnf-3.5.8-3.azl3.aarch64.rpm
588-
tdnf-autoupdate-3.5.8-3.azl3.aarch64.rpm
589-
tdnf-cli-libs-3.5.8-3.azl3.aarch64.rpm
590-
tdnf-debuginfo-3.5.8-3.azl3.aarch64.rpm
591-
tdnf-devel-3.5.8-3.azl3.aarch64.rpm
592-
tdnf-plugin-metalink-3.5.8-3.azl3.aarch64.rpm
593-
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.aarch64.rpm
594-
tdnf-python-3.5.8-3.azl3.aarch64.rpm
587+
tdnf-3.5.8-4.azl3.aarch64.rpm
588+
tdnf-autoupdate-3.5.8-4.azl3.aarch64.rpm
589+
tdnf-cli-libs-3.5.8-4.azl3.aarch64.rpm
590+
tdnf-debuginfo-3.5.8-4.azl3.aarch64.rpm
591+
tdnf-devel-3.5.8-4.azl3.aarch64.rpm
592+
tdnf-plugin-metalink-3.5.8-4.azl3.aarch64.rpm
593+
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.aarch64.rpm
594+
tdnf-python-3.5.8-4.azl3.aarch64.rpm
595595
texinfo-7.0.3-1.azl3.aarch64.rpm
596596
texinfo-debuginfo-7.0.3-1.azl3.aarch64.rpm
597597
unzip-6.0-20.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -590,14 +590,14 @@ systemd-bootstrap-libs-250.3-17.azl3.x86_64.rpm
590590
systemd-bootstrap-rpm-macros-250.3-17.azl3.noarch.rpm
591591
tar-1.35-1.azl3.x86_64.rpm
592592
tar-debuginfo-1.35-1.azl3.x86_64.rpm
593-
tdnf-3.5.8-3.azl3.x86_64.rpm
594-
tdnf-autoupdate-3.5.8-3.azl3.x86_64.rpm
595-
tdnf-cli-libs-3.5.8-3.azl3.x86_64.rpm
596-
tdnf-debuginfo-3.5.8-3.azl3.x86_64.rpm
597-
tdnf-devel-3.5.8-3.azl3.x86_64.rpm
598-
tdnf-plugin-metalink-3.5.8-3.azl3.x86_64.rpm
599-
tdnf-plugin-repogpgcheck-3.5.8-3.azl3.x86_64.rpm
600-
tdnf-python-3.5.8-3.azl3.x86_64.rpm
593+
tdnf-3.5.8-4.azl3.x86_64.rpm
594+
tdnf-autoupdate-3.5.8-4.azl3.x86_64.rpm
595+
tdnf-cli-libs-3.5.8-4.azl3.x86_64.rpm
596+
tdnf-debuginfo-3.5.8-4.azl3.x86_64.rpm
597+
tdnf-devel-3.5.8-4.azl3.x86_64.rpm
598+
tdnf-plugin-metalink-3.5.8-4.azl3.x86_64.rpm
599+
tdnf-plugin-repogpgcheck-3.5.8-4.azl3.x86_64.rpm
600+
tdnf-python-3.5.8-4.azl3.x86_64.rpm
601601
texinfo-7.0.3-1.azl3.x86_64.rpm
602602
texinfo-debuginfo-7.0.3-1.azl3.x86_64.rpm
603603
unzip-6.0-20.azl3.x86_64.rpm

0 commit comments

Comments
 (0)