From 9e60d31d3cff642d067ee2395ee826876efab9cd Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 18 Apr 2025 02:16:07 -0600 Subject: [PATCH] finish-install: move base release to trixie for d-i/udeb build. --- .../fix_keyboard-configure-netinstall.patch | 16 ---------------- .../001-fix_keyboard-configure-netinstall.patch | 16 ++++++++++++++++ helpers/make-finish-install | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch create mode 100644 helpers/DATA/finish-install/patch_changes/001-fix_keyboard-configure-netinstall.patch diff --git a/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch b/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch deleted file mode 100644 index 231ab51..0000000 --- a/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nru finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs ---- finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs 2018-08-10 14:21:58.000000000 -0500 -+++ finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs 2022-12-18 17:56:21.817264252 -0600 -@@ -4,7 +4,11 @@ - # update-initramfs to make sure one can type the passphrase - # (see #694156, workaround for #696773): - /bin/in-target \ -- /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1" -+ /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1" -+ -+#Fix bug keyboard not using the selected layout. -+/bin/in-target \ -+ dpkg-reconfigure -f noninteractive keyboard-configuration - - if [ $? = 0 ]; then - echo "Encrypted LVM detected, refreshing initramfs" diff --git a/helpers/DATA/finish-install/patch_changes/001-fix_keyboard-configure-netinstall.patch b/helpers/DATA/finish-install/patch_changes/001-fix_keyboard-configure-netinstall.patch new file mode 100644 index 0000000..0101fe3 --- /dev/null +++ b/helpers/DATA/finish-install/patch_changes/001-fix_keyboard-configure-netinstall.patch @@ -0,0 +1,16 @@ +diff --git a/finish-install.d/10update-initramfs b/finish-install.d/10update-initramfs +index f91557cb..6b35ce25 100755 +--- a/finish-install.d/10update-initramfs ++++ b/finish-install.d/10update-initramfs +@@ -6,8 +6,10 @@ log() { + + # If both cryptsetup and console-setup are installed, run update-initramfs to + # make sure one can type the passphrase (see #694156, workaround for #696773): +-if /bin/in-target /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1"; then ++if /bin/in-target /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1"; then + log "refresh initramfs for cryptsetup" ++ # Fix bug keyboard not using the selected layout. --Trisquel ++ /bin/in-target /bin/sh -c "dpkg-reconfigure -f noninteractive keyboard-configuration" + refresh=yes + fi + diff --git a/helpers/make-finish-install b/helpers/make-finish-install index 7ef1db2..b6d37ca 100644 --- a/helpers/make-finish-install +++ b/helpers/make-finish-install @@ -24,12 +24,12 @@ ## VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' +EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' REPOKEY=0E98404D386FA1D9 NETINST=true . ./config -patch --no-backup-if-mismatch -p1 < $DATA/fix_keyboard-configure-netinstall.patch +apply_patch_changes changelog "Fetch and build as udeb dependency for debian-installer." package