mirror of
https://github.com/oasislinux/oasis.git
synced 2026-02-09 20:26:26 +01:00
293f5a93b7
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
38 lines
864 B
Diff
38 lines
864 B
Diff
From e47145b05bd63b51df6219855747a8247c0910fc Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Sat, 4 Jun 2016 18:40:24 -0700
|
|
Subject: [PATCH] patch: Add missing includes
|
|
|
|
---
|
|
usr.bin/patch/inp.c | 1 +
|
|
usr.bin/patch/patch.c | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
|
|
index 3f60861..80c4801 100644
|
|
--- a/usr.bin/patch/inp.c
|
|
+++ b/usr.bin/patch/inp.c
|
|
@@ -32,6 +32,7 @@
|
|
#include <sys/mman.h>
|
|
|
|
#include <ctype.h>
|
|
+#include <fcntl.h>
|
|
#include <libgen.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
|
|
index 8f8f8cd..8087a21 100644
|
|
--- a/usr.bin/patch/patch.c
|
|
+++ b/usr.bin/patch/patch.c
|
|
@@ -26,6 +26,7 @@
|
|
* behaviour
|
|
*/
|
|
|
|
+#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
--
|
|
2.9.3
|
|
|