diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index bc60f0d6c0..8217fb3254 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -179,6 +179,9 @@ ROOTFS_POSTPROCESS_COMMAND_prepend = "run_intercept_scriptlets; " | |||
179 | ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}' | 179 | ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}' |
180 | # Enable postinst logging if debug-tweaks is enabled | 180 | # Enable postinst logging if debug-tweaks is enabled |
181 | ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' | 181 | ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' |
182 | # Write manifest | ||
183 | IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" | ||
184 | ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; " | ||
182 | # Set default postinst log file | 185 | # Set default postinst log file |
183 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" | 186 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" |
184 | 187 | ||
@@ -381,6 +384,11 @@ fakeroot do_rootfs () { | |||
381 | ${IMAGE_POSTPROCESS_COMMAND} | 384 | ${IMAGE_POSTPROCESS_COMMAND} |
382 | 385 | ||
383 | ${MACHINE_POSTPROCESS_COMMAND} | 386 | ${MACHINE_POSTPROCESS_COMMAND} |
387 | |||
388 | if [ -n "${IMAGE_LINK_NAME}" -a -f "${IMAGE_MANIFEST}" ]; then | ||
389 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | ||
390 | ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | ||
391 | fi | ||
384 | } | 392 | } |
385 | 393 | ||
386 | insert_feed_uris () { | 394 | insert_feed_uris () { |
@@ -602,12 +610,7 @@ make_zimage_symlink_relative () { | |||
602 | } | 610 | } |
603 | 611 | ||
604 | write_image_manifest () { | 612 | write_image_manifest () { |
605 | rootfs_${IMAGE_PKGTYPE}_write_manifest | 613 | list_installed_packages ver | sort > ${IMAGE_MANIFEST} |
606 | |||
607 | if [ -n "${IMAGE_LINK_NAME}" ]; then | ||
608 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | ||
609 | ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | ||
610 | fi | ||
611 | } | 614 | } |
612 | 615 | ||
613 | # Make login manager(s) enable automatic login. | 616 | # Make login manager(s) enable automatic login. |