Raspi2-3_GenImage Commit - r176:f1d907267caa · Collaboration Tremplin des Sciences

Merge branch 'master' into func-as-nobody

drtyhlpr -

r176:f1d907267caa

parent child

Context file:

r176:f1d907267caa

Collapse all files

templates/rpi3-stretch-arm64-4.11.y created 644 +15 0

			@@ -0,0 +1,15
		1	# Configuration template file used by rpi23-gen-image.sh
		2	# Debian Stretch using the Arm64 for kernel compilation and Debian distribution.
		3
		4	RPI_MODEL=3
		5	RELEASE=stretch
		6	BUILD_KERNEL=true
		7	KERNEL_ARCH=arm64
		8	RELEASE_ARCH=arm64
		9	CROSS_COMPILE=aarch64-linux-gnu-
		10	QEMU_BINARY=/usr/bin/qemu-aarch64-static
		11	KERNEL_DEFCONFIG=bcmrpi3_defconfig
		12	KERNEL_BIN_IMAGE=Image
		13	KERNEL_IMAGE=kernel8.img
		14	KERNEL_BRANCH=rpi-4.11.y
		15	ENABLE_WIRELESS=true

README.md +31 -4

              Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once.
              ##### `APT_INCLUDES`=""
-             A comma separated list of additional packages to be installed during bootstrapping.
+             A comma separated list of additional packages to be installed by debootstrap during bootstrapping.
+             ##### `APT_INCLUDES_LATE`=""
+             A comma separated list of additional packages to be installed by apt after bootstrapping and after APT sources are set up.  This is useful for packages with pre-depends, which debootstrap do not handle well.
              ---
              ##### `RELEASE`="jessie"
              Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie" and "stretch". `BUILD_KERNEL`=true will automatically be set if the Debian release `stretch` is used.
+             ##### `RELEASE_ARCH`="armhf"
+             Set the desired Debian release architecture.
              ##### `HOSTNAME`="rpi$RPI_MODEL-$RELEASE"
              Set system host name. It's recommended that the host name is unique in the corresponding subnet.
              ---
-             #### Keyboard settings:
+             #### Keyboard settings:
              These options are used to configure keyboard layout in `/etc/default/keyboard` for console and Xorg. These settings can also be changed inside the running OS using the `dpkg-reconfigure keyboard-configuration` command.
              ##### `XKB_MODEL`=""
              ##### `BUILD_KERNEL`=false
              Build and install the latest RPi2/3 Linux kernel. Currently only the default RPi2/3 kernel configuration is used. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
+             ##### `CROSS_COMPILE`="arm-linux-gnueabihf-"
+             This sets the cross compile enviornment for the compiler.
+             ##### `KERNEL_ARCH`="arm"
+             This sets the kernel architecture for the compiler.
+             ##### `KERNEL_IMAGE`="kernel7.img"
+             Name of the image file in the boot partition.
+             ##### `KERNEL_BRANCH`=""
+             Name of the requested branch from the GIT location for the RPi Kernel. Default is using the current default branch from the GIT site.
+             ##### `QEMU_BINARY`="/usr/bin/qemu-arm-static"
+             Sets the QEMU enviornment for the Debian archive.
+             ##### `KERNEL_DEFCONFIG`="bcm2709_defconfig"
+             Sets the default config for kernel compiling.
              ##### `KERNEL_REDUCE`=false
              Reduce the size of the generated kernel by removing unwanted device, network and filesystem drivers (experimental).
              ##### `BASEDIR`=$(pwd)/images/${RELEASE}
              Set a path to a working directory used by the script to generate an image.
