Samuel Thibault, le dim. 31 oct. 2021 18:00:11 +0100, a ecrit:
> Lucas Nussbaum, le sam. 23 oct. 2021 20:32:13 +0200, a ecrit:
> > Relevant part (hopefully):
> > > Compiling compact keymaps for amiga...
> > > Compiling compact keymaps for ataritt...
> > > Compiling compact keymaps for pc105...
> > > Compiling compact keymaps for sun4...
> > > ./kbdcompiler: ckbcomp failed
> > > make: *** [debian/rules:68: /<<PKGBUILDDIR>>/sun4.ekmap] Error 2
>
> As additional information: Keyboard/ckbcomp.log says:
>
> [...]
> ./ckbcomp -compact -I. -I/usr/share/X11/xkb -rules xorg -model pc105 -layout
> us,th -variant ,tis >linux-keymaps/pc105-th:tis.new 2>>ckbcomp.log
> ./ckbcomp -compact -I. -I/usr/share/X11/xkb -rules xorg -model pc105 -layout
> custom -variant >linux-keymaps/pc105-custom:.new 2>>ckbcomp.log
> ./ckbcomp: Can not find file "symbols/custom" in any known directory
Thus committed this, I'll upload it.
Samuel
commit 8de87da89372d778f490aee8a9198c22521c97d2
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Sun Oct 31 18:04:36 2021 +0100
Keyboard/kbdcompiler: Avoid 'custom' layout
Closes: #997110.
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/debian/changelog b/debian/changelog
index 4ff47f1..9f2edb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ console-setup (1.206) UNRELEASED; urgency=medium
[ Peter Hutterer ]
* Keyboard/ckbcomp: use the "base" XKB files, not "xorg".
+ [ Samuel Thibault ]
+ * Keyboard/kbdcompiler: Avoid 'custom' layout. Closes: #997110.
+
-- Samuel Thibault <sthiba...@debian.org> Sun, 05 Sep 2021 14:34:03 +0200
console-setup (1.205) unstable; urgency=medium
