diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-18 06:08:29 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-18 06:08:29 +0000 |
| commit | beaa7c6e54b18ec0c5a8f17a729b9675c9a65cb6 (patch) | |
| tree | 2c24127f4e4aebf9301b35d02bc728abf20578ba | |
| parent | 5a9545e6268740bb50937a724df7bbe6902aa779 (diff) | |
* 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
| -rw-r--r-- | classes/image_ipk.oeclass | 5 | ||||
| -rw-r--r-- | classes/rootfs_ipk.oeclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass index a377ecf02c..6d6a2b22e2 100644 --- 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 e67f9fdd71..96f060449b 100644 --- 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 () { |