From 675fd0d4926f10fb8409a05d802f3d6908bd559e Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 2 May 2012 20:28:34 -0500 Subject: kernel.bbclass: move kernel-vmlinux up in PACKAGES If KERNEL_IMAGETYPE is vmlinux, the expectation is most likely that there will be no kernel image package, but we still want a vmlinux package for debugging, so move kernel-vmlinux in front of kernel-image in PACKAGES. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa --- meta-oe/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-oe/classes/kernel.bbclass') diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 98320feeda..66398ef39a 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -252,7 +252,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON} -PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux kernel-misc" +PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-misc" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" -- cgit v1.2.3-54-g00ecf From 5c22d88fe27592f4ef279e562cba063676f8d1fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 31 Jan 2012 00:35:02 -0800 Subject: kernel.bbclass: Use kmod-native instead of module-init-tools-cross Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-oe/classes/kernel.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta-oe/classes/kernel.bbclass') diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 66398ef39a..b431f8e1d5 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -1,7 +1,7 @@ inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" -DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" # we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1" @@ -274,7 +274,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ]; then - ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a fi @@ -352,9 +352,8 @@ python populate_packages_prepend () { if m: kernelver_stripped = m.group(1) path = d.getVar("PATH", True) - host_prefix = d.getVar("HOST_PREFIX", True) or "" - cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) + cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped) f = os.popen(cmd, 'r') deps = {} -- cgit v1.2.3-54-g00ecf