diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-28 10:47:03 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-28 10:47:03 +0200 |
| commit | ae406036fed38040f406d4408c6bbb77cb25f831 (patch) | |
| tree | da0919a90c80a23f458868fa7b52877660336a93 /classes | |
| parent | 05f0d6768a22488d8ad89c3cee63b8b994e0f75f (diff) | |
| parent | de576627a2b56ce347f7b58d0a784b9bd045b66a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/e.bbclass | 4 | ||||
| -rw-r--r-- | classes/efl.bbclass | 3 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index a56cdff2e1..a6fa1d0d78 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -21,7 +21,9 @@ do_configure_append() { export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" -PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib" +# This construction is stupid, someone with more E knowledge should change it to =+ or something +# And it's in efl.bbclass as well.... +PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib" FILES_${PN}-lib = "${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} ${libdir}/lib*.so" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 9d24a0f337..22e664ce01 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -23,7 +23,8 @@ do_stage() { autotools_stage_all } -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests" +# This construction is stupid, someone with more E knowledge should change it to =+ or something +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests" FILES_${PN} = "${libdir}/*.so.*" diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c5192d59d4..9c1f637a66 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -530,7 +530,7 @@ do_deploy() { package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin if [ -d "${D}/lib" ]; then - tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib + fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib fi cd ${DEPLOY_DIR_IMAGE} @@ -540,5 +540,6 @@ do_deploy() { } do_deploy[dirs] = "${S}" +do_deploy[depends] += "fakeroot-native:do_populate_staging" addtask deploy before do_package after do_install |