From: kos <kos@dev3>
Date: Thu, 17 Jan 2013 06:16:44 +0000 (+0900)
Subject: fixed the installation path to the kernel image.
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=commitdiff_plain;h=0b9e357fed8aff3f387c488949ee45948d1c184e

fixed the installation path to the kernel image.
---

diff --git a/conf/machine/bm750.conf b/conf/machine/bm750.conf
index ec2a3fc..64ee935 100644
--- a/conf/machine/bm750.conf
+++ b/conf/machine/bm750.conf
@@ -87,8 +87,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 \
@@ -107,8 +107,8 @@ IMAGE_CMD_ubi_append = "; \
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-        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/conf/machine/vuduo2.conf b/conf/machine/vuduo2.conf
index c242a06..351019d 100644
--- a/conf/machine/vuduo2.conf
+++ b/conf/machine/vuduo2.conf
@@ -81,10 +81,10 @@ MACHINE_FEATURES += "display-graphic-vfd"
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-	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; \
 	mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
@@ -118,10 +118,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/conf/machine/vusolo.conf b/conf/machine/vusolo.conf
index a820374..b1638fa 100644
--- a/conf/machine/vusolo.conf
+++ b/conf/machine/vusolo.conf
@@ -87,8 +87,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 \
@@ -108,8 +108,8 @@ IMAGE_CMD_ubi_append = "; \
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-        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/conf/machine/vusolo2.conf b/conf/machine/vusolo2.conf
index b24fdd8..2f5160a 100644
--- a/conf/machine/vusolo2.conf
+++ b/conf/machine/vusolo2.conf
@@ -57,10 +57,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/conf/machine/vuultimo.conf b/conf/machine/vuultimo.conf
index 39fd5e2..8b57ae5 100644
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -82,9 +82,9 @@ MACHINE_FEATURES += "enable-rc-kbd"
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-	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 \
@@ -116,9 +116,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/conf/machine/vuuno.conf b/conf/machine/vuuno.conf
index 447f849..4a41493 100644
--- a/conf/machine/vuuno.conf
+++ b/conf/machine/vuuno.conf
@@ -86,9 +86,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 \
@@ -110,9 +110,9 @@ IMAGE_CMD_ubi_append = "; \
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
-        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/recipes/linux/linux-bm750_3.1.1.bb b/recipes/linux/linux-bm750_3.1.1.bb
index 421e4fe..436e5c2 100644
--- a/recipes/linux/linux-bm750_3.1.1.bb
+++ b/recipes/linux/linux-bm750_3.1.1.bb
@@ -1,6 +1,6 @@
 require linux-vuplus-3.1.1.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "\
         file://linux_3.1.1_bm750.patch;patch=1;pnum=1 \
diff --git a/recipes/linux/linux-vuduo2_3.3.6.bb b/recipes/linux/linux-vuduo2_3.3.6.bb
index c2a20ca..0e7fb64 100644
--- a/recipes/linux/linux-vuduo2_3.3.6.bb
+++ b/recipes/linux/linux-vuduo2_3.3.6.bb
@@ -1,3 +1,3 @@
 require linux-vuplus-3.3.6.inc
 
-PR = "r0"
+PR = "r1"
diff --git a/recipes/linux/linux-vuplus-3.1.1.inc b/recipes/linux/linux-vuplus-3.1.1.inc
index 50e8e93..1aca955 100644
--- a/recipes/linux/linux-vuplus-3.1.1.inc
+++ b/recipes/linux/linux-vuplus-3.1.1.inc
@@ -16,13 +16,13 @@ S = "${WORKDIR}/linux-${KV}"
 
 inherit kernel
 
-FILES_kernel-image = "/boot/vmlinux.gz /boot/autoexec.bat"
-
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 KERNEL_OBJECT_SUFFIX = "ko"
+KERNEL_IMAGEDEST = "tmp"
 
+FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {
         oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
diff --git a/recipes/linux/linux-vuplus-3.3.6.inc b/recipes/linux/linux-vuplus-3.3.6.inc
index 97c8aed..63f941d 100644
--- a/recipes/linux/linux-vuplus-3.3.6.inc
+++ b/recipes/linux/linux-vuplus-3.3.6.inc
@@ -19,13 +19,13 @@ S = "${WORKDIR}/linux"
 
 inherit kernel
 
-FILES_kernel-image = "/boot/vmlinux.gz /boot/autoexec.bat"
-
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 KERNEL_OBJECT_SUFFIX = "ko"
+KERNEL_IMAGEDEST = "tmp"
 
+FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {
         oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
diff --git a/recipes/linux/linux-vusolo2_3.3.6.bb b/recipes/linux/linux-vusolo2_3.3.6.bb
index 748d6d7..cdc6017 100644
--- a/recipes/linux/linux-vusolo2_3.3.6.bb
+++ b/recipes/linux/linux-vusolo2_3.3.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 
 KV = "3.3.6"
 
-PR = "r4"
+PR = "r5"
 SRCREV = ""
 
 MODULE = "linux-3.3.6"
@@ -21,12 +21,13 @@ S = "${WORKDIR}/linux"
 
 inherit kernel
 
-FILES_kernel-image = "/boot/vmlinux.gz /boot/autoexec.bat"
-
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 KERNEL_OBJECT_SUFFIX = "ko"
+KERNEL_IMAGEDEST = "tmp"
+
+FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 
 do_configure_prepend() {
diff --git a/recipes/linux/linux-vusolo_3.1.1.bb b/recipes/linux/linux-vusolo_3.1.1.bb
index 16d3856..7d51c32 100644
--- a/recipes/linux/linux-vusolo_3.1.1.bb
+++ b/recipes/linux/linux-vusolo_3.1.1.bb
@@ -1,6 +1,6 @@
 require linux-vuplus-3.1.1.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "\
         file://linux_3.1.1_vusolo.patch;patch=1;pnum=1 \
diff --git a/recipes/linux/linux-vuultimo_3.1.1.bb b/recipes/linux/linux-vuultimo_3.1.1.bb
index c85bab2..79e256a 100644
--- a/recipes/linux/linux-vuultimo_3.1.1.bb
+++ b/recipes/linux/linux-vuultimo_3.1.1.bb
@@ -1,6 +1,6 @@
 require linux-vuplus-3.1.1.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "\
 	file://linux-sata_brcm.patch;patch=1;pnum=1 \
diff --git a/recipes/linux/linux-vuuno_3.1.1.bb b/recipes/linux/linux-vuuno_3.1.1.bb
index 6fa45d2..a93e7d7 100644
--- a/recipes/linux/linux-vuuno_3.1.1.bb
+++ b/recipes/linux/linux-vuuno_3.1.1.bb
@@ -1,6 +1,6 @@
 require linux-vuplus-3.1.1.inc
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI += "\
         file://linux_3.1.1_vuuno.patch;patch=1;pnum=1 \