diff --git a/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch b/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch deleted file mode 100644 index 6f9834c..0000000 --- a/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 18d772d172963506e42442c8d5e1f546be41913a Mon Sep 17 00:00:00 2001 -From: Sven Joachim -Date: Sat, 1 Jul 2023 21:14:04 +0200 -Subject: [PATCH] Write the vt102-di terminfo entry to /usr/share/terminfo - -This is the location where the all the other terminfo files are since -with ncurses-base 6.4+20230603. Also create the directory in advance, -because tic does not create multiple levels of directories and would -fail if an older ncurses-base version is installed at build time. - -Closes: #1040048 ---- - debian/rules | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/debian/rules b/debian/rules -index 50ab30c..c7278c7 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -44,7 +44,8 @@ override_dh_auto_install: - cp -pL $$file debian/di-utils-terminfo/$$file; \ - chmod 644 debian/di-utils-terminfo/$$file; \ - done -- tic vt102-di -o debian/di-utils-terminfo/lib/terminfo -+ mkdir -p debian/di-utils-terminfo/usr/share/terminfo -+ tic vt102-di -o debian/di-utils-terminfo/usr/share/terminfo - - mkdir -p debian/di-utils/bin - cp -pL list-devices-$(DEB_HOST_ARCH_OS) debian/di-utils/bin/list-devices --- -GitLab - diff --git a/helpers/make-debian-installer-utils b/helpers/make-debian-installer-utils index ff79fe0..5819d8e 100644 --- a/helpers/make-debian-installer-utils +++ b/helpers/make-debian-installer-utils @@ -23,15 +23,12 @@ # such packages from Debian in order to build the required udeb packages. ## -VERSION=2 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' +VERSION=3 +EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' REPOKEY=0E98404D386FA1D9 NETINST=true . ./config -# Apply patch to fix FTBFS issue. -patch_p1 $DATA/00_18d772d172963506e42442c8d5e1f546be41913a.patch - # Ensure that /run/systemd/resolve/stub-resolve.conf exists inside /target during in-target execution sed '/mount --bind \/run \/target\/run/amkdir -p /run/systemd/resolve; cp /etc/resolv.conf /run/systemd/resolve/stub-resolv.conf' -i chroot-setup.sh