From a7affee8d4ce7f514648d07a1c59b05032d37778 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 18 Nov 2009 10:24:36 +0000 Subject: move menuconfig task from "after do_patch" to "after do_configure"; patch from Przemyslaw Wesolek --- 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 fe611ab087..637805e6e3 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -215,7 +215,7 @@ do_menuconfig() { fi } do_menuconfig[nostamp] = "1" -addtask menuconfig after do_patch +addtask menuconfig after do_configure pkg_postinst_kernel () { cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -- cgit v1.2.3 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