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, 119 insertions, 0 deletions

diff --git a/pkg/iproute2/gen.rc b/pkg/iproute2/gen.rc
new file mode 100644
index 00000000..2b27d2f5
--- /dev/null
+++ b/pkg/iproute2/gen.rc
@@ -0,0 +1,52 @@
+cflags\
+	-Wall '-Wformat=2' -Wmissing-declarations -Wmissing-prototypes\
+	-Wold-style-definition -Wstrict-prototypes\
+	-D _GNU_SOURCE\
+	-D HAVE_SETNS\
+	-I '$srcdir'/include\
+	-I '$srcdir'/misc
+
+lib libnetlink.a lib/^(\
+	libgenl.c ll_map.c libnetlink.c\
+	\
+	utils.c rt_names.c ll_types.c ll_proto.c ll_addr.c\
+	inet_proto.c namespace.c json_writer.c\
+	names.c color.c\
+	(dnet ipx mpls)^_ntop.c (dnet ipx mpls)^_pton.c\
+)
+
+exe bin/ip ip/^(\
+	ip.c ipaddress.c ipaddrlabel.c iproute.c iprule.c ipnetns.c\
+	rtm_map.c iptunnel.c ip6tunnel.c tunnel.c ipneigh.c ipntable.c iplink.c\
+	ipmaddr.c ipmonitor.c ipmroute.c ipprefix.c iptuntap.c iptoken.c\
+	ipxfrm.c xfrm_state.c xfrm_policy.c xfrm_monitor.c\
+	iplink_vlan.c link_veth.c link_gre.c iplink_can.c\
+	iplink_macvlan.c ipl2tp.c link_vti.c link_vti6.c\
+	iplink_vxlan.c tcp_metrics.c iplink_ipoib.c ipnetconf.c link_ip6tnl.c\
+	link_iptnl.c link_gre6.c iplink_bond.c iplink_bond_slave.c iplink_hsr.c\
+	iplink_bridge.c iplink_bridge_slave.c ipfou.c iplink_ipvlan.c\
+	iplink_geneve.c iplink_vrf.c iproute_lwtunnel.c ipmacsec.c ipila.c\
+) libnetlink.a
+
+exe bin/bridge\
+	bridge/^(bridge.c fdb.c monitor.c link.c mdb.c vlan.c)\
+	libnetlink.a
+
+yacc ssfilter '$srcdir'/misc/ssfilter.y
+exe bin/ss misc/ss.c '$outdir'/ssfilter.tab.c libnetlink.a
+
+for(exe in bin/^(ip bridge ss)) file $exe '$outdir'/$exe 755
+man=(\
+	bridge ip ss\
+	ip-^(\
+                addrlabel fou gue l2tp macsec maddress monitor mroute neighbour\
+                netconf netns ntable rule tcp_metrics token tunnel xfrm\
+	)\
+) for(man in man/man8/$man.8) file share/$man '$srcdir'/$man 644
+for(man in ip-address ip-link ip-route) {
+	build '$outdir'/$man.8 sed '$srcdir'/man/man8/$man.8.in ; with\
+		expr s,@SYSCONFDIR@,/etc,g
+	file share/man/man8/$man.8 '$outdir'/$man.8 644
+}
+
+fetch git
diff --git a/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
new file mode 100644
index 00000000..5c970a38
--- /dev/null
+++ b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
@@ -0,0 +1,66 @@
+From 26ae3ca3f65a72f980c4e7821944c796be0494a7 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 25 Apr 2015 17:37:46 +0000
+Subject: [PATCH] Remove redundant linux/in{,6}.h includes
+
+---
+ include/linux/if_bridge.h | 1 -
+ include/linux/if_tunnel.h | 2 --
+ include/linux/netfilter.h | 2 --
+ include/linux/xfrm.h      | 1 -
+ 4 files changed, 6 deletions(-)
+
+diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
+index d9c76fe..016b4cc 100644
+--- a/include/linux/if_bridge.h
++++ b/include/linux/if_bridge.h
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
+diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
+index 24aa175..19d557d 100644
+--- a/include/linux/if_tunnel.h
++++ b/include/linux/if_tunnel.h
+@@ -2,9 +2,7 @@
+ #define _IF_TUNNEL_H_
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+ #include <linux/ip.h>
+-#include <linux/in6.h>
+ #include <asm/byteorder.h>
+ 
+ 
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index b71b4c9..3e4e6ae 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -4,8 +4,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/sysctl.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+ 
+ /* Responses from hook functions. */
+ #define NF_DROP 0
+diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
+index d09be24..237e9ad 100644
+--- a/include/linux/xfrm.h
++++ b/include/linux/xfrm.h
+@@ -1,7 +1,6 @@
+ #ifndef _LINUX_XFRM_H
+ #define _LINUX_XFRM_H
+ 
+-#include <linux/in6.h>
+ #include <linux/types.h>
+ 
+ /* All of the structures in this file may not change size as they are
+-- 
+2.10.0
+
diff --git a/pkg/iproute2/rev b/pkg/iproute2/rev
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/pkg/iproute2/rev
@@ -0,0 +1 @@
+3
diff --git a/pkg/iproute2/src b/pkg/iproute2/src
new file mode 160000
+Subproject 63ec17a3da8138e6e363e7d89cab4a797d90fa3