[oe-commits] org.oe.dev u-boot: make do_deploy safe for packaged-staging and update beagleboard stuff

[koen commit]

u-boot: make do_deploy safe for packaged-staging and update beagleboard stuff

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9d2f7e547217019549f00e23153021979dbcd7dc
ViewMTN: http://monotone.openembedded.org/revision/info/9d2f7e547217019549f00e23153021979dbcd7dc
Files:
1
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot-git/beagleboard/name.patch
packages/u-boot/u-boot.inc
packages/u-boot/u-boot_git.bb
Diffs:

#
# mt diff -r40ef68bb3820ab27ef7d54312754212a1d6b030a -r9d2f7e547217019549f00e23153021979dbcd7dc
#
#
#
# delete "packages/u-boot/u-boot-git/beagleboard/base.patch"
# 
# patch "packages/u-boot/u-boot-git/beagleboard/name.patch"
#  from [84ee1a8c95077d6b7039a5b6741e3e7e4f347b3f]
#    to [cda25cf92c6f7f649c6869aa17fef0b3fbdbc93c]
# 
# patch "packages/u-boot/u-boot.inc"
#  from [7917f362ce1c8e8af7d66f127b3249c45484d29b]
#    to [299a8856294ca2345c74adda232e30b55dc1969d]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [77d3411a0511c6640be31d9e6a41b663ef6533c3]
#    to [31fb63a05a8da360701b7882d27b11f6f196a7c8]
#
============================================================
--- packages/u-boot/u-boot-git/beagleboard/name.patch	84ee1a8c95077d6b7039a5b6741e3e7e4f347b3f
+++ packages/u-boot/u-boot-git/beagleboard/name.patch	cda25cf92c6f7f649c6869aa17fef0b3fbdbc93c
@@ -1,14 +1,14 @@
---- u-boot/Makefile-orig	2008-05-29 14:00:30.000000000 -0700
-+++ u-boot/Makefile	2008-05-29 13:59:13.000000000 -0700
-@@ -2550,8 +2550,8 @@ omap2430sdp_config :    unconfig
+--- git/Makefile.orig	2008-07-25 16:21:22.000000000 -0700
++++ git/Makefile	2008-07-27 06:49:08.000000000 -0700
+@@ -2582,8 +2582,8 @@ SMN42_config	:	unconfig
  #########################################################################
  ## ARM CORTEX Systems
  #########################################################################
--omap3530beagle_config :    unconfig
--	@./mkconfig $(@:_config=) arm omap3 omap3530beagle
-+beagleboard_config :    unconfig
-+	@./mkconfig omap3530beagle arm omap3 omap3530beagle
+-omap3530beagle_config :	unconfig
+-	@$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
++beagleboard_config :	unconfig
++	@$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
  
- #########################################################################
- ## XScale Systems
+ overo_config	:	unconfig
+ 	@$(MKCONFIG) $(@:_config=) arm omap3 overo
 
============================================================
--- packages/u-boot/u-boot.inc	7917f362ce1c8e8af7d66f127b3249c45484d29b
+++ packages/u-boot/u-boot.inc	299a8856294ca2345c74adda232e30b55dc1969d
@@ -24,10 +24,12 @@ do_deploy () {
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+	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}
 }
 do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
============================================================
--- packages/u-boot/u-boot_git.bb	77d3411a0511c6640be31d9e6a41b663ef6533c3
+++ packages/u-boot/u-boot_git.bb	31fb63a05a8da360701b7882d27b11f6f196a7c8
@@ -1,20 +1,19 @@ require u-boot.inc
 require u-boot.inc
-PR="r11"
+PR="r12"
 
 SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
-SRCREV_beagleboard = "bde63587622c4b830a27d1ddf7265843de9e994f"
+SRCREV_beagleboard = "2d77381a184df7b5017b4a1301d2c02300f3ca3d"
 SRCREV_neuros-osd2 = "70ee511d37ca99afee00edc27be36d0af2832bbc"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
 SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 "
 SRC_URI_neuros-osd2 = "git://git.neurostechnology.com/git/u-boot;protocol=git;branch=neuros"
+SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=test;protocol=git \
+                       file://name.patch;patch=1 \
+                       file://armv7-a.patch;patch=1 \
+                      "
 
-SRC_URI_append_beagleboard = "file://base.patch;patch=1 \
-                              file://name.patch;patch=1 \
-                              file://armv7-a.patch;patch=1 \
-                             "
-
 SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1"
 
 S = "${WORKDIR}/git"