diff options
34 files changed, 53 insertions, 68 deletions
diff --git a/src/grp-boot/bootctl/bootctl.c b/src/grp-boot/bootctl/bootctl.c index 0a6a57e3ae..59ebb19bed 100644 --- a/src/grp-boot/bootctl/bootctl.c +++ b/src/grp-boot/bootctl/bootctl.c @@ -36,7 +36,6 @@ #include <unistd.h> #include "systemd-basic/alloc-util.h" -#include "systemd-basic/blkid-util.h" #include "systemd-basic/dirent-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -44,6 +43,7 @@ #include "systemd-basic/rm-rf.h" #include "systemd-basic/string-util.h" #include "systemd-basic/util.h" +#include "systemd-blkid/blkid-util.h" #include "systemd-shared/efivars.h" static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) { diff --git a/src/grp-journal/grp-remote/microhttpd-util.h b/src/grp-journal/grp-remote/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h index a84bdc234a..a84bdc234a 100644 --- a/src/grp-journal/grp-remote/microhttpd-util.h +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h diff --git a/src/grp-journal/grp-remote/microhttpd-util.c b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/microhttpd-util.c index c03f8d64b4..2dc73e75e3 100644 --- a/src/grp-journal/grp-remote/microhttpd-util.c +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/microhttpd-util.c @@ -33,8 +33,7 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" - -#include "microhttpd-util.h" +#include "systemd-microhttpd/microhttpd-util.h" void microhttpd_logger(void *arg, const char *fmt, va_list ap) { char *f; diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c index bcb2550a4b..225da57cb8 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c @@ -31,7 +31,6 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-journal.h> -#include "microhttpd-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -40,6 +39,7 @@ #include "systemd-basic/parse-util.h" #include "systemd-basic/sigbus.h" #include "systemd-basic/util.h" +#include "systemd-microhttpd/microhttpd-util.h" #include "systemd-shared/bus-util.h" #include "systemd-shared/logs-show.h" diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h index e427662d59..1c090ccdfc 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "microhttpd-util.h" #include "systemd-basic/hashmap.h" +#include "systemd-microhttpd/microhttpd-util.h" #include "journal-remote-parse.h" #include "journal-remote-write.h" diff --git a/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c index 26ee159d60..9f56ce0843 100644 --- a/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c +++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c @@ -26,8 +26,8 @@ #include "systemd-basic/alloc-util.h" #include "systemd-basic/hexdecoct.h" #include "systemd-basic/string-table.h" +#include "systemd-gcrypt/gcrypt-util.h" #include "systemd-shared/dns-domain.h" -#include "systemd-shared/gcrypt-util.h" #define VERIFY_RRS_MAX 256 #define MAX_KEY_SIZE (32*1024) diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index c39bdcca82..e810b8d891 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -33,8 +33,8 @@ #include "systemd-basic/parse-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" +#include "systemd-gcrypt/gcrypt-util.h" #include "systemd-shared/bus-util.h" -#include "systemd-shared/gcrypt-util.h" #include "systemd-shared/pager.h" #include "systemd-staging/sd-netlink.h" diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c deleted file mode 120000 index 7f7ff15b46..0000000000 --- a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h deleted file mode 120000 index 50721d8bfc..0000000000 --- a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/killall.c b/src/grp-system/systemd-shutdown/killall.c deleted file mode 120000 index 5ddb36306b..0000000000 --- a/src/grp-system/systemd-shutdown/killall.c +++ /dev/null @@ -1 +0,0 @@ -../libcore/killall.c
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/killall.h b/src/grp-system/systemd-shutdown/killall.h deleted file mode 120000 index 60b334fe91..0000000000 --- a/src/grp-system/systemd-shutdown/killall.h +++ /dev/null @@ -1 +0,0 @@ -../libcore/killall.h
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/mount-setup.c b/src/grp-system/systemd-shutdown/mount-setup.c deleted file mode 120000 index a4ab487157..0000000000 --- a/src/grp-system/systemd-shutdown/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/mount-setup.h b/src/grp-system/systemd-shutdown/mount-setup.h deleted file mode 120000 index 1f984851f8..0000000000 --- a/src/grp-system/systemd-shutdown/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/libsystemd-basic/include/systemd-basic/.gitignore b/src/libsystemd-basic/src/.gitignore index e22411e484..e22411e484 100644 --- a/src/libsystemd-basic/include/systemd-basic/.gitignore +++ b/src/libsystemd-basic/src/.gitignore diff --git a/src/libsystemd-basic/include/systemd-basic/blkid-util.h b/src/libsystemd-blkid/include/systemd-blkid/blkid-util.h index 7aa75eb091..f476c313b0 100644 --- a/src/libsystemd-basic/include/systemd-basic/blkid-util.h +++ b/src/libsystemd-blkid/include/systemd-blkid/blkid-util.h @@ -23,7 +23,7 @@ #include <blkid/blkid.h> #endif -#include "util.h" +#include "systemd-basic/util.h" #ifdef HAVE_BLKID DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe); diff --git a/src/libsystemd-shared/include/systemd-shared/gcrypt-util.h b/src/libsystemd-gcrypt/include/systemd-gcrypt/gcrypt-util.h index cf33b3c59c..cf33b3c59c 100644 --- a/src/libsystemd-shared/include/systemd-shared/gcrypt-util.h +++ b/src/libsystemd-gcrypt/include/systemd-gcrypt/gcrypt-util.h diff --git a/src/libsystemd-shared/src/gcrypt-util.c b/src/libsystemd-gcrypt/src/gcrypt-util.c index 3734450b97..42b922571f 100644 --- a/src/libsystemd-shared/src/gcrypt-util.c +++ b/src/libsystemd-gcrypt/src/gcrypt-util.c @@ -23,7 +23,7 @@ #include <gcrypt.h> #include "systemd-basic/hexdecoct.h" -#include "systemd-shared/gcrypt-util.h" +#include "systemd-gcrypt/gcrypt-util.h" void initialize_libgcrypt(bool secmem) { const char *p; diff --git a/src/libsystemd/src/sd-journal/fsprg.c b/src/libsystemd/src/sd-journal/fsprg.c index 612b10f3a9..c0f59b28fd 100644 --- a/src/libsystemd/src/sd-journal/fsprg.c +++ b/src/libsystemd/src/sd-journal/fsprg.c @@ -29,8 +29,9 @@ #include <gcrypt.h> #include <string.h> +#include "systemd-gcrypt/gcrypt-util.h" + #include "fsprg.h" -#include "gcrypt-util.h" #define ISVALID_SECPAR(secpar) (((secpar) % 16 == 0) && ((secpar) >= 16) && ((secpar) <= 16384)) #define VALIDATE_SECPAR(secpar) assert(ISVALID_SECPAR(secpar)); diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c deleted file mode 120000 index 9bcbc9189b..0000000000 --- a/src/libsystemd/src/sd-journal/gcrypt-util.c +++ /dev/null @@ -1 +0,0 @@ -../../../libsystemd-shared/src/gcrypt-util.c
\ No newline at end of file diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h deleted file mode 120000 index aea8263ab0..0000000000 --- a/src/libsystemd/src/sd-journal/gcrypt-util.h +++ /dev/null @@ -1 +0,0 @@ -../../../libsystemd-shared/include/systemd-shared/gcrypt-util.h
\ No newline at end of file diff --git a/src/libsystemd/src/sd-journal/journal-authenticate.c b/src/libsystemd/src/sd-journal/journal-authenticate.c index d64152a2be..f3a207d88d 100644 --- a/src/libsystemd/src/sd-journal/journal-authenticate.c +++ b/src/libsystemd/src/sd-journal/journal-authenticate.c @@ -22,9 +22,9 @@ #include "systemd-basic/fd-util.h" #include "systemd-basic/hexdecoct.h" +#include "systemd-gcrypt/gcrypt-util.h" #include "fsprg.h" -#include "gcrypt-util.h" #include "journal-authenticate.h" #include "journal-def.h" #include "journal-file.h" diff --git a/src/systemd-gpt-auto-generator/gpt-auto-generator.c b/src/systemd-gpt-auto-generator/gpt-auto-generator.c index 302a059d5e..a854395bce 100644 --- a/src/systemd-gpt-auto-generator/gpt-auto-generator.c +++ b/src/systemd-gpt-auto-generator/gpt-auto-generator.c @@ -26,7 +26,6 @@ #include <systemd/sd-id128.h> #include "systemd-basic/alloc-util.h" -#include "systemd-basic/blkid-util.h" #include "systemd-basic/btrfs-util.h" #include "systemd-basic/dirent-util.h" #include "systemd-basic/fd-util.h" @@ -43,6 +42,7 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" #include "systemd-basic/virt.h" +#include "systemd-blkid/blkid-util.h" #include "systemd-shared/efivars.h" #include "systemd-shared/fstab-util.h" #include "systemd-shared/generator.h" diff --git a/src/systemd-machine-id-setup/machine-id-setup.c b/src/systemd-machine-id-setup/machine-id-setup.c deleted file mode 120000 index 78f80e2b73..0000000000 --- a/src/systemd-machine-id-setup/machine-id-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.c
\ No newline at end of file diff --git a/src/systemd-machine-id-setup/machine-id-setup.h b/src/systemd-machine-id-setup/machine-id-setup.h deleted file mode 120000 index d2659724ce..0000000000 --- a/src/systemd-machine-id-setup/machine-id-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c deleted file mode 120000 index da633f4936..0000000000 --- a/src/systemd-nspawn/loopback-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/loopback-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/loopback-setup.h b/src/systemd-nspawn/loopback-setup.h deleted file mode 120000 index dc051ab1bd..0000000000 --- a/src/systemd-nspawn/loopback-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/loopback-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/machine-id-setup.c b/src/systemd-nspawn/machine-id-setup.c deleted file mode 120000 index 78f80e2b73..0000000000 --- a/src/systemd-nspawn/machine-id-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/machine-id-setup.h b/src/systemd-nspawn/machine-id-setup.h deleted file mode 120000 index d2659724ce..0000000000 --- a/src/systemd-nspawn/machine-id-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/machine-id-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.c b/src/systemd-nspawn/mount-setup.c deleted file mode 120000 index 67cb74c218..0000000000 --- a/src/systemd-nspawn/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/mount-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.h b/src/systemd-nspawn/mount-setup.h deleted file mode 120000 index bae54ba700..0000000000 --- a/src/systemd-nspawn/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/mount-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c index 5fdb0668b6..73548f98eb 100644 --- a/src/systemd-nspawn/nspawn.c +++ b/src/systemd-nspawn/nspawn.c @@ -49,7 +49,6 @@ #include "sd-netlink/netlink-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/barrier.h" -#include "systemd-basic/blkid-util.h" #include "systemd-basic/btrfs-util.h" #include "systemd-basic/cap-list.h" #include "systemd-basic/capability-util.h" @@ -83,6 +82,7 @@ #include "systemd-basic/umask-util.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" +#include "systemd-blkid/blkid-util.h" #include "systemd-shared/base-filesystem.h" #include "systemd-shared/dev-setup.h" #include "systemd-shared/fdset.h" diff --git a/src/systemd-remount-fs/mount-setup.c b/src/systemd-remount-fs/mount-setup.c deleted file mode 120000 index 67cb74c218..0000000000 --- a/src/systemd-remount-fs/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/mount-setup.c
\ No newline at end of file diff --git a/src/systemd-remount-fs/mount-setup.h b/src/systemd-remount-fs/mount-setup.h deleted file mode 120000 index bae54ba700..0000000000 --- a/src/systemd-remount-fs/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/mount-setup.h
\ No newline at end of file diff --git a/tools/notsd-move b/tools/notsd-move index 481bd59523..a2190bac64 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -10,23 +10,30 @@ in_array() ( return 1 # Not Found ) -split_lib() { +split_lib() ( + shopt -s nullglob local d=$1 + local t - local t=("$d"/test-*) - if [[ -e ${t[0]} ]]; then + if t=("$d"/test-*) && [[ ${#t[@]} -gt 0 ]]; then mkdir "$d/test" - mv "$d"/test-* -t "$d/test" + mv -t "$d/test" -- "${t[@]}" fi - mkdir "$d/src" - mv "$d"/*.c -t "$d/src" + if t=("$d"/*.c) && [[ ${#t[@]} -gt 0 ]]; then + mkdir "$d/src" + mv -t "$d/src" -- "${t[@]}" + fi - local h=${d##*/lib} - mkdir "$d/include" - mkdir "$d/include/$h" - mv "$d"/*.h -t "$d/include/$h" -} + if t=("$d"/*.h) && [[ ${#t[@]} -gt 0 ]]; then + local h=${d##*/lib} + mkdir "$d/include" + mkdir "$d/include/$h" + mv -t "$d/include/$h" -- "${t[@]}" + else + return 1 + fi +) grp() { local grp=$1 @@ -128,11 +135,25 @@ move_files() ( mv -T src/libsystemd-{shared,firewall}/firewall-util.c mv -T src/libsystemd-{shared,firewall}/firewall-util.h + mkdir src/libsystemd-gcrypt + mv -T src/libsystemd-{shared,gcrypt}/gcrypt-util.c + mv -T src/libsystemd-{shared,gcrypt}/gcrypt-util.h + + mkdir src/libsystemd-blkid + mv -T src/libsystemd-{basic,blkid}/blkid-util.h + + mkdir src/libsystemd-microhttpd + mv -t src/libsystemd-microhttpd \ + src/journal-remote/microhttpd* + split_lib src/libcore split_lib src/libsystemd-basic split_lib src/libsystemd-shared split_lib src/libsystemd-network split_lib src/libsystemd-firewall + split_lib src/libsystemd-gcrypt + split_lib src/libsystemd-blkid + split_lib src/libsystemd-microhttpd mv -t src/libcore/src \ src/libcore/linux \ @@ -304,8 +325,7 @@ move_files() ( mv -t src/grp-remote.d \ src/journal-remote/.gitignore \ src/journal-remote/browse.html \ - src/journal-remote/log-generator.py \ - src/journal-remote/microhttpd* + src/journal-remote/log-generator.py rmdir src/journal-remote # src/locale => src/... @@ -460,7 +480,7 @@ move_files() ( units/machine.slice* # muck - mv -t src/libsystemd-basic/include/systemd-basic src/libsystemd-basic/.gitignore + mv -t src/libsystemd-basic/src src/libsystemd-basic/.gitignore mv -T {test,src/systemd-boot}/test-efi-create-disk.sh mv -t src/systemd-tmpfiles units/systemd-tmpfiles* mv -t src/systemd-tmpfiles \ @@ -598,6 +618,7 @@ move_files() ( src/systemd-hibernate-resume-generator \ src/systemd-sleep grp src/grp-remote \ + src/libsystemd-microhttpd \ src/systemd-journal-gatewayd \ src/systemd-journal-remote \ src/systemd-journal-upload @@ -735,29 +756,11 @@ breakup_makefile() ( src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile - ln -sT ../grp-system/libcore/mount-setup.h src/systemd-remount-fs/mount-setup.h - ln -sT ../grp-system/libcore/mount-setup.c src/systemd-remount-fs/mount-setup.c - ln -sT ../libcore/mount-setup.h src/grp-system/systemd-shutdown/mount-setup.h - ln -sT ../libcore/mount-setup.c src/grp-system/systemd-shutdown/mount-setup.c - ln -sT ../libcore/killall.h src/grp-system/systemd-shutdown/killall.h - ln -sT ../libcore/killall.c src/grp-system/systemd-shutdown/killall.c - ln -sT ../../libcore/mount-setup.h src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h - ln -sT ../../libcore/mount-setup.c src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c - ln -sT ../grp-system/libcore/mount-setup.h src/systemd-nspawn/mount-setup.h - ln -sT ../grp-system/libcore/loopback-setup.h src/systemd-nspawn/loopback-setup.h - ln -sT ../grp-system/libcore/loopback-setup.c src/systemd-nspawn/loopback-setup.c - ln -sT ../grp-system/libcore/machine-id-setup.h src/systemd-nspawn/machine-id-setup.h - ln -sT ../grp-system/libcore/machine-id-setup.c src/systemd-nspawn/machine-id-setup.c - ln -sT ../grp-system/libcore/mount-setup.c src/systemd-nspawn/mount-setup.c - ln -sT ../../../libsystemd/include/systemd/_sd-common.h src/libsystemd-network/include/systemd-network/_sd-common.h - ln -sT ../../libsystemd/include/systemd/_sd-common.h src/grp-utils/systemd-path/_sd-common.h - ln -sT ../../grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h - ln -sT ../../libsystemd/src/sd-login/sd-login.c src/grp-udev/libudev-core/sd-login.c - ln -sT ../../grp-login/systemd-logind/logind-acl.c src/grp-udev/libudev-core/logind-acl.c - ln -sT ../../../libsystemd-shared/include/systemd-shared/gcrypt-util.h src/libsystemd/src/sd-journal/gcrypt-util.h - ln -sT ../../../libsystemd-shared/src/gcrypt-util.c src/libsystemd/src/sd-journal/gcrypt-util.c - ln -sT ../grp-system/libcore/machine-id-setup.h src/systemd-machine-id-setup/machine-id-setup.h - ln -sT ../grp-system/libcore/machine-id-setup.c src/systemd-machine-id-setup/machine-id-setup.c + ln -srT src/libsystemd/include/systemd/_sd-common.h src/libsystemd-network/include/systemd-network/_sd-common.h + ln -srT src/libsystemd/include/systemd/_sd-common.h src/grp-utils/systemd-path/_sd-common.h + ln -srT src/grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h + ln -srT src/grp-login/systemd-logind/logind-acl.c src/grp-udev/libudev-core/logind-acl.c + ln -srT src/libsystemd/src/sd-login/sd-login.c src/grp-udev/libudev-core/sd-login.c ln -sT ../subdir.mk src/libsystemd/src/sd-network/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-bus/Makefile |