From 1a3c8e6c4945f987d4bf6fe04845f42a4d793cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Sun, 4 Dec 2022 22:48:45 +0000
Subject: [PATCH] console-setup: rollback console-setup for ubiquity
compatibility.
---
.../DATA/console-setup/fix_1.205_ftbfs.patch | 23 -------------------
helpers/make-console-setup | 7 +-----
2 files changed, 1 insertion(+), 29 deletions(-)
delete mode 100644 helpers/DATA/console-setup/fix_1.205_ftbfs.patch
diff --git a/helpers/DATA/console-setup/fix_1.205_ftbfs.patch b/helpers/DATA/console-setup/fix_1.205_ftbfs.patch
deleted file mode 100644
index 21f4eb0d..00000000
--- a/helpers/DATA/console-setup/fix_1.205_ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8de87da89372d778f490aee8a9198c22521c97d2 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Sun, 31 Oct 2021 18:04:36 +0100
-Subject: [PATCH] Keyboard/kbdcompiler: Avoid 'custom' layout
-
-Closes: #997110.
----
- Keyboard/kbdcompiler | 1 +
- debian/changelog | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/Keyboard/kbdcompiler b/Keyboard/kbdcompiler
-index 61c96af..726b23d 100755
---- a/Keyboard/kbdcompiler
-+++ b/Keyboard/kbdcompiler
-@@ -93,6 +93,7 @@ printf STDERR "Compiling compact keymaps for %s...\n", $model;
- for my $layout (values %KeyboardNames::layouts) {
- next if ($layout eq 'nec/jp');
- next if ($layout eq 'nec_vndr/jp');
-+ next if ($layout eq 'custom');
- my $actual_layout = (($layout eq 'rs') ? 'rs,rs'
- : (($layout eq 'lt') ? 'lt,lt'
- : (($nonlatin =~ / $layout /)
diff --git a/helpers/make-console-setup b/helpers/make-console-setup
index e9e26449..2680b191 100644
--- a/helpers/make-console-setup
+++ b/helpers/make-console-setup
@@ -24,15 +24,10 @@
# or fetch such packages from Debian in order to build the required udeb packages.
##
-VERSION=3
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
-REPOKEY=648ACFD622F3D138
+VERSION=4
NETINST=true
. ./config
-#Fix ftbfs on debian stable
-patch -p1 < $DATA/fix_1.205_ftbfs.patch
-
# Default to UTF-8
sed 's/CHARMAP=ISO-8859-15/CHARMAP=UTF-8/' -i debian/console-setup.config
--
GitLab