console-setup: rollback console-setup for ubiquity compatibility.
This commit is contained in:
parent
b3bf2f2e8a
commit
1a3c8e6c49
2 changed files with 1 additions and 29 deletions
|
|
@ -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 /)
|
|
||||||
|
|
@ -24,15 +24,10 @@
|
||||||
# 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=3
|
VERSION=4
|
||||||
EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
|
|
||||||
REPOKEY=648ACFD622F3D138
|
|
||||||
NETINST=true
|
NETINST=true
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
#Fix ftbfs on debian stable
|
|
||||||
patch -p1 < $DATA/fix_1.205_ftbfs.patch
|
|
||||||
|
|
||||||
# Default to UTF-8
|
# Default to UTF-8
|
||||||
sed 's/CHARMAP=ISO-8859-15/CHARMAP=UTF-8/' -i debian/console-setup.config
|
sed 's/CHARMAP=ISO-8859-15/CHARMAP=UTF-8/' -i debian/console-setup.config
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue