From ed900e11fb41a5688547a3f798288575d4378dec 2018-11-22 16:25:14 From: burnbabyburn Date: 2018-11-22 16:25:14 Subject: [PATCH] Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix --- diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index 0462af5..d3b1945 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -80,7 +80,7 @@ if [ "$BUILD_KERNEL" = true ] ; then -e "s/\(^CONFIG_TOUCHSCREEN.*\=\).*/\1n/"\ -e "s/\(^CONFIG_USB_GSPCA_.*\=\).*/\1n/"\ -e "s/\(^CONFIG_DRM.*\=\).*/\1n/"\ - "${KERNEL_DIR}"/.config + "${KERNEL_DIR}/.config" fi if [ "$KERNELSRC_CONFIG" = true ] ; then @@ -214,7 +214,7 @@ if [ "$BUILD_KERNEL" = true ] ; then fi #Revert to previous directory - cd "${R}" + cd "${WORKDIR}" # Set kernel configuration parameters to enable qemu emulation if [ "$ENABLE_QEMU" = true ] ; then diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 6e94951..8296e71 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -65,7 +65,8 @@ RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_BIS_KERNEL_URL} BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git} # Build directories -BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}} +WORKDIR=$(pwd) +BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}} BUILDDIR="${BASEDIR}/build" # Prepare date string for default image file name