From: Ting Liu <b28495@freescale.com>
Date: Thu, 22 Mar 2012 10:25:15 +0000 (+0000)
Subject: meta-fsl-ppc: do_deploy not use DEPLOY_DIR_IMAGE
X-Git-Tag: 2.1~534^2~496
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4bb49ec9a33ba59f5dd8d831589ff69522877d3a;p=meta-freescale.git

meta-fsl-ppc: do_deploy not use DEPLOY_DIR_IMAGE

images in DEPLOYDIR will be deployed to DEPLOY_DIR_IMAGE automatically,
not need install images to DEPLOY_DIR_IMAGE any more

Signed-off-by: Ting Liu <b28495@freescale.com>
---

diff --git a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
index 43fc2def..50c89a92 100644
--- a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-PR = "r10"
+PR = "r11"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc"
 
@@ -68,7 +68,7 @@ do_install(){
 		*)		UBOOT_TARGET="u-boot";;
 		esac
 
-		if [ -f ${S}/${UBOOT_TARGET}.bin ]; then
+		if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
 			mkdir -p ${D}/boot/
 			install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
 			ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
@@ -90,13 +90,6 @@ do_deploy(){
 		esac
 
 	        if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
-			mkdir -p ${DEPLOY_DIR_IMAGE}
-	        	install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin
-
-			cd ${DEPLOY_DIR_IMAGE}
-			rm -f ${UBOOT_TARGET}-${board}.bin
-			ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
-
 			mkdir -p ${DEPLOYDIR}
 			install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
 
diff --git a/meta-fsl-ppc/recipes-tools/hv-cfg/hv-cfg_git.bb b/meta-fsl-ppc/recipes-tools/hv-cfg/hv-cfg_git.bb
index d0562026..1207ba56 100644
--- a/meta-fsl-ppc/recipes-tools/hv-cfg/hv-cfg_git.bb
+++ b/meta-fsl-ppc/recipes-tools/hv-cfg/hv-cfg_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Hypervisor Config"
 SECTION = "hv-cfg"
 LICENSE = "BSD"
-PR = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = " \
 	file://p2041rdb/LICENSE;md5=96dd72f26e9bb861de5c76c60e35e1bc \
@@ -28,11 +28,8 @@ do_deploy () {
 	make install
 
 	M=`echo ${MACHINE} | sed s/-64b//g`
-	mkdir -p ${DEPLOY_DIR_IMAGE}/hv-cfg
-	cp -r ${S}/${M}/${M} ${DEPLOY_DIR_IMAGE}/hv-cfg
-
 	install -d ${DEPLOYDIR}/hv-cfg
-	cp -r ${S}/${M}/${M} ${DEPLOYDIR}/hv-cfg
+	cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/hv-cfg
 }
 addtask deploy after do_install
 
diff --git a/meta-fsl-ppc/recipes-tools/rcw/rcw_git.bb b/meta-fsl-ppc/recipes-tools/rcw/rcw_git.bb
index 99a0d749..f36e142e 100644
--- a/meta-fsl-ppc/recipes-tools/rcw/rcw_git.bb
+++ b/meta-fsl-ppc/recipes-tools/rcw/rcw_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Reset Control Words (RCW)"
 SECTION = "rcw"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = " \
 	file://p2041rdb/LICENSE;md5=96dd72f26e9bb861de5c76c60e35e1bc \
@@ -26,11 +26,8 @@ do_deploy () {
 	make install
 
 	M=`echo ${MACHINE} | sed s/-64b//g`
-	mkdir -p ${DEPLOY_DIR_IMAGE}/rcw
-	cp -r ${S}/${M}/${M} ${DEPLOY_DIR_IMAGE}/rcw
-
 	install -d ${DEPLOYDIR}/rcw
-	cp -r ${S}/${M}/${M} ${DEPLOYDIR}/rcw
+	cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/rcw
 }
 addtask deploy after do_install