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/openbsd/patch/0002-fts-Add-some-includes.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 'core/openbsd/patch/0002-fts-Add-some-includes.patch')
| -rw-r--r-- | core/openbsd/patch/0002-fts-Add-some-includes.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/core/openbsd/patch/0002-fts-Add-some-includes.patch b/core/openbsd/patch/0002-fts-Add-some-includes.patch deleted file mode 100644 index a6a16303..00000000 --- a/core/openbsd/patch/0002-fts-Add-some-includes.patch +++ /dev/null @@ -1,46 +0,0 @@ -From de6a55b9392c80bb9be3dd8b9bb816d8d269ee5b Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 18 Apr 2016 01:25:29 -0700 -Subject: [PATCH] fts: Add some includes - ---- - include/fts.h | 2 ++ - lib/libc/gen/fts.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/include/fts.h b/include/fts.h -index eaf6be0..a5b3aff 100644 ---- a/include/fts.h -+++ b/include/fts.h -@@ -35,6 +35,8 @@ - #ifndef _FTS_H_ - #define _FTS_H_ - -+#include <sys/cdefs.h> -+ - typedef struct { - struct _ftsent *fts_cur; /* current node */ - struct _ftsent *fts_child; /* linked list of children */ -diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c -index 77e1e77..eff297c 100644 ---- a/lib/libc/gen/fts.c -+++ b/lib/libc/gen/fts.c -@@ -31,6 +31,7 @@ - - #include <sys/param.h> /* ALIGN */ - #include <sys/stat.h> -+#include <sys/types.h> - - #include <dirent.h> - #include <errno.h> -@@ -39,6 +40,7 @@ - #include <limits.h> - #include <stdlib.h> - #include <string.h> -+#include <time.h> - #include <unistd.h> - - #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) --- -2.9.3 - |