diff options
| -rw-r--r-- | meta-agl-bsp/classes/sdcard_image-socfpga.bbclass | 5 | ||||
| -rwxr-xr-x | scripts/mkefi-agl.sh | 4 | ||||
| -rw-r--r-- | templates/feature/agl-ci-snapshot-features-nogfx/included.dep | 2 | ||||
| -rw-r--r-- | templates/feature/agl-ci-snapshot-features/included.dep | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass b/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass index e1f7b1846..2967063e0 100644 --- a/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass +++ b/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass @@ -41,14 +41,15 @@ SDIMG_ROOTFS_TYPE = "ext3" SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" -do_image_socfpga-sdimg[depends] += " \ +do_image_socfpga_sdimg[depends] += " \ + coreutils-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \ virtual/kernel:do_deploy \ virtual/bootloader:do_deploy \ " - + rootfs[depends] += "virtual/kernel:do_deploy" # SD card image name diff --git a/scripts/mkefi-agl.sh b/scripts/mkefi-agl.sh index f2480e2e3..14ade366e 100755 --- a/scripts/mkefi-agl.sh +++ b/scripts/mkefi-agl.sh @@ -307,14 +307,14 @@ ROOTFS_END=$((ROOTFS_START+ROOTFS_SIZE)) # MMC devices use a partition prefix character 'p' PART_PREFIX="" -if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then +if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/nvme0n}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then PART_PREFIX="p" fi BOOTFS=$DEVICE${PART_PREFIX}1 ROOTFS=$DEVICE${PART_PREFIX}2 TARGET_PART_PREFIX="" -if [ ! "${TARGET_DEVICE#/dev/mmcblk}" = "${TARGET_DEVICE}" ]; then +if [ ! "${TARGET_DEVICE#/dev/mmcblk}" = "${TARGET_DEVICE}" ] || [ ! "${TARGET_DEVICE#/dev/nvme0n}" = "${TARGET_DEVICE}" ]; then TARGET_PART_PREFIX="p" fi TARGET_ROOTFS=$TARGET_DEVICE${TARGET_PART_PREFIX}2 diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep index da2a00c09..00e77831a 100644 --- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep +++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-appfw-smack agl-archiver agl-ptest +agl-devel agl-netboot agl-appfw-smack agl-archiver diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep index ab80c2b06..219beeec4 100644 --- a/templates/feature/agl-ci-snapshot-features/included.dep +++ b/templates/feature/agl-ci-snapshot-features/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver agl-ptest +agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver |