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

diff --git a/pkg/util-linux/gen.rc b/pkg/util-linux/gen.rc
new file mode 100644
index 00000000..98f29302
--- /dev/null
+++ b/pkg/util-linux/gen.rc
@@ -0,0 +1,107 @@
+cflags\
+	-include '$dir'/config.h\
+	-I include\
+	-I '$dir' \
+	-I '$outdir' \
+	-I '$srcdir'/include\
+	-I '$srcdir'/libuuid/src
+
+build '$outdir'/libsmartcols.h sed '$srcdir'/libsmartcols/src/libsmartcols.h.in ; with\
+	expr '''s,"@LIBSMARTCOLS_VERSION@",PACKAGE_VERSION,'''
+build '$outdir'/libfdisk.h sed '$srcdir'/libfdisk/src/libfdisk.h.in ; expr=(\
+	-e '''s,"@LIBFDISK_VERSION@",PACKAGE_VERSION,''' \
+	-e /@LIBFDISK_MAJOR_VERSION@/d\
+	-e /@LIBFDISK_MINOR_VERSION@/d\
+	-e /@LIBFDISK_PATCH_VERSION@/d\
+) with expr $"expr
+
+phony deps '$outdir'/^(libsmartcols.h libfdisk.h)
+
+lib libcommon.a lib/^(\
+	blkdev.c\
+	canonicalize.c\
+	crc32.c\
+	env.c\
+	idcache.c\
+	fileutils.c\
+	ismounted.c\
+	mangle.c\
+	match.c\
+	mbsalign.c\
+	md5.c\
+	pager.c\
+	path.c\
+	randutils.c\
+	setproctitle.c\
+	strutils.c\
+	timeutils.c\
+	ttyutils.c\
+	exec_shell.c\
+	strv.c\
+	\
+	linux_version.c\
+	loopdev.c\
+	\
+	procutils.c\
+	sysfs.c\
+)
+
+lib libfdisk.a -d '$dir'/deps libfdisk/src/^(\
+	init.c\
+	field.c\
+	item.c\
+	test.c\
+	ask.c\
+	alignment.c\
+	label.c\
+	utils.c\
+	context.c\
+	parttype.c\
+	partition.c\
+	table.c\
+	iter.c\
+	script.c\
+	version.c\
+	wipe.c\
+	\
+	sun.c\
+	sgi.c\
+	dos.c\
+	bsd.c\
+	gpt.c\
+) libuuid.a libcommon.a
+
+lib libsmartcols.a -d '$dir'/deps libsmartcols/src/^(\
+	iter.c\
+	symbols.c\
+	cell.c\
+	column.c\
+	line.c\
+	table.c\
+	table_print.c\
+	version.c\
+	init.c\
+)
+
+lib libtcolors.a lib/^(colors.c color-names.c)
+
+lib libuuid.a libuuid/src/^(\
+	clear.c\
+	compare.c\
+	copy.c\
+	gen_uuid.c\
+	isnull.c\
+	pack.c\
+	parse.c\
+	unpack.c\
+	unparse.c\
+	uuid_time.c\
+)
+
+exe fdisk -d '$dir'/deps\
+	disk-utils/^(fdisk.c fdisk-menu.c fdisk-list.c)\
+	libfdisk.a.d libsmartcols.a libtcolors.a
+file bin/fdisk '$outdir'/fdisk 755
+file share/man/man8/fdisk.8 '$srcdir'/disk-utils/fdisk.8 644
+
+fetch git