nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: Replace hardcoded targets path with GLUON_TARGETSDIR variable

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/copy_output.sh
View File

@ -2,7 +2,7 @@
set -e 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' default_factory_ext='.bin'
@ -191,7 +191,7 @@ no_opkg() {
} }
. targets/"$1"; copy . "${GLUON_TARGETSDIR}/$1"; copy
# Copy opkg repo # Copy opkg repo
if [ -z "$no_opkg" -a -z "$DEVICES" ]; then if [ -z "$no_opkg" -a -z "$DEVICES" ]; then

4
scripts/generate_manifest.sh
View File

@ -2,7 +2,7 @@
set -e 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' default_sysupgrade_ext='.bin'
@ -110,4 +110,4 @@ sysupgrade() {
fi fi
} }
. targets/"$1"; generate . "${GLUON_TARGETSDIR}/$1"; generate

6
scripts/target_config.sh
View File

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

6
scripts/target_config_check.sh
View File

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