From 56a9442f216bdb44ea40b500d6f9ebdfec1eb6b7 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Mon, 4 Nov 2024 11:01:10 -0600 Subject: [PATCH] debian-installer-utils: add patch to fix FTBFS issue. --- ...72d172963506e42442c8d5e1f546be41913a.patch | 32 +++++++++++++++++++ helpers/make-debian-installer-utils | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch diff --git a/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch b/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch new file mode 100644 index 0000000..6f9834c --- /dev/null +++ b/helpers/DATA/debian-installer-utils/00_18d772d172963506e42442c8d5e1f546be41913a.patch @@ -0,0 +1,32 @@ +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 9540301..ff79fe0 100644 --- a/helpers/make-debian-installer-utils +++ b/helpers/make-debian-installer-utils @@ -29,6 +29,9 @@ 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