From 45f82a941c77e9d747814fa1e337ba803475d327 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 14 Feb 2010 01:19:08 +0100 Subject: zaurus-kernels: move the kernel size check to linux-kexecboot.inc. * no need for DONT_CHECK_KERNELSIZE * clean up the affected files * check happens only if KERNEL_IMAGE_MAXSIZE is set --- 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 39ff928e6a..d4ecf72505 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -497,7 +497,7 @@ python populate_packages_prepend () { # Support checking the kernel size since some kernels need to reside in partitions # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { - if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then + if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then rm ${KERNEL_OUTPUT} -- cgit v1.2.3 From 5fa112f9839d06f15680b8749a07f070d1789795 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 9 Feb 2010 19:28:04 +0100 Subject: kernel.bbclass: prepare for 2.6.33 header move and simplify logic a bit --- classes/kernel.bbclass | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d4ecf72505..3a52a067cc 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -127,16 +127,7 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ - mkdir -p ${STAGING_KERNEL_DIR}/include/linux - cp -fR include/linux/* ${STAGING_KERNEL_DIR}/include/linux/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/net - cp -fR include/net/* ${STAGING_KERNEL_DIR}/include/net/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia - cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - - for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi include/trace; do + for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then mkdir -p ${STAGING_KERNEL_DIR}/$entry cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ -- cgit v1.2.3 From 82c4e6b36216f2b1c31116a5c784f5e256a1a241 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 9 Nov 2009 12:11:36 +0000 Subject: kernel.bbclass: pass ${KERNEL_VERSION} to depmod -a The postinsts for kernel-image and modules run "depmod -a" on the target, but this only updates the old kernel's modules.dep. "depmod -a ${KERNEL_VERSION}" updates the files in /lib/modules/${KERNEL_VERSION}. Signed-off-by: Michael Smith Acked-by: Marcin Juszkiewicz --- 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 3a52a067cc..69ab422c43 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -267,7 +267,7 @@ fi if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else - depmod -a + depmod -a ${KERNEL_VERSION} fi } @@ -275,7 +275,7 @@ pkg_postinst_modules () { if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else - depmod -a + depmod -a ${KERNEL_VERSION} update-modules || true fi } -- cgit v1.2.3