forked from freifunk-franken/firmware
- corrected FEEDVAR array handling
Signed-off-by: Steffen Pankratz <kratz00@gmx.de> Reviewed-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
This commit is contained in:
parent
b343efab83
commit
762ab6013b
15
buildscript
15
buildscript
|
@ -73,8 +73,9 @@ get_source() {
|
||||||
cd packages
|
cd packages
|
||||||
|
|
||||||
#checkout needed package feeds
|
#checkout needed package feeds
|
||||||
for FEEDVAR in ${FEEDS[@]} ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
FEED=$FEEDVAR[@] FEED=( ${!FEED} )
|
FEED="${FEEDVAR}[@]"
|
||||||
|
FEED=("${!FEED}")
|
||||||
|
|
||||||
local NAME=${FEED[0]}
|
local NAME=${FEED[0]}
|
||||||
local URL=${FEED[1]}
|
local URL=${FEED[1]}
|
||||||
|
@ -106,8 +107,9 @@ prepare() {
|
||||||
#this local variable should be globally configure variable used in get_source and here
|
#this local variable should be globally configure variable used in get_source and here
|
||||||
local PACKAGEBASE=${PWD}/src/packages
|
local PACKAGEBASE=${PWD}/src/packages
|
||||||
rm -f $target/feeds.conf
|
rm -f $target/feeds.conf
|
||||||
for FEEDVAR in ${FEEDS[@]} ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
FEED=$FEEDVAR[@] FEED=( ${!FEED} )
|
FEED="${FEEDVAR}[@]"
|
||||||
|
FEED=("${!FEED}")
|
||||||
local NAME=${FEED[0]}
|
local NAME=${FEED[0]}
|
||||||
echo "adding $NAME to package feeds"
|
echo "adding $NAME to package feeds"
|
||||||
echo src-link $NAME $PACKAGEBASE/$NAME >> $target/feeds.conf
|
echo src-link $NAME $PACKAGEBASE/$NAME >> $target/feeds.conf
|
||||||
|
@ -118,8 +120,9 @@ prepare() {
|
||||||
|
|
||||||
$target/scripts/feeds update
|
$target/scripts/feeds update
|
||||||
|
|
||||||
for FEEDVAR in ${FEEDS[@]} ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
FEED=$FEEDVAR[@] FEED=( ${!FEED} )
|
FEED="${FEEDVAR}[@]"
|
||||||
|
FEED=("${!FEED}")
|
||||||
local NAME=${FEED[0]}
|
local NAME=${FEED[0]}
|
||||||
local PACKAGESVAR=${FEEDVAR}_PKGS
|
local PACKAGESVAR=${FEEDVAR}_PKGS
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue