McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buildscript: Put binaries in seperate folders per variant. 

To make it easier to find the correct binary, this creates
a seperate folder for every variant and copies the binaries
appropriately.

The folder is created with "-p" to suppress errors, if it already
exists. This means the misplaced creation of the "bin"-folder inside
the build function can be ommited.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
This commit is contained in:
Fabian Bläse 2019-12-14 21:16:54 +01:00
parent 6a43b7dfdb
commit 32740ed90c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildscript
View File

@ -246,10 +246,6 @@ build() {
cd "$opath" cd "$opath"
if [ ! -d bin ]; then
mkdir bin
fi
cp_firmware cp_firmware
} }
@ -294,17 +290,19 @@ rm_firmware() {
cp_firmware() { cp_firmware() {
[ -n "$subtarget" ] || subtarget="generic" [ -n "$subtarget" ] || subtarget="generic"
mkdir -p "bin/$variant"
for image in ${images[@]}; do for image in ${images[@]}; do
filename_build=${image//openwrt/fff-${version}} filename_build=${image//openwrt/fff-${version}}
filename_build=${filename_build//squashfs-/} filename_build=${filename_build//squashfs-/}
filename_build=${filename_build//${chipset}-${subtarget}-/} filename_build=${filename_build//${chipset}-${subtarget}-/}
cp "$builddir/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build" cp "$builddir/bin/targets/${chipset}/${subtarget}/$image" "./bin/$variant/$filename_build"
for region in "" "-eu" "-us"; do for region in "" "-eu" "-us"; do
image_factory=${image/sysupgrade/factory$region} image_factory=${image/sysupgrade/factory$region}
if [[ -f "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then if [[ -f "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then
filename_build_factory=${filename_build/sysupgrade/factory$region} filename_build_factory=${filename_build/sysupgrade/factory$region}
cp "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" "./bin/$filename_build_factory" cp "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" "./bin/$variant/$filename_build_factory"
fi fi
done done
done done
@ -329,13 +327,13 @@ buildrelease() {
build $fast build $fast
fi fi
cd bin cd bin/$variant
for binary in *.bin; do for binary in *.bin; do
md5sum "$binary" > ./"$binary".md5 md5sum "$binary" > ./"$binary".md5
sha256sum "$binary" > ./"$binary".sha256 sha256sum "$binary" > ./"$binary".sha256
done done
cd .. echo -e "VERSION:$version" > release.nfo
echo -e "VERSION:$version" > ./bin/release.nfo cd ../..
} }
clean() { clean() {