diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cross.bbclass | 5 | ||||
| -rw-r--r-- | classes/distutils-base.bbclass | 26 | ||||
| -rw-r--r-- | classes/distutils-common-base.bbclass | 27 | ||||
| -rw-r--r-- | classes/distutils-native-base.bbclass | 3 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake2.bbclass | 4 | ||||
| -rw-r--r-- | classes/qt4e.bbclass | 3 |
7 files changed, 36 insertions, 34 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 72a0fb7851..7debde6669 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -2,11 +2,6 @@ # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" -# In order to keep TARGET_PREFIX decoupled from TARGET_SYS, let's force the -# binary names to match the former, rather than relying on autoconf's implicit -# prefixing based on the latter. -EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - # Save PACKAGE_ARCH before changing HOST_ARCH OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}" diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index a08414aadf..2e151ded38 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -1,29 +1,5 @@ -EXTRA_OEMAKE = "" DEPENDS += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" RDEPENDS += "python-core" -export STAGING_INCDIR -export STAGING_LIBDIR +inherit distutils-common-base -def python_dir(d): - import os, bb - staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - for majmin in "2.6 2.5 2.4 2.3".split(): - if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" - -PYTHON_DIR = "${@python_dir(d)}" - -PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" - -FILES_${PN}-dev += "\ - ${libdir}/pkgconfig \ - ${libdir}/${PYTHON_DIR}/site-packages/*.la \ -" -FILES_${PN}-dbg = "\ - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \ -" diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass new file mode 100644 index 0000000000..068eac4de8 --- /dev/null +++ b/classes/distutils-common-base.bbclass @@ -0,0 +1,27 @@ +EXTRA_OEMAKE = "" + +export STAGING_INCDIR +export STAGING_LIBDIR + +def python_dir(d): + import os, bb + staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) + for majmin in "2.6 2.5 2.4 2.3".split(): + if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + +PYTHON_DIR = "${@python_dir(d)}" + +PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" + +FILES_${PN}-dev += "\ + ${libdir}/pkgconfig \ + ${libdir}/${PYTHON_DIR}/site-packages/*.la \ +" +FILES_${PN}-dbg = "\ + ${libdir}/${PYTHON_DIR}/site-packages/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \ +" diff --git a/classes/distutils-native-base.bbclass b/classes/distutils-native-base.bbclass new file mode 100644 index 0000000000..2703fe0740 --- /dev/null +++ b/classes/distutils-native-base.bbclass @@ -0,0 +1,3 @@ +DEPENDS += "${@["python-native", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" + +inherit distutils-common-base 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/ diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 8a443d062a..5ea31a976d 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -3,9 +3,9 @@ # inherit qmake_base -DEPENDS_prepend = "qmake2-native uicmoc4-native " +DEPENDS_prepend = "qt4-tools-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..445ecbaa6a 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -1,9 +1,10 @@ -DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-embedded')]}" +DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}" 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" |