aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-03-07 17:19:42 -0500
committerTom Rini <trini@konsulko.com>2018-03-08 07:44:54 -0500
commitc3ee35ba9daf8c0f43f787a63cfb10925612842d (patch)
treeecf018083c9a35ece49a84d7ab1f4fd5618e7c8c
parentaad0373e5a247fa99bedd0a982d028da36c1e760 (diff)
dra7xx-evm, beaglebone: Switch to sdimage-bootpart-uuid for wic
Introduce a new wks file, sdimage-bootpart-uuid.wks that differs from sdimage-bootpart.wks in that it uses --use-uuid rather than --ondisk as PARTUUID is more portable and we do not use busybox mount in our images. Bug-AGL: SPEC-1336 Change-Id: Ib98d1e49406f8b8ac13c3947f4efbc4360cf9865 Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--meta-agl-bsp/conf/include/agl_beaglebone.inc1
-rw-r--r--meta-agl-bsp/conf/include/agl_dra7xx-evm.inc2
-rw-r--r--meta-agl-bsp/wic/sdimage-bootpart-uuid.wks6
3 files changed, 8 insertions, 1 deletions
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index 69e883572..988b3d530 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -40,5 +40,6 @@ SECURITY_LDFLAGS_pn-gpm = ""
SECURITY_CFLAGS_pn-libatasmart = ""
SECURITY_LDFLAGS_pn-libatasmart = ""
+WKS_FILE = "sdimage-bootpart-uuid.wks"
AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index 02ddb6c9d..876d6e9a6 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -52,7 +52,7 @@ IMAGE_INSTALL_append = " \
# Include WIC support based on beaglebone
do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE = "sdimage-bootpart-uuid.wks"
IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt"
AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks b/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks
new file mode 100644
index 000000000..1f51a0bd4
--- /dev/null
+++ b/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image with a boot partition
+# long-description: Creates a partitioned SD card image. Boot files
+# are located in the first vfat partition.
+
+part /boot --source bootimg-partition --fstype=vfat --label boot --use-uuid --active --align 4 --size 16
+part / --source rootfs --fstype=ext4 --label root --align 4 --use-uuid