nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make module scripts use GLUONDIR and GLUON_SITEDIR

Browse Source 
This fixes `make update` not working correctly when GLUON_SITEDIR is set
manually.
This commit is contained in:
Matthias Schiffer 2015-01-11 09:48:31 +01:00
parent 334858f4cf
commit 8cfd64d2db
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -25,19 +25,19 @@ export GLUON_TARGET
update: FORCE update: FORCE
$(GLUONDIR)/scripts/update.sh $(GLUONDIR) $(GLUONDIR)/scripts/update.sh
$(GLUONDIR)/scripts/patch.sh $(GLUONDIR) $(GLUONDIR)/scripts/patch.sh
patch: FORCE patch: FORCE
$(GLUONDIR)/scripts/patch.sh $(GLUONDIR) $(GLUONDIR)/scripts/patch.sh
unpatch: FORCE unpatch: FORCE
$(GLUONDIR)/scripts/unpatch.sh $(GLUONDIR) $(GLUONDIR)/scripts/unpatch.sh
update-patches: FORCE update-patches: FORCE
$(GLUONDIR)/scripts/update.sh $(GLUONDIR) $(GLUONDIR)/scripts/update.sh
$(GLUONDIR)/scripts/update-patches.sh $(GLUONDIR) $(GLUONDIR)/scripts/update-patches.sh
$(GLUONDIR)/scripts/patch.sh $(GLUONDIR) $(GLUONDIR)/scripts/patch.sh
-include $(TOPDIR)/include/host.mk -include $(TOPDIR)/include/host.mk

4
scripts/modules.sh
View File

@ -1,5 +1,5 @@
. "$1"/modules . "$GLUONDIR"/modules
[ ! -f "$1"/site/modules ] || . "$1"/site/modules [ ! -f "$GLUON_SITEDIR"/site/modules ] || . "$GLUON_SITEDIR"/site/modules
GLUON_MODULES=openwrt GLUON_MODULES=openwrt

8
scripts/patch.sh
View File

@ -3,14 +3,14 @@
set -e set -e
shopt -s nullglob shopt -s nullglob
. "$1"/scripts/modules.sh . "$GLUONDIR"/scripts/modules.sh
for module in $GLUON_MODULES; do for module in $GLUON_MODULES; do
cd "$1"/$module cd "$GLUONDIR"/$module
git checkout -B patching base git checkout -B patching base
if [ "$(echo "$1"/patches/$module/*.patch)" ]; then if [ "$(echo "$GLUONDIR"/patches/$module/*.patch)" ]; then
git am --whitespace=nowarn "$1"/patches/$module/*.patch || ( git am --whitespace=nowarn "$GLUONDIR"/patches/$module/*.patch || (
git am --abort git am --abort
git checkout patched git checkout patched
git branch -D patching git branch -D patching

4
scripts/unpatch.sh
View File

@ -2,9 +2,9 @@
set -e set -e
. "$1"/scripts/modules.sh . "$GLUONDIR"/scripts/modules.sh
for module in $GLUON_MODULES; do for module in $GLUON_MODULES; do
cd "$1"/$module cd "$GLUONDIR"/$module
git checkout base git checkout base
done done

10
scripts/update-patches.sh
View File

@ -3,17 +3,17 @@
set -e set -e
shopt -s nullglob shopt -s nullglob
. "$1"/scripts/modules.sh . "$GLUONDIR"/scripts/modules.sh
for module in $GLUON_MODULES; do for module in $GLUON_MODULES; do
rm -f "$1"/patches/$module/*.patch rm -f "$GLUONDIR"/patches/$module/*.patch
mkdir -p "$1"/patches/$module mkdir -p "$GLUONDIR"/patches/$module
cd "$1"/$module cd "$GLUONDIR"/$module
n=0 n=0
for commit in $(git rev-list --reverse --no-merges base..patched); do for commit in $(git rev-list --reverse --no-merges base..patched); do
let n=n+1 let n=n+1
git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' $commit > "$1"/patches/$module/"$(printf '%04u' $n)-$(git show -s --pretty=format:%f $commit).patch" git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' $commit > "$GLUONDIR"/patches/$module/"$(printf '%04u' $n)-$(git show -s --pretty=format:%f $commit).patch"
done done
done done

6
scripts/update.sh
View File

@ -2,7 +2,7 @@
set -e set -e
. "$1"/scripts/modules.sh . "$GLUONDIR"/scripts/modules.sh
for module in $GLUON_MODULES; do for module in $GLUON_MODULES; do
var=$(echo $module | tr '[:lower:]/' '[:upper:]_') var=$(echo $module | tr '[:lower:]/' '[:upper:]_')
@ -10,8 +10,8 @@ for module in $GLUON_MODULES; do
eval branch=\${${var}_BRANCH} eval branch=\${${var}_BRANCH}
eval commit=\${${var}_COMMIT} eval commit=\${${var}_COMMIT}
mkdir -p "$1"/$module mkdir -p "$GLUONDIR"/$module
cd "$1"/$module cd "$GLUONDIR"/$module
git init git init
git checkout $commit 2>/dev/null || git fetch $repo $branch git checkout $commit 2>/dev/null || git fetch $repo $branch