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/pigz | |
| 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/pigz')
| -rw-r--r-- | pkg/pigz/gen.rc | 12 | ||||
| -rw-r--r-- | pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch | 39 | ||||
| -rw-r--r-- | pkg/pigz/rev | 1 | ||||
| m--------- | pkg/pigz/src | 0 |
4 files changed, 52 insertions, 0 deletions
diff --git a/pkg/pigz/gen.rc b/pkg/pigz/gen.rc new file mode 100644 index 00000000..5eb80637 --- /dev/null +++ b/pkg/pigz/gen.rc @@ -0,0 +1,12 @@ +cflags\ + -Wall -Wextra\ + -isystem '$builddir'/pkg/zlib/include + +exe pigz -d pkg/zlib/headers\ + pigz.c yarn.c try.c\ + zopfli/src/zopfli/^(deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c squeeze.c katajainen.c)\ + '$builddir'/pkg/zlib/libz.a +file bin/pigz '$outdir'/pigz 755 +for(alias in gzip gunzip zcat) sym bin/$alias pigz + +fetch git diff --git a/pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch b/pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch new file mode 100644 index 00000000..50ced245 --- /dev/null +++ b/pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch @@ -0,0 +1,39 @@ +From d9642e90c3ece95407627c005dee51d193305398 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 20 Nov 2016 18:41:36 -0800 +Subject: [PATCH] Handle -n option like gzip does + +--- + pigz.1 | 2 +- + pigz.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pigz.1 b/pigz.1 +index 9679e40..4e5d9f0 100644 +--- a/pigz.1 ++++ b/pigz.1 +@@ -156,7 +156,7 @@ Display the + license and quit. + .TP + .B -n --no-name +-Do not store or restore file name in/from header. ++Do not store or restore file name and mod time in/from header. + .TP + .B -N --name + Store/restore file name and mod time in/from header. +diff --git a/pigz.c b/pigz.c +index a35a645..cf53623 100644 +--- a/pigz.c ++++ b/pigz.c +@@ -4028,7 +4028,7 @@ local int option(char *arg) + case 'i': g.setdict = 0; break; + case 'k': g.keep = 1; break; + case 'l': g.list = 1; break; +- case 'n': g.headis &= ~5; break; ++ case 'n': g.headis &= ~0xf; break; + case 'p': get = 2; break; + case 'q': g.verbosity = 0; break; + case 'r': g.recurse = 1; break; +-- +2.10.2 + diff --git a/pkg/pigz/rev b/pkg/pigz/rev new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/pkg/pigz/rev @@ -0,0 +1 @@ +3 diff --git a/pkg/pigz/src b/pkg/pigz/src new file mode 160000 +Subproject a6f3dab846fec23c3f0db8ba6aafcb6772afefd |