Raspi2-3_GenImage Commit - r292:9e5bb80b1061 · Collaboration Tremplin des Sciences

Added support for precompiled kernel other than collabora

Unknown -

r292:9e5bb80b1061

parent child

Context file:

r292:9e5bb80b1061

Collapse all files

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

              #
              # Setup APT repositories
              #
              # Load utility functions
              . ./functions.sh
              # Install and setup APT proxy configuration
              if [ -z "$APT_PROXY" ] ; then
                install_readonly files/apt/10proxy "${ETC_DIR}/apt/apt.conf.d/10proxy"
                sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
              fi
              if [ "$BUILD_KERNEL" = false ] ; then
+               if [ RPI_MODEL = 2 ] ; then
                # Install APT pinning configuration for flash-kernel package
                install_readonly files/apt/flash-kernel "${ETC_DIR}/apt/preferences.d/flash-kernel"
                # Install APT sources.list
                install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
                echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETC_DIR}/apt/sources.list"
                # Upgrade collabora package index and install collabora keyring
                chroot_exec apt-get -qq -y update
                chroot_exec apt-get -qq -y --allow-unauthenticated install collabora-obs-archive-keyring
+               # if RPI_MODEL = [0] || [1] || [1P]
+               else
+               # insert apt configuration for precompiled kernel repository for RPI 0,1,1P
+               fi
              else # BUILD_KERNEL=true
                # Install APT sources.list
                install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
                # Use specified APT server and release
                sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
                sed -i "s/ jessie/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
              fi
              # Allow the installation of non-free Debian packages
              if [ "$ENABLE_NONFREE" = true ] ; then
                sed -i "s/ contrib/ contrib non-free/" "${ETC_DIR}/apt/sources.list"
              fi
              # Upgrade package index and update all installed packages and changed dependencies
              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
                  chroot_exec dpkg --unpack /tmp/$(basename $package)
                done
              fi
              chroot_exec apt-get -qq -y -f install
              chroot_exec apt-get -qq -y check

