From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: 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
---
 core/tz/tzdata.awk | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 core/tz/tzdata.awk

(limited to 'core/tz/tzdata.awk')

diff --git a/core/tz/tzdata.awk b/core/tz/tzdata.awk
deleted file mode 100644
index 6e24a588..00000000
--- a/core/tz/tzdata.awk
+++ /dev/null
@@ -1,26 +0,0 @@
-# usage: awk -f tzdata.awk repo=out/root.git out=out/core/tz/zoneinfo [file...]
-
-function run(cmd) {
-	status = system(cmd)
-	if (status != 0)
-		exit status
-}
-
-BEGIN {
-	cmdfmt = "rc ./scripts/hash.rc %s %s share/zoneinfo/%s %s"
-}
-
-FNR == 1 {
-	run(sprintf("zic -d %s %s", out, FILENAME))
-}
-
-$1 == "Link" {
-	s = $3
-	gsub(/[^\/]+/, "..", s)
-	s = substr(s, 1, length(s) - 2) $2
-	run(sprintf(cmdfmt, repo, 120000, $3, s))
-}
-
-$1 == "Zone" {
-	run(sprintf(cmdfmt, repo, 100644, $2, out "/" $2))
-}
-- 
cgit v1.2.3