From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config
---
 core/sinit/config.h | 5 -----
 core/sinit/gen.rc   | 8 --------
 core/sinit/rev      | 1 -
 core/sinit/src      | 1 -
 4 files changed, 15 deletions(-)
 delete mode 100644 core/sinit/config.h
 delete mode 100644 core/sinit/gen.rc
 delete mode 100644 core/sinit/rev
 delete mode 160000 core/sinit/src

(limited to 'core/sinit')

diff --git a/core/sinit/config.h b/core/sinit/config.h
deleted file mode 100644
index 3d2da6fc..00000000
--- a/core/sinit/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-static char *const rcinitcmd[]     = { "/etc/rc.init", NULL };
-static char *const rcrebootcmd[]   = { "/etc/rc.shutdown", "reboot", NULL };
-static char *const rcpoweroffcmd[] = { "/etc/rc.shutdown", "poweroff", NULL };
diff --git a/core/sinit/gen.rc b/core/sinit/gen.rc
deleted file mode 100644
index d45f6720..00000000
--- a/core/sinit/gen.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-cflags -Wall -Wextra -I '$dir'
-
-exe sinit sinit.c
-file bin/sinit '$outdir'/sinit 755
-file share/man/man8/sinit.8 '$srcdir'/sinit.8 644
-
-
-fetch git
diff --git a/core/sinit/rev b/core/sinit/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/sinit/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/sinit/src b/core/sinit/src
deleted file mode 160000
index 731f65fc..00000000
--- a/core/sinit/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 731f65fc82afcd474f4c682f9f0069e5c80c86dd
-- 
cgit v1.2.3