From 6cedfc82ab6f7af2ea0e9cf753beacff4f3dba89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org> Date: Sat, 17 Dec 2022 21:04:00 +0000 Subject: [PATCH] console-setup: test 20console-setup fix on templates of keyb-conf script line. --- .../modify_20console-setup.patch | 19 +++++++++++++++++++ helpers/make-console-setup | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 helpers/DATA/console-setup/modify_20console-setup.patch diff --git a/helpers/DATA/console-setup/modify_20console-setup.patch b/helpers/DATA/console-setup/modify_20console-setup.patch new file mode 100644 index 00000000..3f3ed8f1 --- /dev/null +++ b/helpers/DATA/console-setup/modify_20console-setup.patch @@ -0,0 +1,19 @@ +diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer +--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer 2021-07-23 22:45:19.000000000 -0500 ++++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer 2022-12-17 13:30:51.204297663 -0600 +@@ -18,7 +18,6 @@ + cp -a /etc/default/keyboard /target/etc/default/ + LANG=C + export LANG +- if ! db_get oem-config/enable || [ "$RET" != true ]; then + # create the required templates + debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb + +@@ -27,7 +26,6 @@ + do + echo keyboard-configuration $template seen true + done | chroot /target debconf-set-selections +- fi + ###################################################################### + + apt-install keyboard-configuration || true diff --git a/helpers/make-console-setup b/helpers/make-console-setup index 44857209..5c0d9759 100644 --- a/helpers/make-console-setup +++ b/helpers/make-console-setup @@ -24,7 +24,7 @@ # or fetch such packages from Debian in order to build the required udeb packages. ## -VERSION=5 +VERSION=5.1 NETINST=true . ./config @@ -34,5 +34,7 @@ sed 's/CHARMAP=ISO-8859-15/CHARMAP=UTF-8/' -i debian/console-setup.config #Remove ubuntu's dependency. sed -i "s|cdebconf-newt-detect-keys, ||" debian/control +patch -p2 < $DATA/modify_20console-setup.patch + changelog "Rebuild upstream to get udeb dependency for debian-installer. Default to UTF-8" compile -- GitLab