From 03715cb475f48f932913f188de32fe4095f8979f Mon Sep 17 00:00:00 2001 From: kos Date: Thu, 17 Jan 2013 19:18:06 +0900 Subject: [PATCH] fixed install path to the vmlinux. --- meta-bsp/common/classes/image_types_ubi.bbclass | 4 ++-- meta-bsp/common/classes/image_types_ubi_initrd.bbclass | 4 ++-- meta-bsp/common/classes/image_types_ubi_splash.bbclass | 4 ++-- meta-bsp/common/classes/image_types_ubi_splash_initrd.bbclass | 4 ++-- meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb | 7 ++++--- meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb | 8 ++++---- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/meta-bsp/common/classes/image_types_ubi.bbclass b/meta-bsp/common/classes/image_types_ubi.bbclass index 3f1026b..c8dd97b 100644 --- a/meta-bsp/common/classes/image_types_ubi.bbclass +++ b/meta-bsp/common/classes/image_types_ubi.bbclass @@ -9,8 +9,8 @@ IMAGEDIR ?= "${MACHINE}" EXTRA_IMAGECMD_COMPAT = "--eraseblock=0x20000 -n -l" IMAGE_CMD_ubi_prepend = " \ - cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ - rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \ + cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ + rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \ mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \ --disable-compressor=lzo --compression-mode=size \ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \ diff --git a/meta-bsp/common/classes/image_types_ubi_initrd.bbclass b/meta-bsp/common/classes/image_types_ubi_initrd.bbclass index eb1c450..360e621 100644 --- a/meta-bsp/common/classes/image_types_ubi_initrd.bbclass +++ b/meta-bsp/common/classes/image_types_ubi_initrd.bbclass @@ -8,10 +8,10 @@ IMAGEDIR ?= "${MACHINE}" EXTRA_IMAGECMD_COMPAT = "--eraseblock=0x20000 -n -l" IMAGE_CMD_ubi_prepend = " \ - cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ + cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \ cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \ - rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \ + rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \ rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \ rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \ " diff --git a/meta-bsp/common/classes/image_types_ubi_splash.bbclass b/meta-bsp/common/classes/image_types_ubi_splash.bbclass index ea07bf2..4045781 100644 --- a/meta-bsp/common/classes/image_types_ubi_splash.bbclass +++ b/meta-bsp/common/classes/image_types_ubi_splash.bbclass @@ -8,9 +8,9 @@ IMAGEDIR ?= "${MACHINE}" EXTRA_IMAGECMD_COMPAT = "--eraseblock=0x20000 -n -l" IMAGE_CMD_ubi_prepend = " \ - cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ + cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \ - rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \ + rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \ rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \ mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \ --disable-compressor=lzo --compression-mode=size \ diff --git a/meta-bsp/common/classes/image_types_ubi_splash_initrd.bbclass b/meta-bsp/common/classes/image_types_ubi_splash_initrd.bbclass index 640c783..f9fbd89 100644 --- a/meta-bsp/common/classes/image_types_ubi_splash_initrd.bbclass +++ b/meta-bsp/common/classes/image_types_ubi_splash_initrd.bbclass @@ -8,10 +8,10 @@ IMAGEDIR ?= "${MACHINE}" EXTRA_IMAGECMD_COMPAT = "--eraseblock=0x20000 -n -l" IMAGE_CMD_ubi_prepend = " \ - cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ + cp ${IMAGE_ROOTFS}/tmp/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \ cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \ cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \ - rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \ + rm -f ${IMAGE_ROOTFS}/tmp/vmlinux.gz; \ rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \ rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \ " diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb index f63da3e..b7560d5 100644 --- a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb +++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb @@ -3,6 +3,7 @@ SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +PR = "r1" KV = "3.1.1" SRCREV = "r2" @@ -21,14 +22,14 @@ S = "${WORKDIR}/linux-${KV}" inherit kernel -FILES_kernel-vmlinux = "/boot/vmlinux-3.1.1" -FILES_kernel-image = "/boot/vmlinux.gz" - export OS = "Linux" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "vmlinux" KERNEL_OBJECT_SUFFIX = "ko" +KERNEL_IMAGEDEST = "tmp" +FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz" +FILES_kernel-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-3.1.1" do_configure_prepend() { oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb index 1dd475c..3dafb69 100644 --- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb +++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" KV = "3.3.6" -PR = "r4" +PR = "r5" SRCREV = "" MODULE = "linux-3.3.6" @@ -23,14 +23,14 @@ S = "${WORKDIR}/linux" inherit kernel -FILES_kernel-vmlinux = "/boot/vmlinux-*" -FILES_kernel-image = "/boot/vmlinux.gz" - export OS = "Linux" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "vmlinux" KERNEL_OBJECT_SUFFIX = "ko" +KERNEL_IMAGEDEST = "tmp" +FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz" +FILES_kernel-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-*" do_configure_prepend() { oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config -- 2.7.4