|
@@ -47,6 +47,7 @@ SRV_PATH="/srv/firmware"
|
|
|
|
|
|
BUILD_INFO_FILENAME="build-info.txt"
|
|
|
SITE_REPO_URL="https://git.ffho.net/freifunkhochstift/ffho-site.git"
|
|
|
+GLUON_REPO_URL="https://git.ffho.com/freifunkhochstift/gluon.git"
|
|
|
LANG=C
|
|
|
|
|
|
pushd ${MY_DIR} > /dev/null
|
|
@@ -101,7 +102,7 @@ fi
|
|
|
### init CODE_DIR if necessary
|
|
|
if [ ! -d "${CODE_DIR}" ]; then
|
|
|
info "Code directory does not exist yet - fetching Gluon ..."
|
|
|
- git clone https://github.com/freifunk-gluon/gluon.git "${CODE_DIR}"
|
|
|
+ git clone "${GLUON_REPO_URL}" "${CODE_DIR}"
|
|
|
[ "$?" -eq "0" ] || abort "Failed to fetch Gluon repository."
|
|
|
fi
|
|
|
|
|
@@ -127,6 +128,7 @@ if [ "$?" -eq "0" ]; then
|
|
|
[ "$?" -eq "0" ] || abort "Failed to get newest '${BASE}' in gluon repository, mimimi."
|
|
|
fi
|
|
|
GLUON_COMMIT=$(git rev-list --max-count=1 HEAD)
|
|
|
+popd > /dev/null #${CODE_DIR}
|
|
|
|
|
|
|
|
|
### CHECKOUT SITE REPO
|
|
@@ -154,20 +156,7 @@ fi
|
|
|
SITE_COMMIT=$(git rev-list --max-count=1 HEAD)
|
|
|
popd > /dev/null #${SITE_DIR}
|
|
|
|
|
|
-### APPLY PATCHES TO GLUON
|
|
|
-progress "Applying Patches ..."
|
|
|
-git checkout -B patching "${BASE}"
|
|
|
-if [ -d "${PATCH_DIR}" -a "$(echo ${PATCH_DIR}/*.patch)" ]; then
|
|
|
- git am --whitespace=nowarn ${PATCH_DIR}/*.patch || (
|
|
|
- git am --abort
|
|
|
- git checkout patched
|
|
|
- git branch -D patching
|
|
|
- false
|
|
|
- )
|
|
|
- [ "$?" -eq "0" ] || abort "Failed to apply patches, mimimi."
|
|
|
-fi
|
|
|
-git branch -M patched
|
|
|
-
|
|
|
+pushd ${CODE_DIR} > /dev/null
|
|
|
### DIRCLEAN
|
|
|
if [ -d "${GLUON_BUILD_DIR}/" -a "${CLEAN}" == "dirclean" ]; then
|
|
|
progress "Cleaning your build environment (make dirclean) ..."
|