[oe-commits] Ulf Samuelsson : Change do_deploy to do_install for u-boot, to get the binaries

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: 1be899045c656c2120e867abe04f1a0ea67ca836
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1be899045c656c2120e867abe04f1a0ea67ca836

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Tue Aug 18 11:35:38 2009 +0200

Change do_deploy to do_install for u-boot, to get the binaries

---

 recipes/u-boot/u-boot.inc            |    7 +++--
 recipes/u-boot/u-boot_2009.08-rc2.bb |   49 +++++++++++++++++----------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc
index 294b444..651fc88 100644
--- a/recipes/u-boot/u-boot.inc
+++ b/recipes/u-boot/u-boot.inc
@@ -22,7 +22,7 @@ do_compile () {
 	oe_runmake all
 }
 
-do_deploy () {
+do_install () {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
@@ -32,8 +32,9 @@ do_deploy () {
 	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}
 }
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+
+#do_deploy[dirs] = "${S}"
+#addtask deploy before do_build after do_compile
 
 do_stage() {
 	install -d ${STAGING_BINDIR_NATIVE}
diff --git a/recipes/u-boot/u-boot_2009.08-rc2.bb b/recipes/u-boot/u-boot_2009.08-rc2.bb
index 8af45cf..b2f431c 100644
--- a/recipes/u-boot/u-boot_2009.08-rc2.bb
+++ b/recipes/u-boot/u-boot_2009.08-rc2.bb
@@ -1,6 +1,19 @@
-PR = "r2"
+DESCRIPTION = "U-boot bootloader 2009.08-rc2"
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+PV = "2009.08-rc2"
+SRCREV = "${AUTOREV}"
+
+PR = "r4"
+
 require u-boot.inc
 
+UBOOT_IMAGE = "${MACHINE}-u-boot-${PV}.bin"
+UBOOT_SYMLINK = "u-boot.bin"
+
+S = "${WORKDIR}/u-boot-${PV}"
+#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}/atmel"
 DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE_at91sam9g10ek = "2"
@@ -34,26 +47,14 @@ TARGET_LDFLAGS = ""
 
 inherit base
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}"
-EXTRA_OEMAKE += "BOARDNAME=${MACHINE}"
-EXTRA_OEMAKE += "BUILD_DATE=${MACHINE}"
-EXTRA_OEMAKE += "U_BOOT_VERSION=${PV}"
-EXTRA_OEMAKE += "TFTPBOOT=/tftpboot"
-
-
-do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-	oe_runmake install
-	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${UBOOT_SYMLINK}
-	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
-	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}
-
-#	oe_runmake tftp
-}
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+#DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}"
+#EXTRA_OEMAKE += "BOARDNAME=${MACHINE}"
+#EXTRA_OEMAKE += "BUILD_DATE=${MACHINE}"
+#EXTRA_OEMAKE += "U_BOOT_VERSION=${PV}"
+#EXTRA_OEMAKE += "TFTPBOOT=/tftpboot"
+
+
+
+
+