[oe-commits] org.oe.dev merge of '190a8b90f7e29caa18792605c4349ba124edb99b'

[oe commit]

merge of '190a8b90f7e29caa18792605c4349ba124edb99b'
     and 'a892df1bf828480c126e8e1a9ea6202a7c8e2e88'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 608ec6693d6ab22628f246e86fe0bc46be0ef1bc
ViewMTN: http://monotone.openembedded.org/revision/info/608ec6693d6ab22628f246e86fe0bc46be0ef1bc
Files:
1
packages/packagekit/packagekit_git.bb
packages/u-boot/u-boot.inc
Diffs:

#
# mt diff -r190a8b90f7e29caa18792605c4349ba124edb99b -r608ec6693d6ab22628f246e86fe0bc46be0ef1bc
#
#
#
# patch "packages/packagekit/packagekit_git.bb"
#  from [fc3f7a476902a37e1583bae4e519d012d218598a]
#    to [360888f913726f29b6299c269b64f58b48fe5834]
#
============================================================
--- packages/packagekit/packagekit_git.bb	fc3f7a476902a37e1583bae4e519d012d218598a
+++ packages/packagekit/packagekit_git.bb	360888f913726f29b6299c269b64f58b48fe5834
@@ -10,7 +10,6 @@ SRC_URI = "git://anongit.freedesktop.org
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
            file://disable-docbook2man.patch;patch=1"
 
-SRCREV = "${AUTOREV}"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig


#
# mt diff -ra892df1bf828480c126e8e1a9ea6202a7c8e2e88 -r608ec6693d6ab22628f246e86fe0bc46be0ef1bc
#
#
#
# patch "packages/u-boot/u-boot.inc"
#  from [d4f085c1b9855dc02618f4cf5c5e6887bfbfb4e9]
#    to [7917f362ce1c8e8af7d66f127b3249c45484d29b]
#
============================================================
--- packages/u-boot/u-boot.inc	d4f085c1b9855dc02618f4cf5c5e6887bfbfb4e9
+++ packages/u-boot/u-boot.inc	7917f362ce1c8e8af7d66f127b3249c45484d29b
@@ -10,7 +10,8 @@ UBOOT_MACHINE ?= "${MACHINE}_config"
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
 UBOOT_MACHINE ?= "${MACHINE}_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
 
 do_compile () {
 	unset LDFLAGS
@@ -23,6 +24,10 @@ do_deploy () {
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+
+	cd ${DEPLOY_DIR_IMAGE}
+	rm -f ${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
 }
 do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile