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/libfuse/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/libfuse/patch')
| -rw-r--r-- | pkg/libfuse/patch/0001-Fix-poll.h-include.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkg/libfuse/patch/0001-Fix-poll.h-include.patch b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch new file mode 100644 index 00000000..193a7b12 --- /dev/null +++ b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch @@ -0,0 +1,25 @@ +From 8926abd905339e40bf096c904d900caa42e3262f Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Fri, 15 Jul 2016 19:21:28 -0700 +Subject: [PATCH] Fix poll.h include + +--- + lib/mount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/mount.c b/lib/mount.c +index 227a408..0fc7d15 100644 +--- a/lib/mount.c ++++ b/lib/mount.c +@@ -20,7 +20,7 @@ + #include <string.h> + #include <fcntl.h> + #include <errno.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <sys/wait.h> +-- +2.9.1 + |