From 9c724d40c9f3111e94cd3cc4a0b9e8df01eae42e 2016-09-19 14:41:23 From: Michal Svamberg Date: 2016-09-19 14:41:23 Subject: [PATCH] Add KERNELSRC_USRCONFIG option --- diff --git a/README.md b/README.md index f4829f4..2594613 100644 --- a/README.md +++ b/README.md @@ -214,8 +214,11 @@ Clean the existing kernel sources directory `KERNELSRC_DIR` (using `make mrprope ##### `KERNELSRC_CONFIG`=true Run `make bcm2709_defconfig` (and optional `make menuconfig`) to configure the kernel sources before building. This parameter is automatically set to `true` if no existing kernel sources directory was specified using `KERNELSRC_DIR`. This parameter is ignored if `KERNELSRC_PREBUILT`=true. +##### `KERNELSRC_USRCONFIG`="" +Copy own config file to kernel `.config`. If `KERNEL_MENUCONFIG`=true then running after copy. + ##### `KERNELSRC_PREBUILT`=false -With this parameter set to true the script expects the existing kernel sources directory to be already successfully cross-compiled. The parameters `KERNELSRC_CLEAN`, `KERNELSRC_CONFIG` and `KERNEL_MENUCONFIG` are ignored and no kernel compilation tasks are performed. +With this parameter set to true the script expects the existing kernel sources directory to be already successfully cross-compiled. The parameters `KERNELSRC_CLEAN`, `KERNELSRC_CONFIG`, `KERNELSRC_USRCONFIG` and `KERNEL_MENUCONFIG` are ignored and no kernel compilation tasks are performed. ##### `RPI_FIRMWARE_DIR`="" The directory containing a local copy of the firmware from the [RaspberryPi firmware project](https://github.com/raspberrypi/firmware). Default is to download the latest firmware directly from the project. diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index 1de8b7b..f2e0b40 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -71,8 +71,8 @@ if [ "$BUILD_KERNEL" = true ] ; then # Load default raspberry kernel configuration make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}" - if [ ! -z "$KERNELUSR_CONFIG" ] ; then - cp $KERNELUSR_CONFIG ${KERNEL_DIR}/.config + if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then + cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config fi # Start menu-driven kernel configuration (interactive)