diff --git a/image/mk_europe_edition64.sh b/image/mk_europe_edition64.sh index 7316ffc7c..48149379f 100755 --- a/image/mk_europe_edition64.sh +++ b/image/mk_europe_edition64.sh @@ -16,7 +16,8 @@ die() { } if [ "$#" -ne 2 ]; then - die "Usage: " $0 " dev|prod branch" + echo "Usage: " $0 " dev|prod branch [us]" + echo "if \"us\" is given, an image with US-like pre-configuration and without developer mode enabled will be created as well" fi # cd to script directory @@ -106,11 +107,13 @@ zip out/$outname.zip $outname # Now create US default config into the image and create the eu-us version.. -mount -t ext4 -o offset=$partoffset $outname mnt/ || die "root-mount failed" -echo '{"UAT_Enabled": true,"OGN_Enabled": false,"DeveloperMode": false}' > mnt/etc/stratux.conf -umount mnt -mv $outname $outname_us -zip out/$outname_us.zip $outname_us +if [ "$3" == "us" ]; then + mount -t ext4 -o offset=$partoffset $outname mnt/ || die "root-mount failed" + echo '{"UAT_Enabled": true,"OGN_Enabled": false,"DeveloperMode": false}' > mnt/etc/stratux.conf + umount mnt + mv $outname $outname_us + zip out/$outname_us.zip $outname_us +fi echo "Final images has been placed into $TMPDIR/out. Please install and test the image." diff --git a/image/mk_europe_edition_device_setup64.sh b/image/mk_europe_edition_device_setup64.sh index c5142981a..f49577a77 100755 --- a/image/mk_europe_edition_device_setup64.sh +++ b/image/mk_europe_edition_device_setup64.sh @@ -25,7 +25,7 @@ apt update apt clean PATH=/root/fake:$PATH apt install --yes libjpeg62-turbo-dev libconfig9 rpi-update hostapd isc-dhcp-server tcpdump git cmake \ - libusb-1.0-0-dev build-essential build-essential autoconf libtool i2c-tools screen libfftw3-dev libncurses-dev python-serial + libusb-1.0-0-dev build-essential autoconf libtool i2c-tools libfftw3-dev libncurses-dev python-serial # try to reduce writing to SD card as much as possible, so they don't get bricked when yanking the power cable # Disable swap...