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

4 files changed, 73 insertions, 0 deletions

diff --git a/pkg/libnl/defs.h b/pkg/libnl/defs.h
new file mode 100644
index 00000000..6c422830
--- /dev/null
+++ b/pkg/libnl/defs.h
@@ -0,0 +1,20 @@
+#include <config-posix.h>
+
+/* #undef DISABLE_PTHREADS */
+#define HAVE_LIBM 1
+#define HAVE_LIBPTHREAD 1
+#define HAVE_MEMORY_H 1
+#define LT_OBJDIR ".libs/"
+#define NL_DEBUG 1
+#define PACKAGE "libnl"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "libnl"
+#define PACKAGE_STRING "libnl 3.2.28"
+#define PACKAGE_TARNAME "libnl"
+#define PACKAGE_URL "http://www.infradead.org/~tgr/libnl/"
+#define PACKAGE_VERSION "3.2.28"
+#define VERSION "3.2.28"
+/* #undef const */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
diff --git a/pkg/libnl/gen.rc b/pkg/libnl/gen.rc
new file mode 100644
index 00000000..35e846b8
--- /dev/null
+++ b/pkg/libnl/gen.rc
@@ -0,0 +1,52 @@
+cflags\
+	-D _GNU_SOURCE\
+	-D 'SYSCONFDIR=''"/etc/libnl"''' \
+	-isystem include\
+	-I '$dir' \
+	-I '$outdir'/include\
+	-I '$srcdir'/include\
+	-I '$srcdir'/include/linux-private
+
+hdrs=include/netlink/^(\
+	addr.h\
+	attr.h\
+	cache.h\
+	data.h\
+	errno.h\
+	handlers.h\
+	genl/^(ctrl.h genl.h)\
+	hash.h\
+	list.h\
+	msg.h\
+	netlink.h\
+	netlink-compat.h\
+	netlink-kernel.h\
+	object.h\
+	socket.h\
+	types.h\
+	utils.h\
+)
+for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
+build '$outdir'/include/netlink/version.h sed '$srcdir'/include/netlink/version.h.in ; exprs=(\
+	-e s,@PACKAGE_STRING@,'''libnl 3.2.27''',\
+	-e s,@PACKAGE_VERSION@,3.2.27,\
+	-e s,@MAJ_VERSION@,3,\
+	-e s,@MIN_VERSION@,2,\
+	-e s,@MIC_VERSION@,27,\
+	-e s,@LT_CURRENT@,222,\
+	-e s,@LT_REVISION@,0,\
+	-e s,@LT_AGE@,22,\
+) with expr $"exprs
+hdrs=($hdrs include/netlink/version.h)
+phony headers '$outdir'/$hdrs
+
+lib libnl-3.a -d '$dir'/headers lib/^(\
+	addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c\
+	error.c handlers.c msg.c nl.c object.c socket.c utils.c\
+	version.c hash.c hashtable.c\
+)
+
+lib libnl-genl-3.a -d '$dir'/headers\
+	lib/genl/^(ctrl.c family.c genl.c mngt.c)
+
+fetch git
diff --git a/pkg/libnl/rev b/pkg/libnl/rev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/pkg/libnl/rev
@@ -0,0 +1 @@
+2
diff --git a/pkg/libnl/src b/pkg/libnl/src
new file mode 160000
+Subproject 656f381ccf58785319bb0236595c896125d33ed