summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2020-02-18 02:28:55 +0100
committerEnrico Jorns <ejo@pengutronix.de>2020-03-27 08:53:16 +0100
commit0f3ef65c3df0c1c563f6f0883f1164ff9fc740bb (patch)
treeb33a131e85193ad3171168f882bf49193c5b97b1
parent5c2ac52dfd83ebdced4640741a2a6d9692b9858e (diff)
downloadmeta-ptx-0f3ef65c3df0c1c563f6f0883f1164ff9fc740bb.tar.gz
meta-ptx-0f3ef65c3df0c1c563f6f0883f1164ff9fc740bb.tar.xz
classes: genimage: copy genimage config in do_configure task
This eases / allows users of this class to step between the generation and the actual usage of the genimage config file to apply custom modifications, replacements, etc. Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
-rw-r--r--classes/genimage.bbclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/classes/genimage.bbclass b/classes/genimage.bbclass
index a17aa84..3d80415 100644
--- a/classes/genimage.bbclass
+++ b/classes/genimage.bbclass
@@ -91,6 +91,10 @@ GENIMAGE_ROOTDIR = "${WORKDIR}/root"
do_genimage[cleandirs] = "${GENIMAGE_TMPDIR} ${GENIMAGE_ROOTDIR}"
do_genimage[dirs] = "${B}"
+do_configure () {
+ cp ${WORKDIR}/genimage.config ${B}/.config
+}
+
fakeroot do_genimage () {
# unpack input rootfs image if given
@@ -99,7 +103,7 @@ fakeroot do_genimage () {
tar -xf ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} -C ${GENIMAGE_ROOTDIR}
fi
- sed s:@IMAGE@:${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX}:g ${WORKDIR}/genimage.config > ${B}/.config.tmp
+ sed s:@IMAGE@:${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX}:g ${B}/.config > ${B}/.config.tmp
genimage \
--loglevel 2 \
@@ -117,7 +121,6 @@ fakeroot do_genimage () {
}
do_patch[noexec] = "1"
-do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install[noexec] = "1"
deltask do_populate_sysroot