summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/image.bbclass6
-rw-r--r--conf/bitbake.conf1
2 files changed, 6 insertions, 1 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 69d7fb2e9b..83aa80a97e 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -4,7 +4,7 @@ PACKAGES = ""
# We need to recursively follow RDEPENDS and RRECOMMENDS for images
BUILD_ALL_DEPS = "1"
-do_rootfs[recrdeptask] = "do_package_write do_deploy"
+do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging"
# Images are generally built explicitly, do not need to be part of world.
EXCLUDE_FROM_WORLD = "1"
@@ -91,6 +91,10 @@ fakeroot do_rootfs () {
else
bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}"
fi
+
+ cd ${DEPLOY_DIR_IMAGE}/
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*
+ ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
done
${IMAGE_POSTPROCESS_COMMAND}
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0294eb981e..c3cdde8d3b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -185,6 +185,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
IMAGE_BASENAME = "rootfs"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
IMAGE_CMD = ""
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime \
--output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \