kernel.bbclass: Clean up kernel packaging output

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 25bb44859b..3963e38eb8 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -174,6 +174,10 @@ kernel_do_install() {
                 scripts/basic/fixdep scripts/basic/hash scripts/dtc/dtc \
                 scripts/genksyms/genksyms scripts/kconfig/conf scripts/mod/mk_elfconfig \
                 scripts/mod/modpost"
+        rm -rf $kerneldir/scripts/*.o
+        rm -rf $kerneldir/scripts/basic/*.o
+        rm -rf $kerneldir/scripts/kconfig/*.o
+        rm -rf $kerneldir/scripts/mod/*.o
         for entry in $bin_files; do
                 rm -f $kerneldir/$entry
         done    
@@ -214,11 +218,15 @@ 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"
+PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux kernel-misc kernel-dbg"
 FILES = ""
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*"
 FILES_kernel-vmlinux = "/boot/vmlinux*"
+# misc is a package to contain files we need in staging
+FILES_kernel-misc = "/kernel/include/config /kernel/scripts /kernel/drivers/crypto /kernel/drivers/media"
+# We don't care about dbg files for the kernel but split them out here to keep the packaging clean
+FILES_kernel-dbg = "/lib/modules/${KERNEL_VERSION}/kernel/*/*/.debug /lib/modules/${KERNEL_VERSION}/kernel/*/.debug /lib/modules/${KERNEL_VERSION}/kernel/*/*/*/.debug"
 RDEPENDS_kernel = "kernel-base"
 # Allow machines to override this dependency if kernel image files are 
 # not wanted in images as standard
diff --git a/meta/packages/linux/linux-wrs_git.bb b/meta/packages/linux/linux-wrs_git.bb
index 2095e3f477..930c903c44 100644
--- a/meta/packages/linux/linux-wrs_git.bb
+++ b/meta/packages/linux/linux-wrs_git.bb
@@ -24,7 +24,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips)"
 
 LINUX_VERSION = "v2.6.34"
 LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/linux"
 B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"