From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 4 Mar 2021 08:39:29 +0000 (+0100)
Subject: Move basic/kbd-util to shared/
X-Git-Tag: v248-rc3~50^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315edc2c115a28e9a9463ad5e914610ce893e170;p=thirdparty%2Fsystemd.git

Move basic/kbd-util to shared/

It is (or should be used) in localectl, localed, and a few other places,
no reason to keep it in basic/.
---

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 282118bb1ab..37ef434542a 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -83,8 +83,6 @@ basic_sources = files('''
         io-util.c
         io-util.h
         ioprio.h
-        kbd-util.c
-        kbd-util.h
         khash.c
         khash.h
         label.c
diff --git a/src/basic/kbd-util.c b/src/shared/kbd-util.c
similarity index 99%
rename from src/basic/kbd-util.c
rename to src/shared/kbd-util.c
index 267803ec2ce..79ae9625303 100644
--- a/src/basic/kbd-util.c
+++ b/src/shared/kbd-util.c
@@ -89,7 +89,6 @@ int get_keymaps(char ***ret) {
 }
 
 bool keymap_is_valid(const char *name) {
-
         if (isempty(name))
                 return false;
 
diff --git a/src/basic/kbd-util.h b/src/shared/kbd-util.h
similarity index 100%
rename from src/basic/kbd-util.h
rename to src/shared/kbd-util.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 4b27a95cc23..940345c4951 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -149,6 +149,8 @@ shared_sources = files('''
         json-internal.h
         json.c
         json.h
+        kbd-util.c
+        kbd-util.h
         killall.c
         killall.h
         libcrypt-util.c