Raspi2-3_GenImage Commit - r522:b527883a9d40 · Collaboration Tremplin des Sciences

- added new kernel features asked in interactive setup while compiling...

Unknown -

r522:b527883a9d40

parent child

Context file:

r522:b527883a9d40

Collapse all files

bootstrap.d/13-kernel.sh +22 -4

             # Need to use kali kernel src if nexmon is enabled
             if [ "$ENABLE_NEXMON" = true ] ; then
-              echo "WARNING: if ENABLE_NEXMON is used remember to put the CORRECT KERNELSRC IN KERNELSRC_DIR!!!!!1!"
               KERNEL_URL="${KALI_KERNEL_URL}"
+              # Clear Branch and KernelSRC_DIR if using nexmon. Everyone will forget to clone kali kernel instead of nomrla kernel
               KERNEL_BRANCH=""
+              KERNELSRC_DIR=""
             fi
             # Fetch and build latest raspberry kernel
                     # New Options
                     if [ "$KERNEL_NF" = true ] ; then
                       set_kernel_config CONFIG_IP_NF_SECURITY m
-            	  	  set_kernel_config CONFIG_NETLABEL m
+                      set_kernel_config CONFIG_NETLABEL y
                       set_kernel_config CONFIG_IP6_NF_SECURITY m
                     fi
                     set_kernel_config CONFIG_SECURITY_SELINUX n
                     set_kernel_config CONFIG_SYSTEM_EXTRA_CERTIFICATE y
                     set_kernel_config CONFIG_SECONDARY_TRUSTED_KEYRING y
                     set_kernel_config CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY n
+            		set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYS m
+            		set_kernel_config CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE 4096
+                    set_kernel_config CONFIG_ARM64_CRYPTO y
+                    set_kernel_config CONFIG_CRYPTO_SHA256_ARM64 m
+                    set_kernel_config CONFIG_CRYPTO_SHA512_ARM64 m
+                    set_kernel_config CONFIG_CRYPTO_SHA1_ARM64_CE m
+                    set_kernel_config CRYPTO_GHASH_ARM64_CE m
+                    set_kernel_config CRYPTO_SHA2_ARM64_CE m
+                    set_kernel_config CONFIG_CRYPTO_CRCT10DIF_ARM64_CE m
+                    set_kernel_config CONFIG_CRYPTO_CRC32_ARM64_CE m
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64 m
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64_CE m
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64_CE_CCM y
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64_CE_BLK y
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64_NEON_BLK m
+                    set_kernel_config CONFIG_CRYPTO_CHACHA20_NEON m
+                    set_kernel_config CONFIG_CRYPTO_AES_ARM64_BS m
+            		set_kernel_config SYSTEM_TRUSTED_KEYS
                   fi
                   # Netfilter kernel support See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
             	    unset_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE
             	  fi
             	  #Revert to previous directory
             	  cd "${WORKDIR}" || exit

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

             # 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
             # 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

bootstrap.d/41-uboot.sh +5 0

                 sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
               fi
+              # instead of sd, boot from usb device
+              if [ "$ENABLE_UBOOTUSB" = true ] ; then
+                sed -i "s|mmc|usb|g" "${BOOT_DIR}/uboot.mkimage"
+              fi
               # Set mkfile to use the correct dtb file
               sed -i "s|bcm2709-rpi-2-b.dtb|${DTB_FILE}|" "${BOOT_DIR}/uboot.mkimage"

rpi23-gen-image.sh +12 -8

             ENABLE_REDUCE=${ENABLE_REDUCE:=false}
             ENABLE_UBOOT=${ENABLE_UBOOT:=false}
             UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
+            ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}
             ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
             ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
             ENABLE_NEXMON=${ENABLE_NEXMON:=false}
                 ;;
             esac
+            if [ "$ENABLE_UBOOTUSB" = true ] ; then
+              if [ "$ENABLE_UBOOT" = false ] ; then
+                echo "error: Enabling UBOOTUSB requires u-boot to be enabled"
+            	exit 1
+              fi
+              if [ "$RPI_MODEL" != 3 ] || [ "$RPI_MODEL" != 3P ] ; then
+                echo "error: Enabling UBOOTUSB requires Raspberry 3"
+            	exit 1
+              fi
+            fi
             # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
             if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
               # Include bluetooth packages on supported boards
               APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
             fi
-            if [ "$ENABLE_BLUETOOTH" = true ] ; then
-              if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
-                if [ "$ENABLE_CONSOLE" = false ] ; then
-            	  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
-            	fi
-              fi
-            fi
             # Check if root SSH (v2) public key file exists
             if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
               if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then

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