##// END OF EJS Templates
Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix
burnbabyburn -
r410:ed900e11fb41 Fusion
parent child
Show More
@@ -80,7 +80,7 if [ "$BUILD_KERNEL" = true ] ; then
80 -e "s/\(^CONFIG_TOUCHSCREEN.*\=\).*/\1n/"\
80 -e "s/\(^CONFIG_TOUCHSCREEN.*\=\).*/\1n/"\
81 -e "s/\(^CONFIG_USB_GSPCA_.*\=\).*/\1n/"\
81 -e "s/\(^CONFIG_USB_GSPCA_.*\=\).*/\1n/"\
82 -e "s/\(^CONFIG_DRM.*\=\).*/\1n/"\
82 -e "s/\(^CONFIG_DRM.*\=\).*/\1n/"\
83 "${KERNEL_DIR}"/.config
83 "${KERNEL_DIR}/.config"
84 fi
84 fi
85
85
86 if [ "$KERNELSRC_CONFIG" = true ] ; then
86 if [ "$KERNELSRC_CONFIG" = true ] ; then
@@ -214,7 +214,7 if [ "$BUILD_KERNEL" = true ] ; then
214 fi
214 fi
215
215
216 #Revert to previous directory
216 #Revert to previous directory
217 cd "${R}"
217 cd "${WORKDIR}"
218
218
219 # Set kernel configuration parameters to enable qemu emulation
219 # Set kernel configuration parameters to enable qemu emulation
220 if [ "$ENABLE_QEMU" = true ] ; then
220 if [ "$ENABLE_QEMU" = true ] ; then
@@ -65,7 +65,8 RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_BIS_KERNEL_URL}
65 BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
65 BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
66
66
67 # Build directories
67 # Build directories
68 BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
68 WORKDIR=$(pwd)
69 BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}}
69 BUILDDIR="${BASEDIR}/build"
70 BUILDDIR="${BASEDIR}/build"
70
71
71 # Prepare date string for default image file name
72 # Prepare date string for default image file name
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant