From ee809b6f9f88bbeb241e1034f340e7c881540326 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 19 Aug 2006 18:46:54 +0200 Subject: LAB, kernel.bbclass: cleanup Signed-off-by: Rene Wagner --- org.handhelds.familiar/classes/kernel.bbclass | 2 +- org.handhelds.familiar/packages/linux/LAB-kernel_cvs.bb | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/org.handhelds.familiar/classes/kernel.bbclass b/org.handhelds.familiar/classes/kernel.bbclass index 5a2cf77..3065162 100644 --- a/org.handhelds.familiar/classes/kernel.bbclass +++ b/org.handhelds.familiar/classes/kernel.bbclass @@ -270,7 +270,7 @@ python populate_packages_prepend () { m4 = re.match(pattern4, line) deps[m2.group(1)].extend(m4.group(1).split()) line = f.readline() - if f.close(): # or not deps: + if f.close() or (not deps and not bb.data.getVar("KERNEL_NO_MODULES", d, 1)): # depmod returned an error or no deps found (very unlikely) raise bb.build.FuncFailed("Failed to extract module dependencies.") return deps diff --git a/org.handhelds.familiar/packages/linux/LAB-kernel_cvs.bb b/org.handhelds.familiar/packages/linux/LAB-kernel_cvs.bb index d83e5b4..2fb1b79 100644 --- a/org.handhelds.familiar/packages/linux/LAB-kernel_cvs.bb +++ b/org.handhelds.familiar/packages/linux/LAB-kernel_cvs.bb @@ -1,12 +1,8 @@ SECTION = "kernel" -DESCRIPTION = "Liux As Bootloader kernelm" -MAINTAINER = "Koen Kooi " +DESCRIPTION = "Linux As Bootloader kernel" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}" -#!BIG FAT WARNING: -#build this *before* building your real kernel, otherwise external modules will pickup the wrong headers - DEFAULT_PREFERENCE = "-1" COMPATIBLE_HOST = "arm.*-linux" @@ -23,8 +19,7 @@ S = "${WORKDIR}/kernel26" inherit kernel -FILES_kernel-image_h2200 = "" -ALLOW_EMPTY_kernel-image_h2200 = 1 +KERNEL_NO_MODULES = "1" K_MAJOR = "2" K_MINOR = "6" @@ -46,6 +41,14 @@ do_configure() { yes '' | oe_runmake oldconfig } +do_stage() { + : +} + +python do_package() { + return +} + do_deploy() { install -d ${DEPLOY_DIR}/images install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE} -- cgit v1.2.3-18-g5258