| @@ -62,14 +62,6 BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git} | |||
|
|
62 | 62 | BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}} |
|
|
63 | 63 | BUILDDIR="${BASEDIR}/build" |
|
|
64 | 64 | |
|
|
65 | # Prepare date string for default image file name | |
|
|
66 | DATE="$(date +%Y-%m-%d)" | |
|
|
67 | if [ -z "$KERNEL_BRANCH" ] ; then | |
|
|
68 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |
|
|
69 | else | |
|
|
70 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |
|
|
71 | fi | |
|
|
72 | ||
|
|
73 | 65 | # Chroot directories |
|
|
74 | 66 | R="${BUILDDIR}/chroot" |
|
|
75 | 67 | ETC_DIR="${R}/etc" |
| @@ -210,7 +202,6 set +x | |||
|
|
210 | 202 | |
|
|
211 | 203 | # Setup architecture specific settings |
|
|
212 | 204 | if [ -n "$SET_ARCH" ] ; then |
|
|
213 | ||
|
|
214 | 205 | # 64 bit configuration |
|
|
215 | 206 | if [ "$SET_ARCH" = 64 ] ; then |
|
|
216 | 207 | # General 64 bit depended settings |
| @@ -292,7 +283,14 fi | |||
|
|
292 | 283 | exit 1 |
|
|
293 | 284 | ;; |
|
|
294 | 285 | esac |
|
|
295 | echo "$DTB_FILE selected" | |
|
|
286 | ||
|
|
287 | # Prepare date string for default image file name | |
|
|
288 | DATE="$(date +%Y-%m-%d)" | |
|
|
289 | if [ -z "$KERNEL_BRANCH" ] ; then | |
|
|
290 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |
|
|
291 | else | |
|
|
292 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |
|
|
293 | fi | |
|
|
296 | 294 | |
|
|
297 | 295 | # Check if the internal wireless interface is supported by the RPi model |
|
|
298 | 296 | if [ "$ENABLE_WIRELESS" = true ] ; then |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
