Raspi2-3_GenImage Commit - r479:1aba7e0acfd1 · Collaboration Tremplin des Sciences

+fix:...

Unknown -

r479:1aba7e0acfd1

parent child

Context file:

r479:1aba7e0acfd1

Collapse all files

bootstrap.d/14-fstab.sh +1 -1

             #
             # Setup fstab and initramfs
             #
             # Load utility functions
             . ./functions.sh
             # Install and setup fstab
             install_readonly files/mount/fstab "${ETC_DIR}/fstab"
             if [ "$ENABLE_UBOOTUSB" = true ] ; then
               sed -i "s/mmcblk0p1/sda1/" "${ETC_DIR}/fstab"
               sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
             fi
             # Add usb/sda disk root partition to fstab
             if [ "$ENABLE_SPLITFS" = true ] && [ "$ENABLE_CRYPTFS" = false ] ; then
               sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/fstab"
             fi
             # Add encrypted root partition to fstab and crypttab
             if [ "$ENABLE_CRYPTFS" = true ] ; then
               # Replace fstab root partition with encrypted partition mapping
               sed -i "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING}/" "${ETC_DIR}/fstab"
               # Add encrypted partition to crypttab and fstab
               install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
               echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 # Add usb/sda disk to crypttab
                 sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
               fi
             fi
             # Generate initramfs file
-            if [ "$BUILD_KERNEL" = true ] && [ "$ENABLE_INITRAMFS" = true ] ; then
+            if [ "$ENABLE_INITRAMFS" = true ] ; then
               if [ "$ENABLE_CRYPTFS" = true ] ; then
                 # Include initramfs scripts to auto expand encrypted root partition
                 if [ "$EXPANDROOT" = true ] ; then
                   install_exec files/initramfs/expand_encrypted_rootfs "${ETC_DIR}/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs"
                   install_exec files/initramfs/expand-premount "${ETC_DIR}/initramfs-tools/scripts/local-premount/expand-premount"
                   install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"
                 fi
             	if [ "$CRYPTFS_DROPBEAR" = true ]; then
             		if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
              			install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}/dropbear-initramfs/id_rsa.pub"
              			cat /etc/dropbear-initramfs/id_rsa.pub >> /etc/dropbear-initramfs/authorized_keys
              		else
               		  # Create key
              		  chroot_exec /usr/bin/dropbearkey -t rsa -f /etc/dropbear-initramfs/id_rsa.dropbear
              		  # Convert dropbear key to openssh key
              		  chroot_exec /usr/lib/dropbear/dropbearconvert dropbear openssh /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa
             		  # Get Public Key Part
             		  touch /etc/dropbear-initramfs/id_rsa.pub
              		  chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear | chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub
             		  # Delete unwanted lines
              		  sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
              		  sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
             		  # Trust the new key
              		  touch "${ETC_DIR}"/dropbear-initramfs/authorized_keys
              		  cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub | chroot_exec tee -a "${ETC_DIR}"/dropbear-initramfs/authorized_keys
                       # Save Keys - convert with putty from rsa/openssh to puttkey
                       cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
             		  #Get unlock script
              		  install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}/initramfs-tools/hooks/crypt_unlock.sh"
             		fi
             	else
             	  # Disable SSHD inside initramfs
             	  printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
             	fi
                 # Add cryptsetup modules to initramfs
                 printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
                 # Dummy mapping required by mkinitramfs
                 echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
                 # Generate initramfs with encrypted root partition support
                 chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
                 # Remove dummy mapping
                 chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
               else
                 # Generate initramfs without encrypted root partition support
                 chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
               fi
             fi

bootstrap.d/44-nexmon_monitor_patch.sh +2 -10

             #!/bin/sh
             #
             # Build and Setup nexmon with monitor mode patch
             #
             # Load utility functions
             . ./functions.sh
             if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
               # Copy existing nexmon sources into chroot directory
               if [ -n "$NEXMONSRC_DIR" ] && [ -d "$NEXMONSRC_DIR" ] ; then
                 # Copy local U-Boot sources
                 cp -r "${NEXMONSRC_DIR}" "${R}/tmp"
               else
                 # 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
                 # Remove temporary directory for nexmon sources
                 rm -fr "${temp_dir}"
               fi
               # Set script Root
               export NEXMON_ROOT="${R}"/tmp/nexmon
               # Build nexmon firmware outside the build system, if we can.
               cd "${NEXMON_ROOT}" || exit
               # Make ancient isl build
               cd buildtools/isl-0.10 || exit
               ./configure
               make
               cd ../.. || exit
               # Disable statistics
               touch DISABLE_STATISTICS
               # Setup Enviroment: see https://github.com/NoobieDog/nexmon/blob/master/setup_env.sh
-              #ARCH="${KERNEL_ARCH}"
-              #SUBARCH="${KERNEL_ARCH}"
               export KERNEL="${KERNEL_IMAGE}"
               export ARCH=arm
               export SUBARCH=arm
               export CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
               export CC="${CC}"gcc
               export CCPLUGIN="${NEXMON_ROOT}"/buildtools/gcc-nexmon-plugin/nexmon.so
               export ZLIBFLATE="zlib-flate -compress"
               export Q=@
               export NEXMON_SETUP_ENV=1
               export HOSTUNAME=$(uname -s)
               export PLATFORMUNAME=$(uname -m)
-              #. ./setup_env.sh
               # Make nexmon
               make
-              # Backup stock broadcom wlan driver - "${LIB_DIR}"/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-              #brcmfmac_path=$(modinfo brcmfmac | grep -m 1 -oP "^filename:(\s*?)(.*)$" | sed -e 's/^filename:\(\s*\)\(.*\)$/\2/g')
-              #brcmfmac_path="${LIB_DIR}"/modules/"${KERNEL_VERSION}"/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-              #mv "${brcmfmac_path}" "${brcmfmac_path}".orig
               # build patches
               if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] ; then
                 cd "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon || exit
+            	sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/Makefile
                 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
             	mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.org.bin
                 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
             	cp "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac_4.14.y-nexmon/brcmfmac.ko "${brcmfmac_path}"
               fi
               if [ "$RPI_MODEL" = 3P ] ; then
                 cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit
+            	sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile
                 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
             	mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.org.bin
                 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
             #Revert to previous directory
             cd "${WORKDIR}" || exit
             # Remove nexmon sources
             rm -fr "${NEXMON_ROOT}"
             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