Support subtarget in buildscript

Prepares a subtarget variable for cases where it is not 'generic'

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
- Rebased
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
This commit is contained in:
Adrian Schmutzler 2017-10-23 23:44:10 +02:00 committed by Tim Niemeyer
parent 56c07144f7
commit c54596d63f
3 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,6 @@
machine=ar71xx
chipset=ar71xx
subtarget=generic
target=$builddir/$machine
images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin"
"lede-ar71xx-generic-cpe510-520-squashfs-sysupgrade.bin"

View File

@ -1,5 +1,6 @@
machine=wdr4900
chipset=mpc85xx
subtarget=generic
target=$builddir/$machine
images=(

View File

@ -277,19 +277,21 @@ cp_firmware() {
local community="fff"
fi
[ -n "$subtarget" ] || subtarget="generic"
for image in ${images[@]}; do
filename_build=${image//lede/${community}-${version}}
filename_build=${filename_build//generic/g}
cp "$target/bin/targets/${chipset}/generic/$image" "./bin/$filename_build"
cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
for region in "" "-eu" "-us"; do
image_factory=${image/sysupgrade/factory$region}
if [[ -f "$target/bin/targets/${chipset}/generic/$image_factory" ]]; then
if [[ -f "$target/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then
filename_build_factory=${filename_build/sysupgrade/factory$region}
if [ ${#image_factory} -lt ${#filename_build_factory} ]; then
echo "Warning: The factory image file name (${filename_build_factory}) is longer than the OpenWrt one, which might lead to incompatibility with the stock firmware."
fi
cp "$target/bin/targets/${chipset}/generic/$image_factory" "./bin/$filename_build_factory"
cp "$target/bin/targets/${chipset}/${subtarget}/$image_factory" "./bin/$filename_build_factory"
fi
done
done