|
@@ -5,19 +5,27 @@ shopt -s nullglob
|
|
|
|
|
|
. "$GLUONDIR"/scripts/modules.sh
|
|
|
|
|
|
+TMPDIR="$GLUON_BUILDDIR"/tmp
|
|
|
+
|
|
|
+mkdir -p "$TMPDIR"
|
|
|
+
|
|
|
+PATCHDIR="$TMPDIR"/patching
|
|
|
+trap 'rm -rf "$PATCHDIR"' EXIT
|
|
|
+
|
|
|
for module in $GLUON_MODULES; do
|
|
|
echo "--- Patching module '$module' ---"
|
|
|
|
|
|
- cd "$GLUONDIR"/$module
|
|
|
- git checkout -B patching base
|
|
|
+ git clone -s -b base --single-branch "$GLUONDIR"/$module "$PATCHDIR" 2>/dev/null
|
|
|
|
|
|
+ cd "$PATCHDIR"
|
|
|
for patch in "$GLUONDIR"/patches/$module/*.patch; do
|
|
|
- if ! git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch"; then
|
|
|
- git am --abort
|
|
|
- git checkout patched
|
|
|
- git branch -D patching
|
|
|
- exit 1
|
|
|
- fi
|
|
|
+ git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch"
|
|
|
done
|
|
|
- git branch -M patched
|
|
|
+
|
|
|
+ cd "$GLUONDIR"/$module
|
|
|
+ git fetch "$PATCHDIR" 2>/dev/null
|
|
|
+ git checkout -B patched FETCH_HEAD
|
|
|
+ git submodule update --init --recursive
|
|
|
+
|
|
|
+ rm -rf "$PATCHDIR"
|
|
|
done
|