<br><br>On Friday, June 29, 2012, Darren Hart <<a href="mailto:dvhart@linux.intel.com">dvhart@linux.intel.com</a>> wrote:<br>> [YOCTO #1614]<br>><br>> Add the kernel headers to the kernel-dev package. This packages what was<br>
> already built and kept in sysroots for building modules with bitbake.<br>> Making this available on the target requires removing some additional<br>> host binaries.<br>><br>> Move the location to /usr/src/kernel<br>
><br>> Before use on the target, the user will need to:<br>><br>> # cd /usr/src/kernel<br>> # make scripts<br>><br>> This renders the kernel-misc recipe empty, so remove it.<br>><br>> Signed-off-by: Darren Hart <<a href="mailto:dvhart@linux.intel.com">dvhart@linux.intel.com</a>><br>
> CC: Bruce Ashfield <<a href="mailto:bruce.ashfield@windriver.com">bruce.ashfield@windriver.com</a>><br>> CC: Tom Zanussi <<a href="mailto:tom.zanussi@intel.com">tom.zanussi@intel.com</a>><br>> CC: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
> ---<br>> meta/classes/kernel.bbclass | 15 +++++++--------<br>> meta/conf/bitbake.conf | 2 +-<br>> 2 files changed, 8 insertions(+), 9 deletions(-)<br>><br>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass<br>
> index 31e633b..27e0033 100644<br>> --- a/meta/classes/kernel.bbclass<br>> +++ b/meta/classes/kernel.bbclass<br>> @@ -130,7 +130,7 @@ kernel_do_install() {<br>> # Support for external module building - create a minimal copy of the<br>
> # kernel source tree.<br>> #<br>> - kerneldir=${D}/kernel<br>> + kerneldir=${D}/usr/src/kernel<br>> install -d $kerneldir<br>><br>> #<br>> @@ -183,10 +183,11 @@ kernel_do_install() {<br>
> cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o<br>> fi<br>><br>> - # Remove the following binaries which cause strip errors<br>> + # Remove the following binaries which cause strip or arch QA errors<br>
> # during do_package for cross-compiled platforms<br>> bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \<br>> - arch/powerpc/boot/mktree"<br>> + arch/powerpc/boot/mktree scripts/kconfig/zconf.tab.o \<br>
> + scripts/kconfig/conf.o"<br>> for entry in $bin_files; do<br>> rm -f $kerneldir/$entry<br>> done<br>> @@ -247,13 +248,11 @@ EXPORT_FUNCTIONS do_compile do_install do_configure<br>
><br>> # kernel-base becomes kernel-${KERNEL_VERSION}<br>> # kernel-image becomes kernel-image-${KERNEL_VERISON}<br>> -PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-misc"<br>
> +PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev"<br>> FILES = ""<br>> FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"<br>> -FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*"<br>
> +FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* /usr/src/kernel"<br>> FILES_kernel-vmlinux = "/boot/vmlinux*"<br>> -# misc is a package to contain files we need in staging<br>
> -FILES_kernel-misc = "/kernel/include/config /kernel/scripts /kernel/drivers/crypto /kernel/drivers/media"<br>> RDEPENDS_kernel = "kernel-base"<br>> # Allow machines to override this dependency if kernel image files are<br>
> # not wanted in images as standard<br>> @@ -469,7 +468,7 @@ python populate_packages_prepend () {<br>> metapkg = "kernel-modules"<br>> d.setVar('ALLOW_EMPTY_' + metapkg, "1")<br>
> d.setVar('FILES_' + metapkg, "")<br>> - blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'kernel-misc' ]<br>> + blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]<br>
> for l in module_deps.values():<br>> for i in l:<br>> pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))<br>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf<br>
> index 9b26580..9f3abee 100644<br>> --- a/meta/conf/bitbake.conf<br>> +++ b/meta/conf/bitbake.conf<br>> @@ -380,7 +380,7 @@ SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"<br>> ##################################################################<br>
><br>> OLDEST_KERNEL = "2.6.16"<br>> -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel"<br>> +STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/usr/src/kernel-headers"<br><br><br>This should be kernel instead of kernel-headers<br>
><br>> ##################################################################<br>> # Specific image creation and rootfs population info.<br>> --<br>> 1.7.10.2<br>><br>>