diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-06 19:31:33 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-06 19:31:33 +0000 |
| commit | 71cd75a213bb84bce4e549ee8e706f59d25df0a6 (patch) | |
| tree | e8926624ca7df691e64135dbcfc988dbcf70e6c8 /classes | |
| parent | d176cd1e6ca20969457b05be43fdaf885e08df02 (diff) | |
| parent | 536be8a5c6846d5ff1fc4eb43bff0c04928deb57 (diff) | |
merge of 'd486b07ff3f411bc579cba692283881327e49742'
and 'd80fca2b777ef3a788e49ac766b51ac24e27b4fa'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/binconfig.bbclass | 2 | ||||
| -rw-r--r-- | classes/image.bbclass | 3 | ||||
| -rw-r--r-- | classes/openmoko2.bbclass | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index dadf2dddfc..497b78f454 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -18,6 +18,8 @@ def get_binconfig_mangle(d): s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" + s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" return s BINCONFIG_GLOB ?= "*-config" diff --git a/classes/image.bbclass b/classes/image.bbclass index 101b53307a..248ccab60b 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -58,6 +58,7 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb" LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" ROOTFS_POSTPROCESS_COMMAND ?= "" +MACHINE_POSTPROCESS_COMMAND ?= "" do_rootfs[nostamp] = "1" do_rootfs[dirs] = "${TOPDIR}" @@ -100,6 +101,8 @@ fakeroot do_rootfs () { done ${IMAGE_POSTPROCESS_COMMAND} + + ${MACHINE_POSTPROCESS_COMMAND} } insert_feed_uris () { diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 5948cb3451..17b3bbafa6 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -30,5 +30,4 @@ FILES_${PN} += "${datadir}/icons" # SVNREV = "r${SRCREV}" SVNREV = "${SRCDATE}" -SRCDATE = "tomorrow" |
