From d35cf88e849ccad6fce5ab4bbf4cbe96f6e513b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 23 Nov 2009 01:18:03 +0000 Subject: kernel.bbclass: do_deploy modules.tgz should operating on PKGD Signed-off-by: Richard Purdie --- classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 637805e6e3..82719ac22c 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -527,8 +527,8 @@ do_deploy() { install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - if [ -d "${D}/lib" ]; then - fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib + if [ -d "${PKGD}/lib" ]; then + fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${PKGD} lib fi cd ${DEPLOY_DIR_IMAGE} -- cgit v1.2.3 From a55e9a527a8c9823044196d031f2da2783ff8f35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 23 Nov 2009 11:29:05 +0100 Subject: kernel.bbclass, linux.inc: move do_deploy task after do_package * Move do_deploy after do_package in kernel.bbclass as RP said * Move devicetree_image before do_deploy in linux.inc, because it creates dependency loop if its between after do_package and before do_deploy. Signed-off-by: Martin Jansa --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 82719ac22c..dedd5a6962 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -540,4 +540,4 @@ do_deploy() { do_deploy[dirs] = "${S}" do_deploy[depends] += "fakeroot-native:do_populate_staging" -addtask deploy before do_package after do_install +addtask deploy after do_package -- cgit v1.2.3 From bc2bddb71d8c5db25b80aa6435392ec1c8df39f9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 23 Nov 2009 13:53:04 +0100 Subject: kernel.bbclass: force do_deploy call before do_build Signed-off-by: Martin Jansa --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index dedd5a6962..edeaa660bb 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -540,4 +540,4 @@ do_deploy() { do_deploy[dirs] = "${S}" do_deploy[depends] += "fakeroot-native:do_populate_staging" -addtask deploy after do_package +addtask deploy before do_build after do_package -- cgit v1.2.3 From c0a3e91845fad1cdda723bdcf962de8bc01f8a2d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Dec 2009 13:04:16 +0000 Subject: kernel, linux-kernel-base classes: update for 2.6.33-rc1 and newer * include/asm link was killed in http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f7f16b7799ed68654850ab340ef812895aebcf4c * utsrelease.h was moved in http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=273b281fa22c293963ee3e6eec418f5dda2dbc83 Signed-off-by: Martin Jansa Acked-by: Khem Raj --- classes/kernel.bbclass | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index edeaa660bb..069dcebf3d 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -95,13 +95,18 @@ kernel_do_compile() { kernel_do_compile[depends] = "${INITRAMFS_TASK}" kernel_do_stage() { - ASMDIR=`readlink include/asm` + if [ -e include/asm ] ; then + # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels + ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR + cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + fi # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm if [ -e arch/${ARCH}/include/asm/ ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + if [ -e include/asm ] ; then + cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + fi install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ @@ -112,8 +117,10 @@ kernel_do_stage() { cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + if [ -e include/asm ] ; then + rm -f ${STAGING_KERNEL_DIR}/include/asm + ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + fi mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ -- cgit v1.2.3 From 572abc3fdd1076ca35d8c15d269cc9d862101805 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 30 Dec 2009 23:29:53 +0100 Subject: kernel.bbclass: copy gz, lzo, lzma initramfs cpio images. - since 2.6.30 there is choice between gzip and lzma for the initramfs.cpio - in patchwork there are pending patches for lzo compressor, so we add lzo too - patch is only concerning initramfs images --- classes/kernel.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 069dcebf3d..83530b5a5e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -208,8 +208,12 @@ kernel_do_install() { kernel_do_configure() { yes '' | oe_runmake oldconfig if [ ! -z "${INITRAMFS_IMAGE}" ]; then - cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz - fi + for img in cpio.gz cpio.lzo cpio.lzma; do + if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then + cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img + fi + done + fi } do_menuconfig() { -- cgit v1.2.3 From eaf451fc3ef576c3332edfa9ee64bc5cba8d3f72 Mon Sep 17 00:00:00 2001 From: Aleksey Makarov Date: Mon, 18 Jan 2010 11:06:23 +0000 Subject: kernel.bbclass: fix kernel build, version >= 2.6.33-rc1, arch x86 * Apply the same change as c0a3e91845fad1cdda723bdcf962de8bc01f8a2d for x86 path * A check was missed in the x86 path of the stage method. Signed-off-by: Martin Jansa --- classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 83530b5a5e..53ea252b0e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -112,7 +112,9 @@ kernel_do_stage() { # 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/ + if [ -e include/asm ] ; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + fi install -d ${STAGING_KERNEL_DIR}/arch/x86/include cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi -- cgit v1.2.3