| @@ -69,14 +69,6 WORKDIR=$(pwd) | |||||
| 69 | BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}} |
|
69 | BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}} | |
| 70 | BUILDDIR="${BASEDIR}/build" |
|
70 | BUILDDIR="${BASEDIR}/build" | |
| 71 |
|
71 | |||
| 72 | # Prepare date string for default image file name |
|
|||
| 73 | DATE="$(date +%Y-%m-%d)" |
|
|||
| 74 | if [ -z "$KERNEL_BRANCH" ] ; then |
|
|||
| 75 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} |
|
|||
| 76 | else |
|
|||
| 77 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} |
|
|||
| 78 | fi |
|
|||
| 79 |
|
||||
| 80 | # Chroot directories |
|
72 | # Chroot directories | |
| 81 | R="${BUILDDIR}/chroot" |
|
73 | R="${BUILDDIR}/chroot" | |
| 82 | ETC_DIR="${R}/etc" |
|
74 | ETC_DIR="${R}/etc" | |
| @@ -244,10 +236,7 APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut - | |||||
| 244 |
|
236 | |||
| 245 | #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go! |
|
237 | #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go! | |
| 246 | if [ -n "$SET_ARCH" ] ; then |
|
238 | if [ -n "$SET_ARCH" ] ; then | |
| 247 | echo "Setting Architecture specific settings" |
|
239 | # 64 bit configuration | |
| 248 | ################################## |
|
|||
| 249 | # 64 bit config |
|
|||
| 250 | ################################## |
|
|||
| 251 | if [ "$SET_ARCH" = 64 ] ; then |
|
240 | if [ "$SET_ARCH" = 64 ] ; then | |
| 252 | # General 64 bit depended settings |
|
241 | # General 64 bit depended settings | |
| 253 | QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static} |
|
242 | QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static} | |
| @@ -329,8 +318,13 fi | |||||
| 329 | ;; |
|
318 | ;; | |
| 330 | esac |
|
319 | esac | |
| 331 |
|
320 | |||
| 332 | #DEBUG off |
|
321 | # Prepare date string for default image file name | |
| 333 | set +x |
|
322 | DATE="$(date +%Y-%m-%d)" | |
|
|
323 | if [ -z "$KERNEL_BRANCH" ] ; then | |||
|
|
324 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |||
|
|
325 | else | |||
|
|
326 | IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}} | |||
|
|
327 | fi | |||
| 334 |
|
328 | |||
| 335 | # Check if the internal wireless interface is supported by the RPi model |
|
329 | # Check if the internal wireless interface is supported by the RPi model | |
| 336 | if [ "$ENABLE_WIRELESS" = true ] ; then |
|
330 | if [ "$ENABLE_WIRELESS" = true ] ; then | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
