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 21f4eb0d452646b1555e5d893e28dfa980acdb2a..0000000000000000000000000000000000000000 --- 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 e9e264492d0d2e35bcbd8d6cdb4c1c6f336c7252..2680b191eaa8104d6469c9745542756045749b6e 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