diff options
| author | Enrico Jorns <ejo@pengutronix.de> | 2020-02-09 14:15:34 +0100 |
|---|---|---|
| committer | Enrico Jorns <ejo@pengutronix.de> | 2020-03-27 08:53:16 +0100 |
| commit | dff9d579bb4e8fcb13c1b7f49cb7fed476b19778 (patch) | |
| tree | 219d5f2d95ccb15bd6d6b66110e2fe4bae8fa510 | |
| parent | 5f10ee929465f50cec57ebf051c5987628c57181 (diff) | |
| download | meta-ptx-dff9d579bb4e8fcb13c1b7f49cb7fed476b19778.tar.gz meta-ptx-dff9d579bb4e8fcb13c1b7f49cb7fed476b19778.tar.xz | |
classes: genimage: introduce ${GENIMAGE_ROOTDIR} variable
This replaces duplicated hard-coded paths and makes them more readable
and flexible to adapt.
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
| -rw-r--r-- | classes/genimage.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/classes/genimage.bbclass b/classes/genimage.bbclass index 4386806..38b5f54 100644 --- a/classes/genimage.bbclass +++ b/classes/genimage.bbclass @@ -86,6 +86,7 @@ GENIMAGE_ROOTFS_IMAGE_FSTYPE ?= "tar.bz2" do_genimage[depends] += "${@'${GENIMAGE_ROOTFS_IMAGE}:do_image_complete' if '${GENIMAGE_ROOTFS_IMAGE}' else ''}" GENIMAGE_TMPDIR = "${WORKDIR}/genimage-tmp" +GENIMAGE_ROOTDIR = "${WORKDIR}/root" fakeroot do_genimage () { cd ${WORKDIR} @@ -95,13 +96,13 @@ fakeroot do_genimage () { sed -i s:@IMAGE@:${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX}:g ${WORKDIR}/genimage.config - rm -rf ${WORKDIR}/root - mkdir -p ${WORKDIR}/root + rm -rf ${GENIMAGE_ROOTDIR} + mkdir -p ${GENIMAGE_ROOTDIR} # unpack input rootfs image if given if [ "x${GENIMAGE_ROOTFS_IMAGE}" != "x" ]; then - bbnote "Unpacking ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} to ${WORKDIR}/root" - tar -xf ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} -C ${WORKDIR}/root + bbnote "Unpacking ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} to ${GENIMAGE_ROOTDIR}" + tar -xf ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} -C ${GENIMAGE_ROOTDIR} fi genimage \ @@ -110,7 +111,7 @@ fakeroot do_genimage () { --tmppath ${GENIMAGE_TMPDIR} \ --inputpath ${DEPLOY_DIR_IMAGE} \ --outputpath ${DEPLOY_DIR_IMAGE} \ - --rootpath ${WORKDIR}/root + --rootpath ${GENIMAGE_ROOTDIR} if [ -e ${DEPLOY_DIR_IMAGE}/${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX} ]; then ln -sf ${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX} ${DEPLOY_DIR_IMAGE}/${GENIMAGE_IMAGE_LINK_NAME}.${GENIMAGE_IMAGE_SUFFIX} |