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/skeleton | |
| 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/skeleton')
| -rw-r--r-- | core/skeleton/gen.rc | 17 | ||||
| -rw-r--r-- | core/skeleton/gitignore | 10 |
2 files changed, 0 insertions, 27 deletions
diff --git a/core/skeleton/gen.rc b/core/skeleton/gen.rc deleted file mode 100644 index 522d3228..00000000 --- a/core/skeleton/gen.rc +++ /dev/null @@ -1,17 +0,0 @@ -dir bin 755 -dir boot 755 -dir dev 755 -dir etc 755 -dir home 755 -dir mnt 755 -dir proc 755 -dir root 700 -dir run 755 -dir sys 755 -dir tmp 755 -dir var 755 -dir var/empty 755 -dir var/log 755 -sym usr/bin ../bin - -file .gitignore '$dir'/gitignore 644 diff --git a/core/skeleton/gitignore b/core/skeleton/gitignore deleted file mode 100644 index 90c5afa2..00000000 --- a/core/skeleton/gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/etc -/home -/mnt -/proc -/root -/run -/src -/sys -/tmp -/var |