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/openbsd/patch/0005-tar-Default-to-stdin.patch | |
| 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/openbsd/patch/0005-tar-Default-to-stdin.patch')
| -rw-r--r-- | pkg/openbsd/patch/0005-tar-Default-to-stdin.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch b/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch new file mode 100644 index 00000000..f4c2e08c --- /dev/null +++ b/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch @@ -0,0 +1,27 @@ +From 4e6eb43b544fff46d7ca4307b4c0e7699a261ed7 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 18 Apr 2016 01:16:12 -0700 +Subject: [PATCH] tar: Default to stdin + +--- + bin/pax/options.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/bin/pax/options.c b/bin/pax/options.c +index 8721eaa..51101c7 100644 +--- a/bin/pax/options.c ++++ b/bin/pax/options.c +@@ -871,9 +871,7 @@ tar_options(int argc, char **argv) + + if (!fstdin && ((arcname == NULL) || (*arcname == '\0'))) { + arcname = getenv("TAPE"); +- if ((arcname == NULL) || (*arcname == '\0')) +- arcname = _PATH_DEFTAPE; +- else if ((arcname[0] == '-') && (arcname[1]== '\0')) { ++ if ((arcname == NULL) || (*arcname == '\0') || (arcname[0] == '-') && (arcname[1]== '\0')) { + arcname = NULL; + fstdin = 1; + } +-- +2.9.3 + |