diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /core/sinit | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
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
Diffstat (limited to 'core/sinit')
| -rw-r--r-- | core/sinit/config.h | 5 | ||||
| -rw-r--r-- | core/sinit/gen.rc | 8 | ||||
| -rw-r--r-- | core/sinit/rev | 1 | ||||
| m--------- | core/sinit/src | 0 |
4 files changed, 0 insertions, 14 deletions
diff --git a/core/sinit/config.h b/core/sinit/config.h deleted file mode 100644 index 3d2da6fc..00000000 --- a/core/sinit/config.h +++ /dev/null @@ -1,5 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -static char *const rcinitcmd[] = { "/etc/rc.init", NULL }; -static char *const rcrebootcmd[] = { "/etc/rc.shutdown", "reboot", NULL }; -static char *const rcpoweroffcmd[] = { "/etc/rc.shutdown", "poweroff", NULL }; diff --git a/core/sinit/gen.rc b/core/sinit/gen.rc deleted file mode 100644 index d45f6720..00000000 --- a/core/sinit/gen.rc +++ /dev/null @@ -1,8 +0,0 @@ -cflags -Wall -Wextra -I '$dir' - -exe sinit sinit.c -file bin/sinit '$outdir'/sinit 755 -file share/man/man8/sinit.8 '$srcdir'/sinit.8 644 - - -fetch git diff --git a/core/sinit/rev b/core/sinit/rev deleted file mode 100644 index 0cfbf088..00000000 --- a/core/sinit/rev +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/core/sinit/src b/core/sinit/src deleted file mode 160000 -Subproject 731f65fc82afcd474f4c682f9f0069e5c80c86d |