Raspi2-3_GenImage Commit - r253:cf37cb89e24a · Collaboration Tremplin des Sciences

Merge branch 'master' into RPI3B

Unknown -

r253:cf37cb89e24a

parent child

Context file:

r253:cf37cb89e24a

Collapse all files

files/network/wlan.network created 644 +12 0

@@ -0,0 +1,12
	1	[Match]
	2	Name=wlan0
	3
	4	[Network]
	5	DHCP=no
	6	Address=
	7	Gateway=
	8	DNS=
	9	DNS=
	10	Domains=
	11	NTP=
	12	NTP=

README.md +1 -1

             #### General system settings:
             ##### `RPI_MODEL`=2
-            Specifiy the target Raspberry Pi hardware model. The script at this time supports the Raspberry Pi models `2` and `3`. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
+            Specifiy the target Raspberry Pi hardware model. The script at this time supports the Raspberry Pi models `2`,`3` and `3B`. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` or `3B` is used.
             ##### `RELEASE`="jessie"
             Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie", "stretch" and "buster". `BUILD_KERNEL`=true will automatically be set if the Debian releases `stretch` or `buster` are used.

bootstrap.d/20-networking.sh +32 -5

             # Install configuration for interface eth0
             install_readonly files/network/eth.network "${ETC_DIR}/systemd/network/eth.network"
+            # Install configuration for interface wl*
+            install_readonly files/network/wlan.network "${ETC_DIR}/systemd/network/wlan.network"
+            #always with dhcp since wpa_supplicant integration is missing
+            sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "${ETC_DIR}/systemd/network/wlan.network"
             if [ "$ENABLE_DHCP" = true ] ; then
               # Enable DHCP configuration for interface eth0
               sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "${ETC_DIR}/systemd/network/eth.network"
               # Set DHCP configuration to IPv4 only
               if [ "$ENABLE_IPV6" = false ] ; then
                 sed -i "s/DHCP=.*/DHCP=v4/" "${ETC_DIR}/systemd/network/eth.network"
             # Remove empty settings from network configuration
             sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/eth.network"
+            # Remove empty settings from wlan configuration
+            sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/wlan.network"
             # Move systemd network configuration if required by Debian release
             if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
               mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
+            	if [ "$ENABLE_WIRELESS" = true ] ; then
+            	mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
+            	fi
               rm -fr "${ETC_DIR}/systemd/network"
             fi
             # Download the firmware binary blob required to use the RPi3 wireless interface
             if [ "$ENABLE_WIRELESS" = true ] ; then
               if [ ! -d ${WLAN_FIRMWARE_DIR} ] ; then
-                mkdir -p ${WLAN_FIRMWARE_DIR}
+            	mkdir -p ${WLAN_FIRMWARE_DIR}
               fi
               # Create temporary directory for firmware binary blob
               temp_dir=$(as_nobody mktemp -d)
-              # Fetch firmware binary blob
+              # Fetch firmware binary blob for RPI3B+
+              if [ "$RPI_MODEL" = 3B ] ; then
+              as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
+              as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
+              as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
+              else
+              # Fetch firmware binary blob for RPI3
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
+              fi
               # Move downloaded firmware binary blob
+              if [ "$RPI_MODEL" = 3B ] ; then
+              mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
+              else
               mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+              fi
               # Remove temporary directory for firmware binary blob
               rm -fr "${temp_dir}"
               # Set permissions of the firmware binary blob
+              if [ "$RPI_MODEL" = 3B ] ; then
+              chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+              chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+              else
               chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+              fi
             fi

rpi23-gen-image.sh +9 -11

             RPI2_UBOOT_CONFIG=${RPI2_UBOOT_CONFIG:=rpi_2_defconfig}
             RPI3_DTB_FILE=${RPI3_DTB_FILE:=bcm2710-rpi-3-b.dtb}
             RPI3_UBOOT_CONFIG=${RPI3_UBOOT_CONFIG:=rpi_3_32b_defconfig}
+            RPI3B_DTB_FILE=${RPI3B_DTB_FILE:=bcm2710-rpi-3-b-plus.dtb}
+            RPI3B_UBOOT_CONFIG=${RPI3_UBOOT_CONFIG:=rpi_3_32b_defconfig}
             # Debian release
             RELEASE=${RELEASE:=jessie}
             CRYPTFS_CIPHER=${CRYPTFS_CIPHER:="aes-xts-plain64:sha512"}
             CRYPTFS_XTSKEYSIZE=${CRYPTFS_XTSKEYSIZE:=512}
-            # Stop the Crypto Wars
-            DISABLE_FBI=${DISABLE_FBI:=false}
             # Chroot scripts directory
             CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
               DTB_FILE=${RPI3_DTB_FILE}
               UBOOT_CONFIG=${RPI3_UBOOT_CONFIG}
               BUILD_KERNEL=true
+            elif [ "$RPI_MODEL" = 3B ] ; then
+              DTB_FILE=${RPI3B_DTB_FILE}
+              UBOOT_CONFIG=${RPI3B_UBOOT_CONFIG}
+              BUILD_KERNEL=true
             else
               echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!"
               exit 1
             fi
             # Check if the internal wireless interface is supported by the RPi model
-            if [ "$ENABLE_WIRELESS" = true ] && [ "$RPI_MODEL" != 3 ] ; then
+            if [ "$ENABLE_WIRELESS" = true ] && [ "$RPI_MODEL" = 2 ]; then
               echo "error: The selected Raspberry Pi model has no internal wireless interface"
               exit 1
             fi
             # Check if DISABLE_UNDERVOLT_WARNINGS parameter value is supported
             if [ ! -z "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} ccache"
             fi
-            # Stop the Crypto Wars
-            if [ "$DISABLE_FBI" = true ] ; then
-              ENABLE_CRYPTFS=true
-            fi
             # Add cryptsetup package to enable filesystem encryption
             if [ "$ENABLE_CRYPTFS" = true ]  && [ "$BUILD_KERNEL" = true ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup"
-              APT_INCLUDES="${APT_INCLUDES},cryptsetup"
+              APT_INCLUDES="${APT_INCLUDES},cryptsetup,console-setup"
               if [ -z "$CRYPTFS_PASSWORD" ] ; then
                 echo "error: no password defined (CRYPTFS_PASSWORD)!"

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages