Update move.sh

2 files changed, 18 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index feb639594e..b4c1285de9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1400,7 +1400,7 @@ src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
 
-#@src/journal/Makefile
+#@src/grp-resolve/systemd-resolved/Makefile
 
 src/resolve/dns_type-list.txt: src/resolve/dns-type.h
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -4406,7 +4406,7 @@ endif # HAVE_GCRYPT
 
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
-#@src/journal/Makefile
+#@src/grp-journal/systemd-journald/Makefile
 
 rootlibexec_PROGRAMS += \
 	systemd-journald
@@ -4461,7 +4461,7 @@ EXTRA_DIST += \
 gperf_gperf_sources += \
 	src/journal/journald-gperf.gperf
 
-# ------------------------------------------------------------------------------
+#@src/grp-journal-remote/systemd-journal-gatewayd/Makefile ---------------------
 if HAVE_MICROHTTPD
 gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
 
diff --git a/move.sh b/move.sh
index 22caeb8a6f..3c9d359fbf 100755
--- a/move.sh
+++ b/move.sh
@@ -36,7 +36,6 @@ move_files() (
 		ask-password
 		backlight
 		binfmt
-		bootchart
 		cgls
 		cgroups-agent
 		cgtop
@@ -58,6 +57,7 @@ move_files() (
 		reply-password
 		rfkill
 		run
+		stdio-bridge
 		timesync
 		tmpfiles
 		tty-ask-password-agent
@@ -70,16 +70,12 @@ move_files() (
 		mv -T src/{,systemd-}$d
 	done
 
-
-	mv -T {,src/journal/}catalog
-
 	mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install
 	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
 	mv -T {man,src/kernel-install}/kernel-install.xml
 
 	mv -T src/lib{shared,core}/linux
 
-	mv -T src/{,libsystemd/}/compat-libs
 	mkdir src/libsystemd/include
 	mv -T src/{,libsystemd/include}/systemd
 
@@ -116,8 +112,6 @@ move_files() (
 	mkdir src/libudev/include
 	mv -T src/libudev/{src,include}/libudev.h
 
-	mv -T {man,src/systemd-activate}/systemd-activate.xml
-
 	mv -T src/libsystemd/{src,}/libsystemd.pc.in
 	mv -T src/libsystemd/{src,}/libsystemd.sym
 	mv -T src/libsystemd/{src,}/.gitignore
@@ -176,12 +170,6 @@ move_files() (
 
 	mv -T src/{udev,libudev/src}/udev.h
 
-	mv -T src/{bus-proxyd,libbus-proxy-core}
-	mkdir src/systemd-bus-proxyd
-	mv  src/{libbus-proxy-core,systemd-bus-proxyd}/bus-proxyd.c
-	mkdir src/systemd-stdio-bridge
-	mv  src/{libbus-proxy-core,systemd-stdio-bridge}/stdio-bridge.c
-
 	mkdir src/grp-timedate
 	mv -T src/timedate src/grp-timedate/systemd-timedated
 	mkdir src/grp-timedate/timedatectl
@@ -190,6 +178,20 @@ move_files() (
 	mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.c
 	mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.h
 	mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/test-local-addresses.c
+
+	mv -T src/{journal,grp-journal}
+	mv -T {,src/grp-journal/}catalog
+	mkdir src/grp-journal/{systemd-journald,journalctl,libjournal-core}
+	mv -T src/grp-journal/{,systemd-journald}/journald.c
+	mv -T src/grp-journal/{,journalctl}/journalctl.c
+	mv    src/grp-journal/*.* src/grp-journal/libjournal-core/
+
+	mv -T src/{,grp-}journal-remote
+	local suffix
+	for suffix in gatewayd remote upload; do
+		mkdir src/grp-journal-remote/systemd-journal-$suffix
+		mv src/grp-journal-remote/journal-$suffix* src/grp-journal-remote/systemd-journal-$suffix/
+	done
 )
 
 breakup_makefile() (