58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
|
From ccd072ef77759ac3ed84e870b23e989ba14f8940 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Date: Tue, 20 Apr 2021 17:39:50 +1000
|
||
|
|
Subject: [PATCH xkeyboard-config 2/4] meson.build: add option to install the
|
||
|
|
legacy xorg symlinks
|
||
|
|
|
||
|
|
console-setup still relies on the xorg ruleset [1] and there may be other tools
|
||
|
|
out there. Let's provide an equivalent option to our autotools build to
|
||
|
|
install the xorg symlinks.
|
||
|
|
|
||
|
|
Note that unlike the autotools approach, only the "xorg" symlinks are
|
||
|
|
provided, not the well and truly legacy "xfree86" ones.
|
||
|
|
|
||
|
|
[1] https://salsa.debian.org/installer-team/console-setup/-/merge_requests/7/
|
||
|
|
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
(cherry picked from commit ff3dcb932024ed13341938cded04142eda94600e)
|
||
|
|
---
|
||
|
|
meson_options.txt | 4 ++++
|
||
|
|
rules/meson.build | 7 +++++++
|
||
|
|
2 files changed, 11 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
||
|
|
index 1bee74b..912d21d 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -6,3 +6,7 @@ option('compat-rules',
|
||
|
|
type: 'boolean',
|
||
|
|
value: true,
|
||
|
|
description: 'create compatibility rules [default=true]')
|
||
|
|
+option('xorg-rules-symlinks',
|
||
|
|
+ type: 'boolean',
|
||
|
|
+ value: true,
|
||
|
|
+ description: 'create "xorg" symlinks to the "base" rules files [default=false]')
|
||
|
|
diff --git a/rules/meson.build b/rules/meson.build
|
||
|
|
index c992f2e..7280560 100644
|
||
|
|
--- a/rules/meson.build
|
||
|
|
+++ b/rules/meson.build
|
||
|
|
@@ -164,8 +164,15 @@ foreach ruleset: ['base', 'evdev']
|
||
|
|
output: lst_file,
|
||
|
|
install: true,
|
||
|
|
install_dir: dir_xkb_rules)
|
||
|
|
+
|
||
|
|
endforeach
|
||
|
|
|
||
|
|
+if get_option('xorg-rules-symlinks')
|
||
|
|
+ foreach suffix: ['', '.lst', '.xml']
|
||
|
|
+ meson.add_install_script('sh', '-c',
|
||
|
|
+ 'ln -s base@0@ $DESTDIR@1@/xorg@0@'.format(suffix, dir_xkb_rules))
|
||
|
|
+ endforeach
|
||
|
|
+endif
|
||
|
|
# Copy the DTD to the build directory, the man page generation expects it in
|
||
|
|
# the same directory as the input XML file.
|
||
|
|
configure_file(output: 'xkb.dtd',
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|