Skip to content
Snippets Groups Projects
Commit 2c4f0229 authored by bobcanthelpyou's avatar bobcanthelpyou Committed by Andreas Ziegler
Browse files

build: rename DEVICES to GLUON_DEVICES (#1686)

parent 078184a5
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ $(eval $(call mkabspath,GLUON_OUTPUTDIR)) ...@@ -27,7 +27,7 @@ $(eval $(call mkabspath,GLUON_OUTPUTDIR))
$(eval $(call mkabspath,GLUON_IMAGEDIR)) $(eval $(call mkabspath,GLUON_IMAGEDIR))
$(eval $(call mkabspath,GLUON_PACKAGEDIR)) $(eval $(call mkabspath,GLUON_PACKAGEDIR))
export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR DEVICES export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR GLUON_DEVICES
$(GLUON_SITEDIR)/site.mk: $(GLUON_SITEDIR)/site.mk:
......
...@@ -186,6 +186,12 @@ GLUON_TARGET ...@@ -186,6 +186,12 @@ GLUON_TARGET
Special variables Special variables
................. .................
GLUON_DEVICES
List of devices to build. The list contains the Gluon profile name of a device, the profile
name is the first parameter of the ``device`` command in a target file.
e.g. ``GLUON_DEVICES="avm-fritz-box-4020 tp-link-tl-wdr4300-v1"``.
Empty by default to build all devices of a target.
GLUON_IMAGEDIR GLUON_IMAGEDIR
Path where images will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/images``. Path where images will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/images``.
......
...@@ -17,4 +17,4 @@ fi ...@@ -17,4 +17,4 @@ fi
rm -f "openwrt/bin/targets/${OPENWRT_BINDIR}"/* 2>/dev/null || true rm -f "openwrt/bin/targets/${OPENWRT_BINDIR}"/* 2>/dev/null || true
# Full builds will output the "packages" directory, so clean up first # Full builds will output the "packages" directory, so clean up first
[ "$DEVICES" ] || rm -rf "openwrt/bin/targets/${OPENWRT_BINDIR}/packages" [ "$GLUON_DEVICES" ] || rm -rf "openwrt/bin/targets/${OPENWRT_BINDIR}/packages"
...@@ -47,10 +47,10 @@ no_opkg() { ...@@ -47,10 +47,10 @@ no_opkg() {
} }
unknown_devices="$DEVICES" unknown_devices="$GLUON_DEVICES"
want_device() { want_device() {
[ "$DEVICES" ] || return 0 [ "$GLUON_DEVICES" ] || return 0
local new_devices='' local new_devices=''
...@@ -61,7 +61,7 @@ want_device() { ...@@ -61,7 +61,7 @@ want_device() {
done done
unknown_devices=$new_devices unknown_devices=$new_devices
for device in $DEVICES; do for device in $GLUON_DEVICES; do
if [ "$device" = "$1" ]; then if [ "$device" = "$1" ]; then
return 0 return 0
fi fi
......
...@@ -194,7 +194,7 @@ no_opkg() { ...@@ -194,7 +194,7 @@ no_opkg() {
. targets/"$1"; copy . targets/"$1"; copy
# Copy opkg repo # Copy opkg repo
if [ -z "$no_opkg" -a -z "$DEVICES" ]; then if [ -z "$no_opkg" -a -z "$GLUON_DEVICES" ]; then
rm -f "$GLUON_PACKAGEDIR"/*/"$OPENWRT_BINDIR"/* rm -f "$GLUON_PACKAGEDIR"/*/"$OPENWRT_BINDIR"/*
rmdir -p "$GLUON_PACKAGEDIR"/*/"$OPENWRT_BINDIR" 2>/dev/null || true rmdir -p "$GLUON_PACKAGEDIR"/*/"$OPENWRT_BINDIR" 2>/dev/null || true
mkdir -p "${GLUON_PACKAGEDIR}/${PACKAGE_PREFIX}/${OPENWRT_BINDIR}" mkdir -p "${GLUON_PACKAGEDIR}/${PACKAGE_PREFIX}/${OPENWRT_BINDIR}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment