| @@ -62,6 +62,7 if [ "$ENABLE_CRYPTFS" = true ] ; then | |||||
| 62 | CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/") |
|
62 | CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/") | |
| 63 | else |
|
63 | else | |
| 64 | CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/") |
|
64 | CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/") | |
|
|
65 | fi | |||
| 65 | fi |
|
66 | fi | |
| 66 | fi |
|
67 | fi | |
| 67 |
|
68 | |||
| @@ -52,8 +52,6 if [ "$ENABLE_UBOOT" = true ] ; then | |||||
| 52 |
|
52 | |||
| 53 | # Configure U-Boot to load generated initramfs |
|
53 | # Configure U-Boot to load generated initramfs | |
| 54 | printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage" |
|
54 | printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage" | |
| 55 |
|
||||
| 56 | fi |
|
|||
| 57 | else # ENABLE_INITRAMFS=false |
|
55 | else # ENABLE_INITRAMFS=false | |
| 58 | # Remove initramfs from U-Boot mkfile |
|
56 | # Remove initramfs from U-Boot mkfile | |
| 59 | sed -i '/.*initramfs.*/d' "${BOOT_DIR}/uboot.mkimage" |
|
57 | sed -i '/.*initramfs.*/d' "${BOOT_DIR}/uboot.mkimage" | |
| @@ -101,4 +99,3 if [ "$ENABLE_UBOOT" = true ] ; then | |||||
| 101 | # Remove U-Boot sources |
|
99 | # Remove U-Boot sources | |
| 102 | rm -fr "${R}/tmp/u-boot" |
|
100 | rm -fr "${R}/tmp/u-boot" | |
| 103 | fi |
|
101 | fi | |
| 104 |
|
||||
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
