diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-08-16 19:04:41 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-08-20 00:25:48 +0100 |
| commit | 0c7a20f2e86277c7fe37ed35454914c539f3bc7d (patch) | |
| tree | 22b070e155297ca790ab992fa3b351ee89fca8d7 | |
| parent | 82cf86be7fd0218c56f181b080e4109c896875ea (diff) | |
| download | meta-opie-0c7a20f2e86277c7fe37ed35454914c539f3bc7d.tar.gz | |
libopie2: install include.pro into palmtopdir
Installing files into the sysroot during do_install is not a good idea -
in particular this breaks with OE-core's machine-specific sysroots.
Instead we now install it to ${D}${palmtopdir} and package it with the
other development files, and apply a sed hack to all .pro files within
opie.bbclass to ensure it gets found when building each package.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | classes/opie.bbclass | 5 | ||||
| -rw-r--r-- | recipes-opie/libopie/libopie2.inc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 10dd177..4c13daf 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -27,6 +27,11 @@ EXTRA_QMAKEVARS_POST += " DESTDIR=${S} " # Opie standard TAG value TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +do_configure_prepend() { + # Ensure we find include.pro in the right place + find -name "*.pro" -exec sed -i 's!$(OPIEDIR)/include.pro!/${STAGING_DIR_HOST}${palmtopdir}/include.pro!' {} \; +} + # plan for later: # add common scopes for opie applications, see qmake-native/common.pro # qmake should care about all the details then. qmake can do that, i know it :) diff --git a/recipes-opie/libopie/libopie2.inc b/recipes-opie/libopie/libopie2.inc index 0014ddf..923109e 100644 --- a/recipes-opie/libopie/libopie2.inc +++ b/recipes-opie/libopie/libopie2.inc @@ -69,7 +69,8 @@ do_install() { oe_libinstall -so libopie$f ${D}${libdir} done - install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/include.pro + install -d ${D}${palmtopdir} + install -m 0644 ${WORKDIR}/include.pro ${D}${palmtopdir}/include.pro install -d ${D}${includedir}/opie2/ for module in ${MODULES} @@ -93,6 +94,8 @@ do_install() { rm ${D}${includedir}/opie2/odevice_*.h } +FILES_${PN}-dev += "${palmtopdir}/include.pro" + PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 " DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library" |