From 850ea31d59620b24ccb541743459ebc348f23498 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 23 Mar 2009 15:38:24 -0700 Subject: base.bbclass: Abort early if localpath() was unable to find a local file for the url. Signed-off-by: Chris Larson --- classes/base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index f39059ecc0..919d01d77b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -794,7 +794,9 @@ python base_do_unpack() { try: local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata) except bb.MalformedUrl, e: - raise FuncFailed('Unable to generate local path for malformed uri: %s' % e) + raise bb.build.FuncFailed('Unable to generate local path for malformed uri: %s' % e) + if not local: + raise bb.build.FuncFailed('Unable to locate local file for %s' % url) local = os.path.realpath(local) ret = oe_unpack_file(local, localdata, url) if not ret: -- cgit v1.2.3 From 6ddd16d877b167b929b5a64a2e01d2e6be161b15 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 23 Mar 2009 15:40:22 -0700 Subject: base.bbclass: rstrip the git branch/revision. Signed-off-by: Chris Larson --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 919d01d77b..9ec705bc1e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -870,7 +870,7 @@ def base_get_metadata_svn_revision(path, d): def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read() + branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read().rstrip() if len(branch) != 0: return branch.replace("refs/heads/", "") @@ -878,7 +878,7 @@ def base_get_metadata_git_branch(path, d): def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0] + rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0].rstrip() if len(rev) != 0: return rev return "" -- cgit v1.2.3 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 From 0faff8720150863ff38132f87ef65721fcb86dc1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 24 Mar 2009 14:01:30 -0700 Subject: distutils-base.bbclass: Move common functionality to distutils-common-base.bbclass Create a new class distutils-common-base.bbclass which holds the common parts that can be used in native and target packages which need to use distutils funtionality. rpm, libxml2, zope are currently using them and needed to use distutils-native-base for native recipes. rpm and libxml need to defer the processing of certain configure parameters which we evaluate using python. So we need to have python-native built before we can process them. Hence we can not use EXTRA_OECONF which is a python variable and gets expanded during parsing recipes and ofcourse we have not yet built python-native. We pass these extra options as a separate shell variable to do_configure which we evaluate when that task is executing. --- classes/distutils-base.bbclass | 26 +------------------------- classes/distutils-common-base.bbclass | 27 +++++++++++++++++++++++++++ classes/distutils-native-base.bbclass | 3 +++ 3 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 classes/distutils-common-base.bbclass create mode 100644 classes/distutils-native-base.bbclass (limited to 'classes') 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 -- cgit v1.2.3 From f01404828b4813a3db4b04f8062a345a218ab276 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 24 Mar 2009 18:25:54 -0700 Subject: Revert "cross.bbclass: set autoconf's program prefix to keep TARGET_SYS and TARGET_PREFIX decoupled" This reverts commit 114155243344c15847e73598e82d02926443cbf1. --- classes/cross.bbclass | 5 ----- 1 file changed, 5 deletions(-) (limited to 'classes') 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}" -- cgit v1.2.3 From 2fa972014da492233781741da3cb8880d6b8fa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 25 Mar 2009 12:05:40 +0100 Subject: qt4: make use of qt4-tools-native instead of qmake2-native and uicmoc4-native --- classes/qmake2.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 9ced896fe8..5ea31a976d 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -3,7 +3,7 @@ # inherit qmake_base -DEPENDS_prepend = "qmake2-native uicmoc4-native " +DEPENDS_prepend = "qt4-tools-native " export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" -- cgit v1.2.3 From 88c677023e77186ea9198d9ece6943712d069ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 25 Mar 2009 12:32:25 +0100 Subject: qt-embedded: rename to qt4-embedded for consistency --- classes/qt4e.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index e3d6fad7a0..445ecbaa6a 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -1,4 +1,4 @@ -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" -- cgit v1.2.3