From 6306b3fa6fc1769799eca2eb14eef27fad6878d6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Mar 2009 19:15:52 +0100 Subject: kernel.bbclass: stage more files --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 4c1dbda35c..17e8941745 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -114,7 +114,7 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - for entry in drivers/crypto include/media include/acpi include/sound include/video include/scsi; do + for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi; do if [ -d $entry ]; then mkdir -p ${STAGING_KERNEL_DIR}/$entry cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ -- cgit v1.2.3 From 6022c967ea47f26119de83af370cb066540bd0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Tue, 24 Mar 2009 20:11:19 +0100 Subject: {qt4e,qmake2}.bbclass: fix definition of QMAKESPEC --- classes/qmake2.bbclass | 2 +- classes/qt4e.bbclass | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 8a443d062a..9ced896fe8 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 8beef29df4..e3d6fad7a0 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -4,6 +4,7 @@ inherit qmake2 QT_DIR_NAME = "qtopia" # override variables set by qmake-base to compile Qt/Embedded apps # +export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" -- cgit v1.2.3