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

1 files changed, 0 insertions, 24 deletions

diff --git a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch b/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
deleted file mode 100644
index 9225f6fd..00000000
--- a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From abdea742e220edf3b7ba8b44260e75ca95c5c9da Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 19:30:09 -0800
-Subject: [PATCH] Add missing stdlib.h include for mkstemp
-
----
- io.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/io.c b/io.c
-index 16a0709..99fa0a8 100644
---- a/io.c
-+++ b/io.c
-@@ -9,6 +9,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
--- 
-2.11.0
-