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 /pkg/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 'pkg/sinit')
| -rw-r--r-- | pkg/sinit/config.h | 5 | ||||
| -rw-r--r-- | pkg/sinit/gen.rc | 8 | ||||
| -rw-r--r-- | pkg/sinit/rev | 1 | ||||
| m--------- | pkg/sinit/src | 0 |
4 files changed, 14 insertions, 0 deletions
diff --git a/pkg/sinit/config.h b/pkg/sinit/config.h new file mode 100644 index 00000000..3d2da6fc --- /dev/null +++ b/pkg/sinit/config.h @@ -0,0 +1,5 @@ +/* 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/pkg/sinit/gen.rc b/pkg/sinit/gen.rc new file mode 100644 index 00000000..d45f6720 --- /dev/null +++ b/pkg/sinit/gen.rc @@ -0,0 +1,8 @@ +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/pkg/sinit/rev b/pkg/sinit/rev new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/pkg/sinit/rev @@ -0,0 +1 @@ +2 diff --git a/pkg/sinit/src b/pkg/sinit/src new file mode 160000 +Subproject 731f65fc82afcd474f4c682f9f0069e5c80c86d |