Raspi2-3_GenImage Commit - r360:7d6ba716d8f3 · Collaboration Tremplin des Sciences

Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix

burnbabyburn -

r360:7d6ba716d8f3

parent child

Context file:

r360:7d6ba716d8f3

Collapse all files

bootstrap.d/13-kernel.sh +7 -8

             # Fetch and build latest raspberry kernel
             if [ "$BUILD_KERNEL" = true ] ; then
               # Setup source directory
-              mkdir -p "${R}/usr/src/linux"
+              mkdir -p "${KERNEL_DIR}"
               # Copy existing kernel sources into chroot directory
               if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
                   "${KERNEL_DIR}/.config"
                 fi
+                if [ "$KERNELSRC_CONFIG" = true ] ; then
+                  # Load default raspberry kernel configuration
+                  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
             	  #Switch to KERNELSRC_DIR
             	  pushd "${KERNEL_DIR}"
                     # requires activation via kernel parameter or sysfs
                     # see e.g. https://askubuntu.com/a/472227 for a summary of ZSWAP (vs ZRAM etc.)
                     # and e.g. https://wiki.archlinux.org/index.php/zswap for parameters etc.
                     set_kernel_config ZPOOL y
                     set_kernel_config ZSWAP y
                     set_kernel_config ZBUD y
             	  if [ "$KERNEL_VIRT" = true ] && ( [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ) ; then
                    # enable basic KVM support; see e.g.
                     # https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=210546&start=25#p1300453
                     set_kernel_config VIRTUALIZATION y
                     set_kernel_config KVM y
                     set_kernel_config VHOST_NET m
             	    set_kernel_config CONFIG_CGROUP_BPF y
             	  fi
+            	  #Revert to previous directory
             	  popd
-                if [ "$KERNELSRC_CONFIG" = true ] ; then
-                  # Load default raspberry kernel configuration
-                  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
                   # Set kernel configuration parameters to enable qemu emulation
                   if [ "$ENABLE_QEMU" = true ] ; then
                     echo "CONFIG_FHANDLE=y" >> "${KERNEL_DIR}"/.config
                 rm -fr "${temp_dir}"
                 # Set permissions of the kernel sources
-                chown -R root:root "${R}/boot"
+                chown -R root:root "${R}/boot/firmware"
             	chown -R root:root "${R}/lib"
             fi

bootstrap.d/15-rpi-config.sh +8 -8

             ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
             # Install and setup kernel modules to load at boot
-            mkdir -p "${R}/lib/modules-load.d/"
+            mkdir -p "${LIB_DIR}/modules-load.d/"
-            install_readonly files/modules/rpi2.conf "${R}/lib/modules-load.d/rpi2.conf"
+            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/" "${R}/lib/modules-load.d/rpi2.conf"
+              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/" "${R}/lib/modules-load.d/rpi2.conf"
+              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/" "${R}/lib/modules-load.d/rpi2.conf"
+              sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${LIB_DIR}/modules-load.d/rpi2.conf"
-              sed -i "s/^# i2c-dev/i2c-dev/" "${R}/lib/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" >> "${R}/lib/modules-load.d/rpi2.conf"
+              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/" "${R}/lib/modules-load.d/rpi2.conf"
+                sed -i "s/spi-bcm2708/spi-bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
               fi
             fi

rpi23-gen-image.sh +1 -1

             LIB_DIR="${R}/lib"
             BOOT_DIR="${R}/boot/firmware"
             KERNEL_DIR="${R}/usr/src/linux"
-            WLAN_FIRMWARE_DIR="${R}/lib/firmware/brcm"
+            WLAN_FIRMWARE_DIR="${LIB_DIR}/firmware/brcm"
             # Firmware directory: Blank if download from github
             RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}

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