From 1708207a54e1195d43fb412a3bbef9aa7135fce1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 5 Aug 2009 13:06:32 -0400 Subject: kernel.bbclass: introduce MODULES_IMAGE_BASE_NAME Similar to KERNEL_IMAGE_BASE_NAME, allow overwriting from a recipe Signed-off-by: Denys Dmytriyenko Acked-by: Henning Heinold --- classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index b4987608ed..3ee7f53a29 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -510,6 +510,7 @@ addtask uboot_mkimage before do_install after do_compile KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" +MODULES_IMAGE_BASE_NAME ?= modules-${PV}-${PR}-${MACHINE} do_deploy() { install -d ${DEPLOY_DIR_IMAGE} @@ -517,7 +518,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-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib fi cd ${DEPLOY_DIR_IMAGE} -- cgit v1.2.3 From afe0641baf060813e57e880c3a3f4b202a0dfefe Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 6 May 2009 03:38:35 +0000 Subject: kernel.bbclass: stage more include files for x86 in 2.6.27+ Some packages include , which requires . Supplement b6220af33a70d96345dea130005ce842eeadfdf5 to copy files from arch/x86/include/asm to include/asm-x86. Signed-off-by: Michael Smith Acked-by: Roman I Khimov --- classes/kernel.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 3ee7f53a29..d084cefee8 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -103,8 +103,15 @@ kernel_do_stage() { cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + + # Check for arch/x86 on i386 + elif [ -d arch/x86/include/asm/ ]; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + install -d ${STAGING_KERNEL_DIR}/arch/x86/include + cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi - rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + + rm -f ${STAGING_KERNEL_DIR}/include/asm ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic -- 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(-) (limited to 'classes/kernel.bbclass') 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(+) (limited to 'classes/kernel.bbclass') 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