From 54060c2fe137390a12bd54d56f67c2999c06c64d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 3 Aug 2007 16:49:23 +0000 Subject: base.bbclass: Add dependency on git-native for git packages --- classes/base.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) 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): -- cgit v1.2.3 From ce7860270c0a535a347fd12c3dd70c19476b0653 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 3 Aug 2007 16:51:14 +0000 Subject: git: 1.4.4.2 -> 1.5.2.3 (from poky) --- packages/git/git-native_1.4.4.2.bb | 3 --- packages/git/git-native_1.5.2.3.bb | 3 +++ packages/git/git_1.4.4.2.bb | 11 ----------- packages/git/git_1.5.2.3.bb | 11 +++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 packages/git/git-native_1.4.4.2.bb create mode 100644 packages/git/git-native_1.5.2.3.bb delete mode 100644 packages/git/git_1.4.4.2.bb create mode 100644 packages/git/git_1.5.2.3.bb diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.4.4.2.bb deleted file mode 100644 index f91fd03ab1..0000000000 --- a/packages/git/git-native_1.4.4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require git.inc -inherit native -DEPENDS = "openssl-native curl-native" diff --git a/packages/git/git-native_1.5.2.3.bb b/packages/git/git-native_1.5.2.3.bb new file mode 100644 index 0000000000..f91fd03ab1 --- /dev/null +++ b/packages/git/git-native_1.5.2.3.bb @@ -0,0 +1,3 @@ +require git.inc +inherit native +DEPENDS = "openssl-native curl-native" diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.4.4.2.bb deleted file mode 100644 index e6a1117316..0000000000 --- a/packages/git/git_1.4.4.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require git.inc -DEPENDS = "openssl curl" -RDEPENDS = "perl perl-module-file-path cpio findutils sed" - -PR="r2" - -do_install() { - oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ - template_dir="${datadir}/git-core/templates" \ - GIT_PYTHON_DIR="${datadir}/git-core/python" -} diff --git a/packages/git/git_1.5.2.3.bb b/packages/git/git_1.5.2.3.bb new file mode 100644 index 0000000000..e6a1117316 --- /dev/null +++ b/packages/git/git_1.5.2.3.bb @@ -0,0 +1,11 @@ +require git.inc +DEPENDS = "openssl curl" +RDEPENDS = "perl perl-module-file-path cpio findutils sed" + +PR="r2" + +do_install() { + oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ + template_dir="${datadir}/git-core/templates" \ + GIT_PYTHON_DIR="${datadir}/git-core/python" +} -- cgit v1.2.3