1 files changed, 18 insertions, 0 deletions

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 34cc297909..69a9d02a5a 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -312,6 +312,14 @@ buildhistory_get_imageinfo() {
         # This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
         ( cd ${IMAGE_ROOTFS} && find . -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt )
 
+        # Record some machine-readable meta-information about the image
+        echo -n > ${BUILDHISTORY_DIR_IMAGE}/image-info.txt
+        cat >> ${BUILDHISTORY_DIR_IMAGE}/image-info.txt <<END
+${@buildhistory_get_imagevars(d)}
+END
+        imagesize=`du -ks ${IMAGE_ROOTFS} | awk '{ print $1 }'`
+        echo "IMAGESIZE = $imagesize" >> ${BUILDHISTORY_DIR_IMAGE}/image-info.txt
+
         # Add some configuration information
         echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id
 
@@ -330,6 +338,16 @@ def buildhistory_get_layers(d):
         return layertext
 
 
+def buildhistory_get_imagevars(d):
+        imagevars = "DISTRO DISTRO_VERSION USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS ROOTFS_POSTPROCESS_COMMAND IMAGE_POSTPROCESS_COMMAND"
+
+        ret = ""
+        for var in imagevars.split():
+                value = d.getVar(var, True) or ""
+                ret += "%s = %s\n" % (var, value)
+        return ret.rstrip('\n')
+
+
 buildhistory_commit() {
         if [ ! -d ${BUILDHISTORY_DIR} ] ; then
                 # Code above that creates this dir never executed, so there can't be anything to commit