diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-16 15:20:29 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-16 15:20:29 +0000 |
| commit | 9adf4d6e5b78345e26f9cd56a7cc707e8222e251 (patch) | |
| tree | 7b19f353890e830e168f63e024cf57bdc6b6fee0 /packages | |
| parent | 64fc5a98886b44916d57091506c0ae3115a055f1 (diff) | |
| parent | 10dcd1969e8132ab4c1a10d58695d54f1b83fb1f (diff) | |
merge of '8f416f1cd7eff65f0a75eb6db80cd5f7291ad959'
and '951d47515dbbef9738cdf3e9159a0e58597f3608'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 21 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-common2_svn.bb | 10 |
2 files changed, 16 insertions, 15 deletions
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index a734005819..261e9eac26 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -108,15 +108,18 @@ do_populate_sdk() { rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} + if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then + cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig + for f in *.pc ; do + sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" + done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" + done + fi + + # package it up + mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 . } diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb index 0cf7f763cb..018f9a8e74 100644 --- a/packages/openmoko2/openmoko-common2_svn.bb +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -1,21 +1,19 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r5" inherit openmoko2 SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" S = "${WORKDIR}" +ALLOW_EMPTY = "1" + dirs = "pixmaps" do_install() { - find ${WORKDIR} -name ".svn" | xargs rm -rf - install -d ${D}${datadir} - for i in ${dirs}; do - cp -fpPR ${S}/$i ${D}${datadir} - done + : } PACKAGE_ARCH = "all" |