From 743aaf30cc10e1490bbc126cfe96f94695dca32c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 16 Jun 2009 10:32:23 -0700 Subject: distutils-common-base.bbclass: only raise missing python-native error if python-native isn't in DEPENDS. Signed-off-by: Chris Larson Acked-by: Michael 'Mickey' Lauer --- classes/distutils-common-base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass index 9ca392b84a..01bf9eaeba 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -8,7 +8,9 @@ def python_dir(d): 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 ?" + if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split(): + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + return "INVALID" PYTHON_DIR = "${@python_dir(d)}" -- cgit v1.2.3 From d149d261d3a8b1bb192469b68f6389801fe82fff Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Fri, 3 Apr 2009 15:49:06 -0700 Subject: bitbake.conf: Add export for cross NM. When not providing a cross nm, the configure for libtool-cross falls back to the system nm. This can lead to empty "global_symbol_pipe" and "global_symbol_to_cdeclvarble" variables in the generated libtool script. Signed-off-by: Jeremy Puhlman Signed-off-by: Chris Larson Acked-by: Holger Hans Peter Freyther --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c4af34e8d7..c2f7666ef2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -405,6 +405,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +export NM = "${HOST_PREFIX}nm" PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" -- cgit v1.2.3 From 278cec5e0eba9ce1d18ac4eb0699ce3ee167168f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 28 Jul 2009 12:29:51 -0700 Subject: kernel.bbclass: Install & package symvers as /boot/Module.symvers-. Signed-off-by: Chris Larson Acked-by: Michael Smith --- classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d084cefee8..4cf5bed448 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -182,6 +182,7 @@ kernel_do_install() { install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}/etc/modutils if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then install -d ${D}/etc/modprobe.d @@ -232,7 +233,7 @@ EXPORT_FUNCTIONS do_compile do_install do_stage do_configure PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" -FILES_kernel-dev = "/boot/System.map* /boot/config*" +FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" FILES_kernel-vmlinux = "/boot/vmlinux*" RDEPENDS_kernel = "kernel-base" RRECOMMENDS_kernel-module-hostap-cs += '${@base_version_less_or_equal("KERNEL_VERSION", "2.6.17", "", "apm-wifi-suspendfix", d)}' -- cgit v1.2.3 From 34cd6c2a37c03d694ba98414e902b9250cd67b77 Mon Sep 17 00:00:00 2001 From: Dale Farnsworth Date: Tue, 21 Jul 2009 11:32:21 -0700 Subject: kernel.bbclass: Set EXTRA_OEMAKE to null for kernel Currently the only thing in EXTRA_OEMAKE is '-e MAKEFLAGS='. We don't want to overide the kernel's Makefile variables from the environment. It caused the passed -j parameter from PARALLEL_MAKE to be ignored. Signed-off-by: Dale Farnsworth Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko --- classes/kernel.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 4cf5bed448..c5192d59d4 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -78,6 +78,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" UBOOT_ENTRYPOINT ?= "20008000" UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" +# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE. +# We don't want to override kernel Makefile variables from the environment +EXTRA_OEMAKE = "" + kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" -- cgit v1.2.3