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
---
 pkg/skeleton/gen.rc    | 17 +++++++++++++++++
 pkg/skeleton/gitignore | 10 ++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkg/skeleton/gen.rc
 create mode 100644 pkg/skeleton/gitignore

(limited to 'pkg/skeleton')

diff --git a/pkg/skeleton/gen.rc b/pkg/skeleton/gen.rc
new file mode 100644
index 00000000..522d3228
--- /dev/null
+++ b/pkg/skeleton/gen.rc
@@ -0,0 +1,17 @@
+dir bin 755
+dir boot 755
+dir dev 755
+dir etc 755
+dir home 755
+dir mnt 755
+dir proc 755
+dir root 700
+dir run 755
+dir sys 755
+dir tmp 755
+dir var 755
+dir var/empty 755
+dir var/log 755
+sym usr/bin ../bin
+
+file .gitignore '$dir'/gitignore 644
diff --git a/pkg/skeleton/gitignore b/pkg/skeleton/gitignore
new file mode 100644
index 00000000..90c5afa2
--- /dev/null
+++ b/pkg/skeleton/gitignore
@@ -0,0 +1,10 @@
+/etc
+/home
+/mnt
+/proc
+/root
+/run
+/src
+/sys
+/tmp
+/var
-- 
cgit v1.2.3