diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-06-17 05:37:26 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-06-17 05:37:26 +0000 |
| commit | 4171ca7ea616dffcad66ef7968e8adb4f5a577b9 (patch) | |
| tree | 8af4acb7f1de7aeb5cab546437bf2f27f5c76b49 /classes | |
| parent | f4cca286a441f6b3ee710d7e40ec8d95d01b5449 (diff) | |
| parent | 43685cdd4112bd3038436a6f4059d9eda54ee0c9 (diff) | |
merge of '2b1cc78c259b50ef47b34d85e4f6717f64d1d093'
and 'ed459a8f7a87918dd43a1513e367c3dd386e56be'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/e.bbclass | 7 | ||||
| -rw-r--r-- | classes/efl.bbclass | 3 | ||||
| -rw-r--r-- | classes/sdk.bbclass | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index 59f2771027..9bac65fd9c 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -27,7 +27,8 @@ export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" # find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' #} -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev" -FILES_${PN} = "${libdir}/lib*.so*" +PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev" +FILES_${PN} += "${libdir}/lib*.so.*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" -FILES_${PN}-dev += "${includedir}"
\ No newline at end of file +FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so" + diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 9b0345a5b8..808bf2eaae 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -48,6 +48,5 @@ do_stage_append () { } PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples" -FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}" +FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" FILES_${PN}-examples = "${bindir} ${datadir}" - diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index 834081fccc..38df66eb4d 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -2,8 +2,10 @@ # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" -SDK_NAME = "${TARGET_ARCH}/oe" -PACKAGE_ARCH = "${BUILD_ARCH}" +SDK_NAME = "${DISTRO}/${TARGET_ARCH}" + +OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} +PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" HOST_ARCH = "${BUILD_ARCH}" HOST_VENDOR = "${BUILD_VENDOR}" @@ -20,11 +22,7 @@ prefix = "/usr/local/${SDK_NAME}" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" -PACKAGES =+ "${PN}-dbg" - FILES_${PN} = "${prefix}" FILES_${PN}-dbg += "${prefix}/bin/.debug \ ${prefix}/sbin/.debug \ " - - |