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

diff --git a/pkg/alsa-utils/gen.rc b/pkg/alsa-utils/gen.rc
new file mode 100644
index 00000000..957ef4f6
--- /dev/null
+++ b/pkg/alsa-utils/gen.rc
@@ -0,0 +1,21 @@
+cflags\
+	-isystem '$builddir'/pkg/alsa-lib/include\
+	-I include\
+	-I '$dir' \
+	-I '$srcdir'/include
+
+fn x {
+	name=$1
+	shift
+	exe bin/$name -d pkg/alsa-lib/headers $*\
+		'$builddir'/pkg/alsa-lib/libasound.a
+	file bin/$name '$outdir'/bin/$name 755
+	file share/man/man1/$name.1 '$srcdir'/$name/$name.1 644
+}
+
+x amixer amixer/amixer.c alsamixer/volume_mapping.c
+x aplay aplay/aplay.c
+sym bin/arecord aplay
+sym share/man/man1/arecord.1 aplay.1
+
+fetch git