bootstrap.d/13-kernel.sh +15 -2

              #
              # Build and Setup RPi2/3 Kernel
              #
              # Load utility functions
              . ./functions.sh
              # Fetch and build latest raspberry kernel
              if [ "$BUILD_KERNEL" = true ] ; then
                # Setup source directory
                mkdir -p "${R}/usr/src/linux"
                # Copy existing kernel sources into chroot directory
                if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
                  # Copy kernel sources and include hidden files
                  cp -r "${KERNELSRC_DIR}/". "${R}/usr/src/linux"
                  # Clean the kernel sources
                  if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" mrproper
                  fi
                else # KERNELSRC_DIR=""
                  # Create temporary directory for kernel sources
                  temp_dir=$(as_nobody mktemp -d)
                  # Fetch current RPi2/3 kernel sources
                  if [ -z "${KERNEL_BRANCH}" ] ; then
                    as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                  else
                    as_nobody -H git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
                 fi
                  # Copy downloaded kernel sources
                  cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
                  # Remove temporary directory for kernel sources
                  rm -fr "${temp_dir}"
                  # Set permissions of the kernel sources
                  chown -R root:root "${R}/usr/src"
                fi
                # Calculate optimal number of kernel building threads
                if [ "$KERNEL_THREADS" = "1" ] && [ -r /proc/cpuinfo ] ; then
                  KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
                fi
                # Configure and build kernel
                if [ "$KERNELSRC_PREBUILT" = false ] ; then
                  # Remove device, network and filesystem drivers from kernel configuration
                  if [ "$KERNEL_REDUCE" = true ] ; then
                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
                    sed -i\
                    -e "s/\(^CONFIG_SND.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_SOUND.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_AC97.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_VIDEO_.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_MEDIA_TUNER.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_DVB.*\=\)[ym]/\1n/"\
                    -e "s/\(^CONFIG_REISERFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_JFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_XFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_GFS2.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_OCFS2.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_BTRFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_HFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_JFFS2.*\=\)[ym]/\1n/"\
                    -e "s/\(^CONFIG_UBIFS.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_SQUASHFS.*\=\)[ym]/\1n/"\
                    -e "s/\(^CONFIG_W1.*\=\)[ym]/\1n/"\
                    -e "s/\(^CONFIG_HAMRADIO.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_CAN.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_IRDA.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_BT_.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_WIMAX.*\=\)[ym]/\1n/"\
                    -e "s/\(^CONFIG_6LOWPAN.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_IEEE802154.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_NFC.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_FB_TFT=.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_TOUCHSCREEN.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_USB_GSPCA_.*\=\).*/\1n/"\
                    -e "s/\(^CONFIG_DRM.*\=\).*/\1n/"\
                    "${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}"
                    # Set kernel configuration parameters to enable qemu emulation
                    if [ "$ENABLE_QEMU" = true ] ; then
                      echo "CONFIG_FHANDLE=y" >> ${KERNEL_DIR}/.config
                      echo "CONFIG_LBDAF=y" >> ${KERNEL_DIR}/.config
                      if [ "$ENABLE_CRYPTFS" = true ] ; then
                        echo "CONFIG_EMBEDDED=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_EXPERT=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_DAX=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_MD=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_BLK_DEV_MD=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_MD_AUTODETECT=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_BLK_DEV_DM=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_BLK_DEV_DM_BUILTIN=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_DM_CRYPT=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_CRYPTO_BLKCIPHER=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_CRYPTO_CBC=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_CRYPTO_XTS=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_CRYPTO_SHA512=y" >> ${KERNEL_DIR}/.config
                        echo "CONFIG_CRYPTO_MANAGER=y" >> ${KERNEL_DIR}/.config
              	fi
                    fi
                    # Copy custom kernel configuration file
                    if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then
                      cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config
                    fi
                    # Set kernel configuration parameters to their default values
                    if [ "$KERNEL_OLDDEFCONFIG" = true ] ; then
                      make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" olddefconfig
                    fi
                    # Start menu-driven kernel configuration (interactive)
                    if [ "$KERNEL_MENUCONFIG" = true ] ; then
                      make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
                    fi
                  fi
                  # Use ccache to cross compile the kernel
                  if [ "$KERNEL_CCACHE" = true ] ; then
                    cc="ccache ${CROSS_COMPILE}gcc"
                  else
                    cc="${CROSS_COMPILE}gcc"
                  fi
                  # Cross compile kernel and dtbs
                  make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
                  # Cross compile kernel modules
                  if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
                    make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
                  fi
                fi
                # Check if kernel compilation was successful
                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
                # Install kernel modules
                if [ "$ENABLE_REDUCE" = true ] ; then
                  if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
                  fi
                else
                  if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
                  fi
                  # Install kernel firmware
                  if [ $(grep "^firmware_install:" "${KERNEL_DIR}/Makefile") ] ; then
                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_FW_PATH=../../../lib firmware_install
                  fi
                fi
                # Install kernel headers
                if [ "$KERNEL_HEADERS" = true ] && [ "$KERNEL_REDUCE" = false ] ; then
                  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_HDR_PATH=../.. headers_install
                fi
                # Prepare boot (firmware) directory
                mkdir "${BOOT_DIR}"
                # Get kernel release version
                KERNEL_VERSION=`cat "${KERNEL_DIR}/include/config/kernel.release"`
                # Copy kernel configuration file to the boot directory
                install_readonly "${KERNEL_DIR}/.config" "${R}/boot/config-${KERNEL_VERSION}"
                # Prepare device tree directory
                mkdir "${BOOT_DIR}/overlays"
                # Ensure the proper .dtb is located
                if [ "$KERNEL_ARCH" = "arm" ] ; then
                  for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb ; do
                    if [ -f "${dtb}" ] ; then
                      install_readonly "${dtb}" "${BOOT_DIR}/"
                    fi
                  done
                else
                  for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/broadcom/"*.dtb ; do
                    if [ -f "${dtb}" ] ; then
                      install_readonly "${dtb}" "${BOOT_DIR}/"
                    fi
                  done
                fi
                # Copy compiled dtb device tree files
                if [ -d "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays" ] ; then
                  for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/"*.dtb ; do
                    if [ -f "${dtb}" ] ; then
                      install_readonly "${dtb}" "${BOOT_DIR}/overlays/"
                    fi
                  done
                  if [ -f "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" ] ; then
                    install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" "${BOOT_DIR}/overlays/README"
                  fi
                fi
                if [ "$ENABLE_UBOOT" = false ] ; then
                  # 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 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
                if [ "$KERNEL_REMOVESRC" = true ] ; then
                  rm -fr "${KERNEL_DIR}"
                else
                  # Prepare compiled kernel modules
                  if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
                    if [ $(grep "^modules_prepare:" "${KERNEL_DIR}/Makefile") ] ; then
                      make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
                    fi
                    # Create symlinks for kernel modules
                    chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/build"
                    chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/source"
                  fi
                fi
-             else # BUILD_KERNEL=false
+             elif [ BUILD_KERNEL = false ]
+               # Collabora states this kernel is just for RPI 2 so better implement a check.
+               #From https://repositories.collabora.co.uk/debian/dists/jessie/rpi2/binary-armhf/Packages
+               #"The Linux kernel "${COLLABORA_KERNEL}" and modules for use on ARMv7 kernel for Raspberry pi 2 model B+"
+               # nested if to be easily extended for more precompiled kernels
+               if [ "$SET_ARCH" = 32 ] ; then
+                 if [ RPI_MODEL = 2 ] ; then
                # Kernel installation
                chroot_exec apt-get -qq -y --no-install-recommends install linux-image-"${COLLABORA_KERNEL}" raspberrypi-bootloader-nokernel
                # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
                chroot_exec apt-get -qq -y install flash-kernel
                # Check if kernel installation was successful
                VMLINUZ="$(ls -1 ${R}/boot/vmlinuz-* | sort | tail -n 1)"
                if [ -z "$VMLINUZ" ] ; then
                  echo "error: kernel installation failed! (/boot/vmlinuz-* not found)"
                  cleanup
                  exit 1
                fi
                # Copy vmlinuz kernel to the boot directory
                install_readonly "${VMLINUZ}" "${BOOT_DIR}/${KERNEL_IMAGE}"
              fi
+             	if [ RPI_MODEL = 0 ] || [ RPI_MODEL = 1 ] || [ RPI_MODEL = 1P ] ; then
+             	# insert precompiled Kernel here
+             	fi
+               #if [ "$SET_ARCH" = 64 ]
+               else
+               # inset precompiled 64 bit kernel here
+               fi
+             fi

bootstrap.d/15-rpi-config.sh 0 0

NO CONTENT: modified file

bootstrap.d/41-uboot.sh 0 0

NO CONTENT: modified file

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