Merge branch 'devel'

Author: FooDeas

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## raspberrypi-ua-netinst v2.2.1
+
+- fix compatibility with onboard wireless lan on version 3 model B+ (with BCM2837B0)
+- build improvements
+
 ## raspberrypi-ua-netinst v2.2.0
 
-- support for model 3B+
+- support for version 3 model B+ (with BCM2837B0)
 - added installer output via telnet
 - improved compatibility with RPi Compute Module 3
 - improved SD card compatibility
@@ -127,7 +132,7 @@ If you are coming from an older version, **check your configuration options** to
 - added method to set time with http
 - dynamically add packages if needed by configuration variables
 - added docs for configuration variables
-- add hardware version 2 Model B+ (with BCM2837)
+- add hardware version 2 model B+ (with BCM2837)
 
 **Bugfixes:**
 
@@ -148,7 +153,7 @@ If you are coming from an older version, **check your configuration options** to
 
 ## raspberrypi-ua-netinst v1.2.1
 
-- added compatibility for onboard wireless lan with model 3B to get used by installer and system (no ethernet needed)
+- added compatibility for onboard wireless lan on version 3 model B to get used by installer and system (no ethernet needed)
 - added more configuration variables
   - allow user to access GPIOs
   - create/add user to (system) groups

build.sh

@@ -633,8 +633,14 @@ function create_cpio {
 
 	# Binary firmware for version 3 Model B wireless
 	mkdir -p rootfs/lib/firmware/brcm
-	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43430-sdio.txt rootfs/lib/firmware/brcm/
 	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43430-sdio.bin rootfs/lib/firmware/brcm/
+	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43430-sdio.txt rootfs/lib/firmware/brcm/
+
+	# Binary firmware for version 3 Model B+ wireless
+	mkdir -p rootfs/lib/firmware/brcm
+	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43455-sdio.bin rootfs/lib/firmware/brcm/
+	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob rootfs/lib/firmware/brcm/
+	cp --preserve=xattr,timestamps -r tmp/lib/firmware/brcm/brcmfmac43455-sdio.txt rootfs/lib/firmware/brcm/
 
 	# vcgencmd
 	## libraspberrypi-bin

update.sh

@@ -123,15 +123,31 @@ download_file() {
 	local download_source=$1
 	local download_target=$2
 	if [ -z "${download_target}" ]; then
-		if ! wget -q --show-progress --no-cache "${download_source}"; then
-			echo -e "ERROR\nDownloading file '${download_source}' failed! Exiting."
-			exit 1
-		fi
+		for i in $(seq 1 5); do
+			if ! wget -q --show-progress --no-cache "${download_source}"; then
+				if [ "${i}" != "5" ]; then
+					sleep 5
+				else
+					echo -e "ERROR\nDownloading file '${download_source}' failed! Exiting."
+					exit 1
+				fi
+			else
+				break
+			fi
+		done
 	else
-		if ! wget -q --show-progress --no-cache -O "${download_target}" "${download_source}"; then
-			echo -e "ERROR\nDownloading file '${download_source}' failed! Exiting."
-			exit 1
-		fi
+		for i in $(seq 1 5); do
+			if ! wget -q --show-progress --no-cache -O "${download_target}" "${download_source}"; then
+				if [ "${i}" != "5" ]; then
+					sleep 5
+				else
+					echo -e "ERROR\nDownloading file '${download_source}' failed! Exiting."
+					exit 1
+				fi
+			else
+				break
+			fi
+		done
 	fi
 }