| @@ -311,10 +311,6 if [ -n "$SET_ARCH" ] ; then | |||||
| 311 |
|
311 | |||
| 312 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf" |
|
312 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf" | |
| 313 | RELEASE_ARCH=${RELEASE_ARCH:=armhf} |
|
313 | RELEASE_ARCH=${RELEASE_ARCH:=armhf} | |
| 314 | <<<<<<< HEAD |
|
|||
| 315 | KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img} |
|
|||
| 316 | ======= |
|
|||
| 317 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
| 318 |
|
314 | |||
| 319 | CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-} |
|
315 | CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-} | |
| 320 | fi |
|
316 | fi | |
| @@ -405,11 +401,8 fi | |||||
| 405 |
|
401 | |||
| 406 | # Add deps for nexmon |
|
402 | # Add deps for nexmon | |
| 407 | if [ "$ENABLE_NEXMON" = true ] ; then |
|
403 | if [ "$ENABLE_NEXMON" = true ] ; then | |
| 408 | <<<<<<< HEAD |
|
404 | ||
| 409 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf bison flex make autoconf automake build-essential libtool" |
|
405 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf bison flex make autoconf automake build-essential libtool" | |
| 410 | ======= |
|
|||
| 411 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
| 412 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf make autoconf automake build-essential libtool" |
|
|||
| 413 | fi |
|
406 | fi | |
| 414 |
|
407 | |||
| 415 | # Add libncurses5 to enable kernel menuconfig |
|
408 | # Add libncurses5 to enable kernel menuconfig | |
| @@ -425,10 +418,7 fi | |||||
| 425 | # Add cryptsetup package to enable filesystem encryption |
|
418 | # Add cryptsetup package to enable filesystem encryption | |
| 426 | if [ "$ENABLE_CRYPTFS" = true ] && [ "$BUILD_KERNEL" = true ] ; then |
|
419 | if [ "$ENABLE_CRYPTFS" = true ] && [ "$BUILD_KERNEL" = true ] ; then | |
| 427 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup" |
|
420 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup" | |
| 428 | <<<<<<< HEAD |
|
421 | ||
| 429 | APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup" |
|
|||
| 430 | ======= |
|
|||
| 431 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
| 432 | APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs" |
|
422 | APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs" | |
| 433 |
|
423 | |||
| 434 | # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package |
|
424 | # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package | |
| @@ -498,10 +488,6 if [ -n "$MISSING_PACKAGES" ] ; then | |||||
| 498 | [ "$confirm" != "y" ] && exit 1 |
|
488 | [ "$confirm" != "y" ] && exit 1 | |
| 499 |
|
489 | |||
| 500 | # Make sure all missing required packages are installed |
|
490 | # Make sure all missing required packages are installed | |
| 501 | <<<<<<< HEAD |
|
|||
| 502 | apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"` |
|
|||
| 503 | ======= |
|
|||
| 504 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
| 505 | apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"` |
|
491 | apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"` | |
| 506 | fi |
|
492 | fi | |
| 507 |
|
493 | |||
| @@ -854,10 +840,7 if [ "$ENABLE_CRYPTFS" = true ] ; then | |||||
| 854 | echo -n ${CRYPTFS_PASSWORD} > .password |
|
840 | echo -n ${CRYPTFS_PASSWORD} > .password | |
| 855 |
|
841 | |||
| 856 | # Initialize encrypted partition |
|
842 | # Initialize encrypted partition | |
| 857 | <<<<<<< HEAD |
|
843 | ||
| 858 | echo "YES" | cryptsetup luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -s "${CRYPTFS_XTSKEYSIZE}" .password |
|
|||
| 859 | ======= |
|
|||
| 860 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
| 861 | cryptsetup --verbose --debug -q luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -h "${CRYPTFS_HASH}" -s "${CRYPTFS_XTSKEYSIZE}" .password |
|
844 | cryptsetup --verbose --debug -q luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -h "${CRYPTFS_HASH}" -s "${CRYPTFS_XTSKEYSIZE}" .password | |
| 862 |
|
845 | |||
| 863 | # Open encrypted partition and setup mapping |
|
846 | # Open encrypted partition and setup mapping | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
