From 9617722f9c80918c9709f29e5576775f6180ea64 Mon Sep 17 00:00:00 2001
From: Robert Drab <robert.drab@huawei.com>
Date: Mon, 8 Mar 2021 10:06:40 +0100
Subject: [PATCH] ohos-xts-acts: Build jffs2 test image
jffs2.img will be used to mount /storage directory required by ActsJFFS2Test
test suite using loopback device.
Related-To: https://git.ostc-eu.org/OSTC/OHOS/components/staging/xts_acts/-/issues/5
Signed-off-by: Robert Drab <robert.drab@huawei.com>
---
.../ohos-xts-acts/ohos-xts-acts_git.bb | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
index 6a2795d5..beebd576 100644
--- a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
+++ b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
@@ -13,4 +13,20 @@ FILES_SOLIBSDEV = ""
inherit zmk
-DEPENDS += "ohos-googletest ohos-libsec"
+# jffs2 image size defaults to 1MB
+ACTS_JFFS2_IMG_SIZE ?= "0x100000"
+
+do_install_append() {
+ # Prepare jffs2 image to be mounted on the target
+ # mkfs.jffs2 requires a directory to make an image out of
+ mkdir -p ${B}/.jffs-empty-dir
+ mkfs.jffs2 --root=${B}/.jffs-empty-dir --pad=${ACTS_JFFS2_IMG_SIZE} -o ${B}/jffs2.img
+ rm -rf ${B}/.jffs-empty-dir
+ install -d ${D}${datadir}/acts-data
+ install -m 644 ${B}/jffs2.img ${D}${datadir}/acts-data
+}
+
+FILES_${PN} += "${datadir}/acts-data/*"
+
+DEPENDS += "ohos-googletest ohos-libsec mtd-utils-native"
+RRECOMMENDS_${PN} += "kernel-module-block2mtd"
--
GitLab