[oe-commits] org.oe.dev merge of '14928573b347a6b1c9dbb7c902a5f88108e50372'

[oe commit]

merge of '14928573b347a6b1c9dbb7c902a5f88108e50372'
     and '52580cee5bed5696a392f8553aaab20b2c6af883'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d9174b826c6e0000ebf0d7e20ebfe288a56c1792
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d9174b826c6e0000ebf0d7e20ebfe288a56c1792
Files:
1
packages/git/git-native_1.4.4.2.bb
packages/git/git-native_1.5.2.3.bb
packages/git/git_1.4.4.2.bb
packages/git/git_1.5.2.3.bb
classes/base.bbclass
packages/openmoko2/openmoko-today2_svn.bb
Diffs:

#
# mt diff -r14928573b347a6b1c9dbb7c902a5f88108e50372 -rd9174b826c6e0000ebf0d7e20ebfe288a56c1792
#
# 
# 
# rename "packages/git/git-native_1.4.4.2.bb"
#     to "packages/git/git-native_1.5.2.3.bb"
# 
# rename "packages/git/git_1.4.4.2.bb"
#     to "packages/git/git_1.5.2.3.bb"
# 
# patch "classes/base.bbclass"
#  from [bfc3a79142b7d13c31f36cebe1bb1c80e8330501]
#    to [814ca4a03b3d5ea4596ae040b150a92ea3076a42]
# 
============================================================
--- classes/base.bbclass	bfc3a79142b7d13c31f36cebe1bb1c80e8330501
+++ classes/base.bbclass	814ca4a03b3d5ea4596ae040b150a92ea3076a42
@@ -820,6 +820,14 @@ def base_after_parse(d):
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
 
+    # Git packages should DEPEND on git-native
+    srcuri = bb.data.getVar('SRC_URI', d, 1)
+    if "git://" in srcuri:
+        depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+        depends = depends + " git-native:do_populate_staging"
+        bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+				    
+
     mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
     old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
     if (old_arch == mach_arch):


#
# mt diff -r52580cee5bed5696a392f8553aaab20b2c6af883 -rd9174b826c6e0000ebf0d7e20ebfe288a56c1792
#
# 
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [39b64ceee2ffe7f61aa27d0d469968d13b212c5d]
#    to [58011fb129f3c3326348b057bc5b238ac55794b0]
# 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	39b64ceee2ffe7f61aa27d0d469968d13b212c5d
+++ packages/openmoko2/openmoko-today2_svn.bb	58011fb129f3c3326348b057bc5b238ac55794b0
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
 PV = "0.1.0+svn${SVNREV}"
 
 inherit openmoko2 gtk-icon-cache