From 993b8db9a20f8f38df8a52dea6b46cc126935a24 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 1 May 2024 21:54:29 +0200 Subject: [PATCH] Make debian/trixie debootstrap-able again (#6538) Ref: Debian Bug report logs - #1069787 Credit: Mark Hindley The debian/tests/debian-testing autopkgtest has been broken on 64bit archs by the t64 transition in trixie. Specifically the test includes gnupg as an additional package. Gnupg depends on gpg-agent which depends on libnpth0. However, in trixie, libnpth0 is now provided by libnpth0t64 which debootstrap doesn't handle. I suggest changing the test to include gpgv which avoids the t64 transition whilst providing similar functional coverage. --- config/cli/trixie | 1 - config/cli/trixie/debootstrap/components | 1 + config/cli/trixie/debootstrap/packages | 5 +++++ config/cli/trixie/main | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) delete mode 120000 config/cli/trixie create mode 120000 config/cli/trixie/debootstrap/components create mode 100644 config/cli/trixie/debootstrap/packages create mode 120000 config/cli/trixie/main diff --git a/config/cli/trixie b/config/cli/trixie deleted file mode 120000 index 5b206cd04b..0000000000 --- a/config/cli/trixie +++ /dev/null @@ -1 +0,0 @@ -bookworm \ No newline at end of file diff --git a/config/cli/trixie/debootstrap/components b/config/cli/trixie/debootstrap/components new file mode 120000 index 0000000000..c28ba911af --- /dev/null +++ b/config/cli/trixie/debootstrap/components @@ -0,0 +1 @@ +../../common/debootstrap/components.debian \ No newline at end of file diff --git a/config/cli/trixie/debootstrap/packages b/config/cli/trixie/debootstrap/packages new file mode 100644 index 0000000000..e96ef7993b --- /dev/null +++ b/config/cli/trixie/debootstrap/packages @@ -0,0 +1,5 @@ +apt-utils +locales +console-setup +gpgv +ca-certificates diff --git a/config/cli/trixie/main b/config/cli/trixie/main new file mode 120000 index 0000000000..bf1efea225 --- /dev/null +++ b/config/cli/trixie/main @@ -0,0 +1 @@ +../common/main \ No newline at end of file