Raspi2-3_GenImage Commit - r756:03c30a6b8f78 · Collaboration Tremplin des Sciences

Error correction on start4.elf copies...

vidal -

r756:03c30a6b8f78

parent child

Context file:

r756:03c30a6b8f78

bootstrap.d/13-kernel.sh +1 -1

                  # Create temporary directory for kernel sources
                  temp_dir=$(as_nobody mktemp -d)
-                 # Fetch current RPi2/3 kernel sources
+                 # Fetch current RPi2/3/4 kernel sources
                  if [ -z "${KERNEL_BRANCH}" ] ; then
                    as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                  else

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

                cp "${RPI_FIRMWARE_DIR}"/boot/fixup4x.dat "${BOOT_DIR}"/fixup4x.dat
                cp "${RPI_FIRMWARE_DIR}"/boot/start4cd.elf "${BOOT_DIR}"/start4cd.elf
                cp "${RPI_FIRMWARE_DIR}"/boot/start4db.elf "${BOOT_DIR}"/start4db.elf
-               cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4x.elf
+               cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4.elf
                cp "${RPI_FIRMWARE_DIR}"/boot/start4x.elf "${BOOT_DIR}"/start4x.elf
              else
                # Create temporary directory for boot binaries
                as_nobody wget -q -O "${temp_dir}/fixup4x.dat" "${FIRMWARE_URL}/fixup4x.dat"
                as_nobody wget -q -O "${temp_dir}/start4cd.elf" "${FIRMWARE_URL}/start4cd.elf"
                as_nobody wget -q -O "${temp_dir}/start4db.elf" "${FIRMWARE_URL}/start4db.elf"
-               as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
+               as_nobody wget -q -O "${temp_dir}/start4.elf" "${FIRMWARE_URL}/start4.elf"
                as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
                # Move downloaded boot binaries

rpi23-gen-image.sh +17 -15

              # Setup architecture specific settings
              if [ -n "$SET_ARCH" ] ; then
-               # 64-bit configuration
+               ## 64-bit configuration
                if [ "$SET_ARCH" = 64 ] ; then
-                 # General 64-bit depended settings
+                 ### General 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"}
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi 64-bit model specific settings
                  if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                    if [ "$RPI_MODEL" != 4 ] ; then
                      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
                    RELEASE_ARCH=${RELEASE_ARCH:=arm64}
                    KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
                    CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
                  else
                    echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
                    exit 1
                  fi
                fi
-               # 32-bit configuration
+               ## 32-bit configuration
                if [ "$SET_ARCH" = 32 ] ; then
-                 # General 32-bit dependend settings
+                 ### General 32-bit dependend settings
                  QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
                  KERNEL_ARCH=${KERNEL_ARCH:=arm}
                  KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi (0-1P) model specific settings
                  if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
                    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-}
-             	  if [ $ENABLE_XORG = true ] ; then
-             	    if [$RELEASE = "stretch" ] || [$RELEASE = "oldstable" ] ; then
-             	      printf "\nBest support for armel architecture is provided under Debian stretch/oldstable. Choose yes to change release to Debian stretch[y/n] "
-             	    fi
-             	  fi
                  fi
-                 # Raspberry Pi model specific settings
+                 ### Raspberry Pi (2-4) model specific settings
                  if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                    if [ "$RPI_MODEL" != 4 ] ; then
                      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
                    CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
                  fi
                fi
              # SET_ARCH not set
              else
                echo "error: Please set '32' or '64' as value for SET_ARCH"
              # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
              if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
-               # Include bluetooth packages on supported boards
+               ## Include bluetooth packages on supported boards
                if [ "$ENABLE_BLUETOOTH" = true ] ; then
                  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
                fi
                if [ "$ENABLE_WIRELESS" = true ] ; then
                  APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb,wpasupplicant"
                fi
-             else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
-               # Check if the internal wireless interface is not supported by the RPi model
+               # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+             else
+               ## Check if the internal wireless interface is not supported by the RPi model
                if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
                  echo "error: The selected Raspberry Pi model has no integrated interface for wireless or bluetooth"
                  exit 1
                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup"
                APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs"
-               # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package
+               ## If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package
                if [ "$CRYPTFS_DROPBEAR" = true ] && [ "$ENABLE_INITRAMFS" = true ]; then
                  APT_INCLUDES="${APT_INCLUDES},dropbear-initramfs"
                fi
                read -r confirm
                [ "$confirm" != "y" ] && exit 1
-               # Make sure all missing required packages are installed
+               ## Make sure all missing required packages are installed
                apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
              fi
              # Replace selected packages with smaller clones
              if [ "$ENABLE_REDUCE" = true ] ; then
-               # Add levee package instead of vim-tiny
+               ## Add levee package instead of vim-tiny
                if [ "$REDUCE_VIM" = true ] ; then
                  APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/vim-tiny/levee/")"
                fi
-               # Add dropbear package instead of openssh-server
+               ## Add dropbear package instead of openssh-server
                if [ "$REDUCE_SSHD" = true ] ; then
                  APT_INCLUDES="$(echo "${APT_INCLUDES}" | sed "s/openssh-server/dropbear/")"
                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