1 files changed, 13 insertions, 10 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b2f8132abf..59de148cc8 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -40,8 +40,8 @@ HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
 TARGET_LD_KERNEL_ARCH ?= ""
 HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
 
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
-KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
+KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
+KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
 
 # Where built kernel lies in the kernel tree
 KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
@@ -173,7 +173,7 @@ kernel_do_install() {
                 scripts/ihex2fw scripts/kallsyms scripts/pnmtologo scripts/basic/docproc \
                 scripts/basic/fixdep scripts/basic/hash scripts/dtc/dtc \
                 scripts/genksyms/genksyms scripts/kconfig/conf scripts/mod/mk_elfconfig \
-                scripts/mod/modpost"
+                scripts/mod/modpost scripts/recordmcount"
         rm -rf $kerneldir/scripts/*.o
         rm -rf $kerneldir/scripts/basic/*.o
         rm -rf $kerneldir/scripts/kconfig/*.o
@@ -185,7 +185,7 @@ kernel_do_install() {
 }
 
 sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
+        sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}/kernel
 }
 
 
@@ -292,13 +292,16 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm"
 
 python populate_packages_prepend () {
         def extract_modinfo(file):
-                import re
-                tmpfile = os.tmpnam()
+                import tempfile, re
+                tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1)
+                tf = tempfile.mkstemp()
+                tmpfile = tf[1]
                 cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (bb.data.getVar("PATH", d, 1), bb.data.getVar("HOST_PREFIX", d, 1) or "", file, tmpfile)
                 os.system(cmd)
                 f = open(tmpfile)
                 l = f.read().split("\000")
                 f.close()
+                os.close(tf[0])
                 os.unlink(tmpfile)
                 exp = re.compile("([^=]+)=(.*)")
                 vals = {}
@@ -441,7 +444,7 @@ python populate_packages_prepend () {
         metapkg = "kernel-modules"
         bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
         bb.data.setVar('FILES_' + metapkg, "", d)
-        blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
+        blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf' ]
         for l in module_deps.values():
                 for i in l:
                         pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
@@ -484,16 +487,16 @@ kernel_do_deploy() {
 
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
                 if test -e arch/${ARCH}/boot/uImage ; then
-                        cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                        cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                 elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
                         ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-                        uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                        uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                         rm -f linux.bin
                 else
                         ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
                         rm -f linux.bin.gz
                         gzip -9 linux.bin
-                        uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                        uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                         rm -f linux.bin.gz
                 fi
         fi