Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
54a93b55
Commit
54a93b55
authored
2 years ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
console-setup: add debian's source to match d-i setup.
parent
a048845a
No related branches found
No related tags found
1 merge request
!941
console-setup: add debian's source to match d-i setup.
Pipeline
#759
passed
2 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/console-setup/fix_1.205_ftbfs.patch
+23
-0
23 additions, 0 deletions
helpers/DATA/console-setup/fix_1.205_ftbfs.patch
helpers/make-console-setup
+5
-3
5 additions, 3 deletions
helpers/make-console-setup
with
28 additions
and
3 deletions
helpers/DATA/console-setup/fix_1.205_ftbfs.patch
0 → 100644
+
23
−
0
View file @
54a93b55
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 /)
This diff is collapsed.
Click to expand it.
helpers/make-console-setup
+
5
−
3
View file @
54a93b55
...
...
@@ -23,12 +23,14 @@
# 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
.
./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."
compile
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment