console-setup: add debian's source to match d-i setup.

This commit is contained in:
Luis Guzmán 2022-11-23 21:15:34 +00:00
parent a048845a6e
commit 54a93b55dd
2 changed files with 28 additions and 3 deletions

View file

@ -0,0 +1,23 @@
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 /)

View file

@ -23,12 +23,14 @@
# or fetch such packages from Debian in order to build the required udeb packages. # or fetch such packages from Debian in order to build the required udeb packages.
## ##
VERSION=1 VERSION=2
EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
REPOKEY=648ACFD622F3D138
NETINST=true NETINST=true
. ./config . ./config
sed -i "s|cdebconf-newt-detect-keys, ||" debian/control #Fix ftbfs on debian stable
patch -p1 < $DATA/fix_1.205_ftbfs.patch
changelog "Rebuild upstream to get udeb dependency for debian-installer." changelog "Rebuild upstream to get udeb dependency for debian-installer."
compile compile