-             ##### `IMAGE_NAME`=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}
-             Set a filename for the output file(s). Note: the script will create $IMAGE_NAME.img if `ENABLE_SPLITFS`=false or $IMAGE_NAME-frmw.img and $IMAGE_NAME-root.img if `ENABLE_SPLITFS`=true.
+             ##### `IMAGE_NAME`=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}
+             Set a filename for the output file(s). Note: the script will create $IMAGE_NAME.img if `ENABLE_SPLITFS`=false or $IMAGE_NAME-frmw.img and $IMAGE_NAME-root.img if `ENABLE_SPLITFS`=true. Note 2: If the KERNEL_BRANCH is not set, the word "CURRENT" is used.
              ## Understanding the script
              The functions of this script that are required for the different stages of the bootstrapping are split up into single files located inside the `bootstrap.d` directory. During the bootstrapping every script in this directory gets executed in lexicographical order:
              bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-frmw.img /dev/mmcblk0
              bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-root.img /dev/sdc
              ```
+             ## Weekly image builds
+             The image files are provided by JRWR'S I/O PORT and are built once a Sunday at midnight UTC!
+             * [Debian Stretch Raspberry Pi2/3 Weekly Image Builds](https://jrwr.io/doku.php?id=projects:debianpi)
              ## External links and references
-             * [Debian worldwide mirror sites](https://www.debian.org/mirror/list)

bootstrap.d/10-bootstrap.sh +1 -1

              http_proxy=${APT_PROXY} debootstrap ${EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
              # Copy qemu emulator binary to chroot
-             install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
+             install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
              # Copy debian-archive-keyring.pgp
              mkdir -p "${R}/usr/share/keyrings"

bootstrap.d/11-apt.sh +4 0

              chroot_exec apt-get -qq -y update
              chroot_exec apt-get -qq -y -u dist-upgrade
+             if [ "$APT_INCLUDES_LATE" ] ; then
+               chroot_exec apt-get -qq -y install $(echo $APT_INCLUDES_LATE |tr , ' ')
+             fi
              if [ -d packages ] ; then
                for package in packages/*.deb ; do
                  cp $package ${R}/tmp

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

                  temp_dir=$(as_nobody mktemp -d)
                  # Fetch current RPi2/3 kernel sources
-                 as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}"
+                 if [ -z "${KERNEL_BRANCH}" ] ; then
+                   as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}"
+                 else
+                   as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}"
+                 fi
                  # Copy downloaded kernel sources
                  mv "${temp_dir}/linux" "${R}/usr/src/"
                  fi
                  # Cross compile kernel and modules
-                 make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" zImage modules dtbs
+                 make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_BIN_IMAGE}" modules dtbs
                fi
                # Check if kernel compilation was successful
-               if [ ! -r "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/zImage" ] ; then
-                 echo "error: kernel compilation failed! (zImage not found)"
+               if [ ! -r "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" ] ; then
+                 echo "error: kernel compilation failed! (kernel image not found)"
                  cleanup
                  exit 1
                fi
                # Copy dts and dtb device tree sources and binaries
                mkdir "${BOOT_DIR}/overlays"
+               # Ensure the proper .dtb is located
+               if [ "$KERNEL_ARCH" = "arm" ] ; then
                install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb "${BOOT_DIR}/"
+               else
+                 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/broadcom/"*.dtb "${BOOT_DIR}/"
+               fi
                install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/"*.dtb* "${BOOT_DIR}/overlays/"
                install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" "${BOOT_DIR}/overlays/README"
                if [ "$ENABLE_UBOOT" = false ] ; then
-                 # Convert and copy zImage kernel to the boot directory
-                 "${KERNEL_DIR}/scripts/mkknlimg" "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/zImage" "${BOOT_DIR}/${KERNEL_IMAGE}"
+                 # Convert and copy kernel image to the boot directory
+                 "${KERNEL_DIR}/scripts/mkknlimg" "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
                else
-                 # Copy zImage kernel to the boot directory
-                 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/zImage" "${BOOT_DIR}/${KERNEL_IMAGE}"
+                 # Copy kernel image to the boot directory
+                 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
                fi
                # Remove kernel sources

rpi23-gen-image.sh +12 -1

              KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
              KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
              QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
+             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
              # URLs
              KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
              # Build directories
              BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
              BUILDDIR="${BASEDIR}/build"
              # Prepare date string for default image file name
              DATE="$(date +%Y-%m-%d)"
-             IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}}
+             if [ -z "$KERNEL_BRANCH" ] ; then
+               IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+             else
+               IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+             fi
              # Chroot directories
              R="${BUILDDIR}/chroot"
              KERNEL_HEADERS=${KERNEL_HEADERS:=true}
              KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
              KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
+             KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
              # Kernel compilation from source directory settings
              KERNELSRC_DIR=${KERNELSRC_DIR:=""}
              # Add packages required for kernel cross compilation
              if [ "$BUILD_KERNEL" = true ] ; then
+               if [ "$KERNEL_ARCH" = "arm" ] ; then
                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
+               else
+                 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
+               fi
              fi
              # Add libncurses5 to enable kernel menuconfig

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