aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.d/13-kernel.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap.d/13-kernel.sh')
-rw-r--r--bootstrap.d/13-kernel.sh43
1 files changed, 28 insertions, 15 deletions
diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index 0ca889c..87a33b7 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -1,43 +1,56 @@
#
-# Kernel installation
+# Build and Setup RPi2 Kernel
#
+# Load utility functions
. ./functions.sh
# Fetch and build latest raspberry kernel
if [ "$BUILD_KERNEL" = true ] ; then
# Fetch current raspberrypi kernel sources
- git -C $R/usr/local/src clone --depth=1 https://github.com/raspberrypi/linux
+ git -C $R/usr/src clone --depth=1 https://github.com/raspberrypi/linux
# Load default raspberry kernel configuration
- make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
+ make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
+
+ # Calculate optimal number of kernel building threads
+ if [ "KERNEL_THREADS" = 1 ] ; then
+ if [ -f /proc/cpuinfo ] ; then
+ KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
+ fi
+ fi
# Cross compile kernel and modules
- make -C $R/usr/local/src/linux -j$(grep -c processor /proc/cpuinfo) ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- zImage modules dtbs
+ make -C $R/usr/src/linux -j${KERNEL_THREADS} ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- zImage modules dtbs
# Install kernel modules
- make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_MOD_PATH=../.. modules_install
+ make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_MOD_PATH=../../.. modules_install
# Install kernel headers
if [ "$KERNEL_HEADERS" = true ]; then
- make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_HDR_PATH=../../usr headers_install
+ make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_HDR_PATH=../.. headers_install
fi
# Copy and rename compiled kernel to boot directory
mkdir $R/boot/firmware/
- $R/usr/local/src/linux/scripts/mkknlimg $R/usr/local/src/linux/arch/arm/boot/zImage $R/boot/firmware/kernel7.img
+ $R/usr/src/linux/scripts/mkknlimg $R/usr/src/linux/arch/arm/boot/zImage $R/boot/firmware/kernel7.img
# Copy dts and dtb device definitions
mkdir $R/boot/firmware/overlays/
- cp $R/usr/local/src/linux/arch/arm/boot/dts/*.dtb $R/boot/firmware/
- cp $R/usr/local/src/linux/arch/arm/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
- cp $R/usr/local/src/linux/arch/arm/boot/dts/overlays/README $R/boot/firmware/overlays/
+ cp $R/usr/src/linux/arch/arm/boot/dts/*.dtb $R/boot/firmware/
+ cp $R/usr/src/linux/arch/arm/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
+ cp $R/usr/src/linux/arch/arm/boot/dts/overlays/README $R/boot/firmware/overlays/
+
+ # Remove kernel sources
+ if [ "$KERNEL_RMSRC" = true ]; then
+ rm -fr $R/usr/src/linux
+ fi
# Install raspberry bootloader and flash-kernel
chroot_exec apt-get -qq -y --no-install-recommends install raspberrypi-bootloader-nokernel
else
# Kernel installation
- chroot_exec apt-get -qq -y --no-install-recommends install linux-image-${KERNEL} raspberrypi-bootloader-nokernel
+ 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
@@ -63,7 +76,7 @@ fi
echo "${CMDLINE}" >$R/boot/firmware/cmdline.txt
# Set up firmware config
-install -o root -g root -m 644 files/config.txt $R/boot/firmware/config.txt
+install_readonly files/boot/config.txt $R/boot/firmware/config.txt
# Load snd_bcm2835 kernel module at boot time
if [ "$ENABLE_SOUND" = true ] ; then
@@ -93,10 +106,10 @@ fi
mkdir -p $R/etc/modprobe.d/
# Blacklist sound modules
-install -o root -g root -m 644 files/modprobe.d/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
+install_readonly files/modprobe.d/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
# Create default fstab
-install -o root -g root -m 644 files/fstab $R/etc/fstab
+install_readonly files/mount/fstab $R/etc/fstab
# Avoid swapping and increase cache sizes
-install -o root -g root -m 644 files/sysctl.d/81-rpi-vm.conf $R/etc/sysctl.d/81-rpi-vm.conf
+install_readonly files/sysctl.d/81-rpi-vm.conf $R/etc/sysctl.d/81-rpi-vm.conf