Raspi2-3_GenImage Commit - r398:1d7e96e7b66f · Collaboration Tremplin des Sciences

fix: various fixes

drtyhlpr -

r398:1d7e96e7b66f

parent child

Context file:

r398:1d7e96e7b66f

Collapse all files

bootstrap.d/11-apt.sh +3 -8

               sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
             fi
-            if [ "$BUILD_KERNEL" = false ] ; then
-              echo "Downloading precompiled kernel"
-              echo "error: not configured"
-              exit 1;
-            # BUILD_KERNEL=true
-            else
-              echo "No precompiled kernel repositories were added"
-            fi
             # Upgrade package index and update all installed packages and changed dependencies
             chroot_exec apt-get -qq -y update
             chroot_exec apt-get -qq -y -u dist-upgrade
+            # Install additional packages
             if [ "$APT_INCLUDES_LATE" ] ; then
               chroot_exec apt-get -qq -y install "$(echo "$APT_INCLUDES_LATE" |tr , ' ')"
             fi
+            # Install Debian custom packages
             if [ -d packages ] ; then
               for package in packages/*.deb ; do
                 cp "$package" "${R}"/tmp
                 chroot_exec dpkg --unpack /tmp/"$(basename "$package")"
               done
             fi
             chroot_exec apt-get -qq -y -f install
             chroot_exec apt-get -qq -y check

bootstrap.d/15-rpi-config.sh 0 -15

                 # Set permissions
                 chown -R root:root "${R}/tmp/pi-bluetooth"
-                # Install files to chroot
                 # Install tools
                 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
                 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
                 # Install bluetooth udev rule
                 install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
-                #aur
-                #install_readonly "${R}/tmp/pi-bluetooth/50-bluetooth-hci-auto-poweron.rules" "${ETC_DIR}/udev/rules.d/50-bluetooth-hci-auto-poweron.rules"
                 # Install Firmware Flash file and apropiate licence
                 mkdir "${ETC_DIR}/firmware/"
-                #aur https://aur.archlinux.org/packages/pi-bluetooth/
-                #install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
-                #install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/BCM43430A1.hcd"
                 wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
                 wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
-                # Install systemd service for bluetooth
-                #install_readonly "${R}/tmp/pi-bluetooth/brcm43438.service" "${ETC_DIR}/systemd/system/brcm43438.service"
-                # Remove temporary directory
-                #rm -fr "${temp_dir}"
                 # Get /dev/serial back for compability
-                # Raspberry-sys-mod package
                 wget -O "${ETC_DIR}/udev/rules.d/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
               fi
             fi

bootstrap.d/20-networking.sh +14 -13

             # 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
               # Fetch firmware binary blob for RPI3B+
               if [ "$RPI_MODEL" = 3P ] ; then
-              as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
+                # Fetch firmware binary blob for RPi3P
-              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.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
-              as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
+                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"
               elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
-              # Fetch firmware binary blob for RPI3
+                # 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.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
-              as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
+                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" = 3P ] ; then
-              mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
+                mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
               elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
-              mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+                mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
               fi
               # Remove temporary directory for firmware binary blob
               # Set permissions of the firmware binary blob
               if [ "$RPI_MODEL" = 3P ] ; then
-              chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+                chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-              chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+                chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
               elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
-              chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+                chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-              chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+                chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               fi
             fi

bootstrap.d/41-uboot.sh +1 -1

                 printf "\n# 64bit-mode" >> "${BOOT_DIR}/config.txt"
                 printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md" >> "${BOOT_DIR}/config.txt"
                 printf "\narm_64bit=1" >> "${BOOT_DIR}/config.txt"
-            	#in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)]
                 sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
               fi

bootstrap.d/43-videocore.sh ~~bootstrap.d/16-videocore.sh~~ renamed +2 0

               # Create build dir
               mkdir "${R}"/tmp/userland/build
               # push us to build directory
               pushd "${R}"/tmp/userland/build
               #build userland
               make -j "$(nproc)"
               #pop us out of build dir
               popd
             fi

rpi23-gen-image.sh +30 -31

             # Debian release
             RELEASE=${RELEASE:=buster}
-            #Kernel Branch
+            # Kernel Branch
             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             # URLs
             APT_INCLUDES=${APT_INCLUDES:=""}
             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
-            #Packages to exclude from chroot build environment
+            # Packages to exclude from chroot build environment
             APT_EXCLUDES=${APT_EXCLUDES:=""}
             # Packages required for bootstrapping
             set +x
-            #If init and systemd-sysv are wanted e.g. halt/reboot/shutdown scripts
+            # Setup architecture specific settings
-            if [ "$ENABLE_SYSVINIT" = false ] ; then
-            APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
-            fi
-            #Check if apt-cacher-ng has its default port open on and set APT_PROXY
-            if [ -n "$(lsof -i :3142)" ] ; then
-            HTTP_PROXY=http://127.0.0.1:3142/
-            fi
-            #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!
             if [ -n "$SET_ARCH" ] ; then
-              echo "Setting Architecture specific settings"
-              ##################################
+              # 64 bit configuration
-              # 64 bit config
-              ##################################
               if [ "$SET_ARCH" = 64 ] ; then
-                echo "64 bit mode selected - Setting up enviroment"
+                # General 64 bit depended settings
-                # 64 bit depended settings
                 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
                 KERNEL_ARCH=${KERNEL_ARCH:=arm64}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+                # Board specific settings
                 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
                   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
                 else
-                  echo "error: Only Raspberry PI 3 and 3B+ support 64bit"
+                  echo "error: Only Raspberry PI 3 and 3B+ support 64 bit"
                   exit 1
                 fi
               fi
-              ##################################
+              # 32 bit configuration
-              # 32 bit config
-              ##################################
               if [ "$SET_ARCH" = 32 ] ; then
-                echo "32 bit mode selected - Setting up enviroment"
+                # General 32 bit dependend settings
-                #General 32bit configuration
                 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
                 KERNEL_ARCH=${KERNEL_ARCH:=arm}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-                #Raspberry setting grouped by board compability
+                # Hardware specific settings
                 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
-                  echo "Setting settings for bcm2835 Raspberry PI boards"
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
                   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
                   RELEASE_ARCH=${RELEASE_ARCH:=armel}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
                 fi
+                # Hardware specific settings
                 if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
-                  echo "Setting settings for bcm2837 Raspberry PI boards"
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
                   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
                   RELEASE_ARCH=${RELEASE_ARCH:=armhf}
               echo "error: Please set '32' or '64' as value for SET_ARCH"
               exit 1
             fi
+                # Device specific configuration and U-Boot configuration
-                #Device specific configuration and uboot-config
-                echo "Select DTB-File"
                 case "$RPI_MODEL" in
 )
                   DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
               fi
             fi
+            # Add cmake to compile videocore sources
             if [ "$ENABLE_VIDEOCORE" = true ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cmake"
             fi
               fi
             fi
+            # Configure systemd-sysv exclude to make halt/reboot/shutdown scripts available
+            if [ "$ENABLE_SYSVINIT" = false ] ; then
+              APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
+            fi
+            # Check if kernel is getting compiled
+            if [ "$BUILD_KERNEL" = false ] ; then
+              echo "Downloading precompiled kernel"
+              echo "error: not configured"
+              exit 1;
+            # BUILD_KERNEL=true
+            else
+              echo "No precompiled kernel repositories were added"
+            fi
             # Configure kernel sources if no KERNELSRC_DIR
             if [ "$BUILD_KERNEL" = true ] && [ -z "$KERNELSRC_DIR" ] ; then
               KERNELSRC_CONFIG=true

templates/rpi2jessie removed 0 -2

NO CONTENT: file was removed

templates/rpi3jessie removed 0 -4

NO CONTENT: file was removed

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