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 282118bb1ab9e9bf15882a4ca1cc19f1aa7bd55f..37ef434542ad160603b7c70364a6d938c02d6c7e 100644 (file)
--- 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 267803ec2ce21f25f25259bafa2a813a5b0666da..79ae96253032978de7a1e681d2ac4f5e629baa6a 100644 (file)
--- 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 4b27a95cc2301a47eb8514b84943b465831b9f74..940345c4951f215a45e22a2415d81246fa2f1340 100644 (file)
--- 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