scripts: Replace hardcoded targets path with GLUON_TARGETSDIR variable

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2018-10-23 17:46:52 +02:00
parent b0bb3cc25f
commit 59cf2a8866
4 changed files with 10 additions and 10 deletions

View File

@ -2,7 +2,7 @@
set -e
[ "$GLUON_IMAGEDIR" -a "$GLUON_PACKAGEDIR" -a "$OPENWRT_TARGET" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
[ "$GLUON_IMAGEDIR" -a "$GLUON_PACKAGEDIR" -a "$OPENWRT_TARGET" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" -a "$GLUON_TARGETSDIR" ] || exit 1
default_factory_ext='.bin'
@ -191,7 +191,7 @@ no_opkg() {
}
. targets/"$1"; copy
. "${GLUON_TARGETSDIR}/$1"; copy
# Copy opkg repo
if [ -z "$no_opkg" -a -z "$DEVICES" ]; then

View File

@ -2,7 +2,7 @@
set -e
[ "$GLUON_IMAGEDIR" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
[ "$GLUON_IMAGEDIR" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" -a "$GLUON_TARGETSDIR" ] || exit 1
default_sysupgrade_ext='.bin'
@ -110,4 +110,4 @@ sysupgrade() {
fi
}
. targets/"$1"; generate
. "${GLUON_TARGETSDIR}/$1"; generate

View File

@ -2,7 +2,7 @@
set -e
[ "$OPENWRT_TARGET" ] || exit 1
[ "$OPENWRT_TARGET" -a "$GLUON_TARGETSDIR" ] || exit 1
target="$1"
packages=$2
@ -74,9 +74,9 @@ packages() {
# The sort will not only remove duplicate entries,
# but also magically make =y entries override =m ones
(
. targets/generic
. "${GLUON_TARGETSDIR}/generic"
packages $packages
. targets/"$target"
. "${GLUON_TARGETSDIR}/$target"
emit
) | sort -u

View File

@ -2,7 +2,7 @@
set -e
[ "$OPENWRT_TARGET" ] || exit 1
[ "$OPENWRT_TARGET" -a "$GLUON_TARGETSDIR" ] || exit 1
target="$1"
packages=$2
@ -92,10 +92,10 @@ packages() {
}
. targets/generic
. "${GLUON_TARGETSDIR}/generic"
packages $packages
. targets/"$target"
. "${GLUON_TARGETSDIR}/$target"
check_devices