From 9de2b1d4943c7dd82df28c00e98a28778473bc8f 2018-11-10 21:46:08 From: Unknown Date: 2018-11-10 21:46:08 Subject: [PATCH] - fix a variable syntax - added error message for wrong model if precompiled kernel should be used - set build kernel = true as default --- diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh index 0f03744..f413f58 100644 --- a/bootstrap.d/11-apt.sh +++ b/bootstrap.d/11-apt.sh @@ -12,7 +12,7 @@ if [ -z "$APT_PROXY" ] ; then fi if [ "$BUILD_KERNEL" = false ] ; then - if [ RPI_MODEL = 2 ] ; 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" @@ -25,6 +25,7 @@ if [ "$BUILD_KERNEL" = false ] ; then chroot_exec apt-get -qq -y --allow-unauthenticated install collabora-obs-archive-keyring # if RPI_MODEL = [0] || [1] || [1P] else + echo "error: ATM there is just a precompiled kernel for model 2"; # insert apt configuration for precompiled kernel repository for RPI 0,1,1P fi diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 3fb9b8f..2931ab8 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -153,7 +153,7 @@ ENABLE_IFNAMES=${ENABLE_IFNAMES:=true} DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=} # Kernel compilation settings -BUILD_KERNEL=${BUILD_KERNEL:=false} +BUILD_KERNEL=${BUILD_KERNEL:=true} KERNEL_REDUCE=${KERNEL_REDUCE:=false} KERNEL_THREADS=${KERNEL_THREADS:=1} KERNEL_HEADERS=${KERNEL_HEADERS:=true} @@ -510,6 +510,7 @@ if [ "$ENABLE_REDUCE" = true ] ; then fi fi +#backwards compability to jessie - untested if [ "$RELEASE" != "jessie" ] ; then APT_INCLUDES="${APT_INCLUDES},libnss-systemd" fi