From d9cd982818b407eea2172dd62424af5e403cb77f Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Fri, 4 Nov 2016 14:41:51 -0700 Subject: [PATCH] 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 --- build/buildsteps/001-prepbuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/buildsteps/001-prepbuild b/build/buildsteps/001-prepbuild index a6128a88..52bf2a1f 100755 --- a/build/buildsteps/001-prepbuild +++ b/build/buildsteps/001-prepbuild @@ -16,13 +16,13 @@ else # 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")" ] then - BASE_BRANCH="$GIT_BRANCH" + BASE_BRANCH=$(echo "$GIT_BRANCH"|sed 's/.*\///') else case $GIT_BRANCH in - origin/release-* ) BASE_BRANCH="origin/master";; - origin/hotfix-* ) BASE_BRANCH="origin/master";; - origin/master ) BASE_BRANCH="origin/master";; - * ) BASE_BRANCH="origin/develop";; + origin/release-* ) BASE_BRANCH="master";; + origin/hotfix-* ) BASE_BRANCH="master";; + origin/master ) BASE_BRANCH="master";; + * ) BASE_BRANCH="develop";; esac fi echo "src-git arednpackages git://git.aredn.org/aredn_packages;$BASE_BRANCH" > feeds.conf