Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: Correct buildroot package selection flaw. 

Introduced in changeset:48452725543d70dedc183f54d645f9551158c48e/aredn_ar71xx
(Change-ID of I693bed9fb2a4f7ee1471a8dbf440bbd391d3e783)

when using the feeds file we don't want "origin/develop" (used in Jenkins elsewhere) just "develop"

Strip off the prefix to correct.

Change-Id: I847b0878bf591eba81e7896dd6a099d0be3bfe3c
This commit is contained in:
Conrad Lara - KG6JEI 2016-11-04 14:41:51 -07:00
parent 4845272554
commit d9cd982818
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/buildsteps/001-prepbuild
View File

@ -16,13 +16,13 @@ else
# locally then lets assume this may not be in the build environment and fall back to some sane defaults. # locally then lets assume this may not be in the build environment and fall back to some sane defaults.
if [ -n "$GIT_BRANCH" ] && [ -d "$AREDN_PACKAGES_DIR" ] && [ -n "$(git --git-dir="$AREDN_PACKAGES_DIR/.git" branch --list -r "$GIT_BRANCH")" ] if [ -n "$GIT_BRANCH" ] && [ -d "$AREDN_PACKAGES_DIR" ] && [ -n "$(git --git-dir="$AREDN_PACKAGES_DIR/.git" branch --list -r "$GIT_BRANCH")" ]
then then
BASE_BRANCH="$GIT_BRANCH" BASE_BRANCH=$(echo "$GIT_BRANCH"|sed 's/.*\///')
else else
case $GIT_BRANCH in case $GIT_BRANCH in
origin/release-* ) BASE_BRANCH="origin/master";; origin/release-* ) BASE_BRANCH="master";;
origin/hotfix-* ) BASE_BRANCH="origin/master";; origin/hotfix-* ) BASE_BRANCH="master";;
origin/master ) BASE_BRANCH="origin/master";; origin/master ) BASE_BRANCH="master";;
* ) BASE_BRANCH="origin/develop";; * ) BASE_BRANCH="develop";;
esac esac
fi fi
echo "src-git arednpackages git://git.aredn.org/aredn_packages;$BASE_BRANCH" > feeds.conf echo "src-git arednpackages git://git.aredn.org/aredn_packages;$BASE_BRANCH" > feeds.conf