* Move IMAGE_POSTPROCESS_COMMAND to truly be what its name implies -- it now

  occurs after oeimage is called.
* Add ROOTFS_POSTPROCESS_COMMAND, which occurs after rootfs population but
  before oeimage.
* Pass -n option to oeimage, this ensures that the IMAGE_NAME variable used in
  our metadata expansion in oemake is the same as that used by oeimage (it
  parses its own metadata, and would become desynced if IMAGE_NAME
  contained ${DATETIME} or similar).  Note that this is a new option; ensure
  that your 'oe' trees are up to date.

BKrev: 414bd0ddJb2EgJAkAD_JloxA0CdB1w

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index a377ecf..6d6a2b2 100644 (file)
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -16,6 +16,7 @@ def get_image_deps(d):
 DEPENDS += "${@get_image_deps(d)}"
 
 IMAGE_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-minimal.txt')}"
+IMAGE_POSTPROCESS_COMMAND ?= ""
 
 # Must call real_do_rootfs() from inside here, rather than as a separate
 # task, so that we have a single fakeroot context for the whole process.
@@ -36,7 +37,9 @@ fakeroot do_rootfs () {
                if test -z "$FAKEROOTKEY"; then
                        fakeroot -i ${TMPDIR}/fakedb.image oeimage -t $type -e ${FILE}
                else
-                       oeimage -t $type -e ${FILE}
+                       oeimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}"
                fi
        done
+
+       ${IMAGE_POSTPROCESS_COMMAND}
 }

diff --git a/classes/rootfs_ipk.oeclass b/classes/rootfs_ipk.oeclass
index e67f9fd..96f0604 100644 (file)
--- a/classes/rootfs_ipk.oeclass
+++ b/classes/rootfs_ipk.oeclass
@@ -15,7 +15,7 @@ do_rootfs[dirs] = ${TOPDIR}
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
 
-IMAGE_POSTPROCESS_COMMAND ?= ""
+ROOTFS_POSTPROCESS_COMMAND ?= ""
 
 # some default locales
 IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -71,7 +71,7 @@ EOF
        install -d ${IMAGE_ROOTFS}/${sysconfdir}
        echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
-       ${IMAGE_POSTPROCESS_COMMAND}
+       ${ROOTFS_POSTPROCESS_COMMAND}
 }
 
 fakeroot do_rootfs () {