Raspi2-3_GenImage Commit - r449:946eb9ed27e3 · Collaboration Tremplin des Sciences

Unknown -

r449:946eb9ed27e3

parent child

Context file:

r449:946eb9ed27e3

bootstrap.d/15-rpi-config.sh +9 -5

              #
              # Setup RPi2/3 config and cmdline
              #
              # Load utility functions
              . ./functions.sh
              if [ "$BUILD_KERNEL" = true ] ; then
                if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
                  # Install boot binaries from local directory
                  cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
                  cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat
                  cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat
                  cp "${RPI_FIRMWARE_DIR}"/boot/fixup_x.dat "${BOOT_DIR}"/fixup_x.dat
                  cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf
                  cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf
                  cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf
                else
                  # Create temporary directory for boot binaries
                  temp_dir=$(as_nobody mktemp -d)
                  # Install latest boot binaries from raspberry/firmware github
                  as_nobody wget -q -O "${temp_dir}/bootcode.bin" "${FIRMWARE_URL}/bootcode.bin"
                  as_nobody wget -q -O "${temp_dir}/fixup.dat" "${FIRMWARE_URL}/fixup.dat"
                  as_nobody wget -q -O "${temp_dir}/fixup_cd.dat" "${FIRMWARE_URL}/fixup_cd.dat"
                  as_nobody wget -q -O "${temp_dir}/fixup_x.dat" "${FIRMWARE_URL}/fixup_x.dat"
                  as_nobody wget -q -O "${temp_dir}/start.elf" "${FIRMWARE_URL}/start.elf"
                  as_nobody wget -q -O "${temp_dir}/start_cd.elf" "${FIRMWARE_URL}/start_cd.elf"
                  as_nobody wget -q -O "${temp_dir}/start_x.elf" "${FIRMWARE_URL}/start_x.elf"
                  # Move downloaded boot binaries
                  mv "${temp_dir}/"* "${BOOT_DIR}/"
                  # Remove temporary directory for boot binaries
                  rm -fr "${temp_dir}"
                  # Set permissions of the boot binaries
                  chown -R root:root "${BOOT_DIR}"
                  chmod -R 600 "${BOOT_DIR}"
                fi
              fi
              # Setup firmware boot cmdline
              if [ "$ENABLE_UBOOTUSB" = true ] ; then
                CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
              else
                if [ "$ENABLE_SPLITFS" = true ] ; then
                  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
                else
                  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
                fi
              fi
              # Add encrypted root partition to cmdline.txt
              if [ "$ENABLE_CRYPTFS" = true ] ; then
                if [ "$ENABLE_SPLITFS" = true ] ; then
                  CMDLINE=$(echo "${CMDLINE}" | sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
                else
                  if [ "$ENABLE_UBOOTUSB" = true ] ; then
                    CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/")
                  else
                    CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")
                  fi
                fi
              fi
              #locks cpu at max frequency
              if [ "$ENABLE_TURBO" = true ] ; then
                echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"
              fi
              if [ "$ENABLE_PRINTK" = true ] ; then
                install_readonly files/sysctl.d/83-rpi-printk.conf "${ETC_DIR}/sysctl.d/83-rpi-printk.conf"
              fi
              # Install udev rule for serial alias
              install_readonly files/etc/99-com.rules "${LIB_DIR}/udev/rules.d/99-com.rules"
              if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
                # RPI0,3,3P Use default ttyS0 (mini-UART)as serial interface
                SET_SERIAL="ttyS0"
                # Bluetooth enabled
                if [ "$ENABLE_BLUETOOTH" = true ] ; then
                  # Create temporary directory for Bluetooth sources
                  temp_dir=$(as_nobody mktemp -d)
                  # Fetch Bluetooth sources
                  as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
                  # Copy downloaded sources
                  mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
                  # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
                  as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
                  as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
                  # Set permissions
                  chown -R root:root "${R}/tmp/pi-bluetooth"
                  # 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"
                  # Install Firmware Flash file and apropiate licence
                  mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
                  install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
                  install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
                  install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
                  install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
                  # Remove temporary directory
                  rm -fr "${temp_dir}"
                  # Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
                  if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
+             	  SET_SERIAL="ttyAMA0"
              	  # set overlay to swap ttyAMA0 and ttyS0
                    echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
              	  # if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
              	  if [ "$ENABLE_TURBO" = false ] ; then
              	    echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
              	  fi
+             	  # Activate services
+             	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+             	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
+             	else
+             	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+             	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
              	fi
                else # if ENABLE_BLUETOOTH = false
                	# set overlay to disable bluetooth
                  echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
                fi # ENABLE_BLUETOOTH end
              else
                # RPI1,1P,2 Use default ttyAMA0 (full UART) as serial interface
                SET_SERIAL="ttyAMA0"
              fi
              # may need sudo systemctl disable hciuart
              if [ "$ENABLE_CONSOLE" = true ] ; then
                echo "enable_uart=1"  >> "${BOOT_DIR}/config.txt"
                # add string to cmdline
                CMDLINE="${CMDLINE} console=serial0,115200"
                # Enable serial console systemd style
-               chroot_exec systemctl start serial-getty@"$SET_SERIAL".service
                chroot_exec systemctl enable serial-getty@"$SET_SERIAL".service
              else
                echo "enable_uart=0"  >> "${BOOT_DIR}/config.txt"
-               # Enable serial console systemd style
-               chroot_exec systemctl stop serial-getty@"$SET_SERIAL".service
+               # disable serial console systemd style
                chroot_exec systemctl disable serial-getty@"$SET_SERIAL".service
              fi
              # Remove IPv6 networking support
              if [ "$ENABLE_IPV6" = false ] ; then
                CMDLINE="${CMDLINE} ipv6.disable=1"
              fi
              # Automatically assign predictable network interface names
              if [ "$ENABLE_IFNAMES" = false ] ; then
                CMDLINE="${CMDLINE} net.ifnames=0"
              else
                CMDLINE="${CMDLINE} net.ifnames=1"
              fi
              # Install firmware boot cmdline
              echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
              # Install firmware config
              install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"
              # Setup minimal GPU memory allocation size: 16MB (no X)
              if [ "$ENABLE_MINGPU" = true ] ; then
                echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
              fi
              # Setup boot with initramfs
              if [ "$ENABLE_INITRAMFS" = true ] ; then
                echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
              fi
              # Create firmware configuration and cmdline symlinks
              ln -sf firmware/config.txt "${R}/boot/config.txt"
              ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
              # Install and setup kernel modules to load at boot
              mkdir -p "${LIB_DIR}/modules-load.d/"
              install_readonly files/modules/rpi2.conf "${LIB_DIR}/modules-load.d/rpi2.conf"
              # Load hardware random module at boot
              if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then
                sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${LIB_DIR}/modules-load.d/rpi2.conf"
              fi
              # Load sound module at boot
              if [ "$ENABLE_SOUND" = true ] ; then
                sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
              else
                echo "dtparam=audio=off" >> "${BOOT_DIR}/config.txt"
              fi
              # Enable I2C interface
              if [ "$ENABLE_I2C" = true ] ; then
                echo "dtparam=i2c_arm=on" >> "${BOOT_DIR}/config.txt"
                sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${LIB_DIR}/modules-load.d/rpi2.conf"
                sed -i "s/^# i2c-dev/i2c-dev/" "${LIB_DIR}/modules-load.d/rpi2.conf"
              fi
              # Enable SPI interface
              if [ "$ENABLE_SPI" = true ] ; then
                echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"
                echo "spi-bcm2708" >> "${LIB_DIR}/modules-load.d/rpi2.conf"
                if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
                  sed -i "s/spi-bcm2708/spi-bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
                fi
              fi
              # Disable RPi2/3 under-voltage warnings
              if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
                echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
              fi
              # Install kernel modules blacklist
              mkdir -p "${ETC_DIR}/modprobe.d/"
              install_readonly files/modules/raspi-blacklist.conf "${ETC_DIR}/modprobe.d/raspi-blacklist.conf"
              # Install sysctl.d configuration files
              install_readonly files/sysctl.d/81-rpi-vm.conf "${ETC_DIR}/sysctl.d/81-rpi-vm.conf"

bootstrap.d/44-nexmon_monitor_patch.sh +1 -1

              #
-             # Build and Setup fbturbo Xorg driver
+             # Build and Setup nexmon with monitor mode patch
              #
              # Load utility functions
              . ./functions.sh
              if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
                # Create temporary directory for nexmon sources
                temp_dir=$(as_nobody mktemp -d)
                # Fetch nexmon sources
                as_nobody git -C "${temp_dir}" clone "${NEXMON_URL}"
                # Copy downloaded nexmon sources
                mv "${temp_dir}/nexmon" "${R}"/tmp/
                # Set permissions of the nexmon sources
                chown -R root:root "${R}"/tmp/nexmon
                # Set script Root
                NEXMON_ROOT="${R}"/tmp/nexmon
                # Remove temporary directory for nexmon sources
                rm -fr "${temp_dir}"
                # Build nexmon firmware outside the build system, if we can.
                cd "${NEXMON_ROOT}"
                # Disable statistics
                touch DISABLE_STATISTICS
                # Setup Enviroment: see https://github.com/NoobieDog/nexmon/blob/master/setup_env.sh
                ARCH="${KERNEL_ARCH}"
                SUBARCH="${KERNEL_ARCH}"
                KERNEL="${KERNEL_IMAGE}"
                CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
                CCPLUGIN="${NEXMON_ROOT}"/buildtools/gcc-nexmon-plugin/nexmon.so
                ZLIBFLATE="zlib-flate -compress"
                Q=@
                NEXMON_SETUP_ENV=1
                # Make nexmon
                make
                # Make ancient isl build
                cd buildtools/isl-0.10
                CC=$CCgcc
                ./configure
                make
                # build patches
                if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] ; then
                  cd ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon
                  make clean
                  # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
                  LD_LIBRARY_PATH=${NEXMON_ROOT}/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC=${NEXMON_ROOT}/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
                  # copy RPi0W & RPi3 firmware
                  cp ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.nexmon.bin
                  cp -f ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin
                fi
                if [ "$RPI_MODEL" = 3P ] ; then
                  cd ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon
                  make clean
              	# We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
                  LD_LIBRARY_PATH=${NEXMON_ROOT}/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC=${NEXMON_ROOT}/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
                  # RPi3B+ firmware
                  cp ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.nexmon.bin
                  cp -f ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin
                fi
              fi

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