diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-03 17:07:48 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-03 17:07:48 +0000 |
commit | b18abe6da7888a670588b90cbd0a7c71f3aeb9a4 (patch) | |
tree | d41761f5521b3130ee187110ea17f71e29267c55 | |
parent | fe8d0333dcdc7a2ed7c8aa9aa13c58398402fe9c (diff) | |
parent | ce7860270c0a535a347fd12c3dd70c19476b0653 (diff) |
merge of '14928573b347a6b1c9dbb7c902a5f88108e50372'
and '52580cee5bed5696a392f8553aaab20b2c6af883'
-rw-r--r-- | classes/base.bbclass | 8 | ||||
-rw-r--r-- | packages/git/git-native_1.5.2.3.bb (renamed from packages/git/git-native_1.4.4.2.bb) | 0 | ||||
-rw-r--r-- | packages/git/git_1.5.2.3.bb (renamed from packages/git/git_1.4.4.2.bb) | 0 |
3 files changed, 8 insertions, 0 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index a81263a12a..45a0282265 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -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): diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.5.2.3.bb index f91fd03ab1..f91fd03ab1 100644 --- a/packages/git/git-native_1.4.4.2.bb +++ b/packages/git/git-native_1.5.2.3.bb diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.5.2.3.bb index e6a1117316..e6a1117316 100644 --- a/packages/git/git_1.4.4.2.bb +++ b/packages/git/git_1.5.2.3.bb |