From d5f68875343b7eb93ef9c614e52bd9966c06417a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 14 Nov 2006 20:14:55 +0000 Subject: libmimedir: add a maxdate for the gslist patch and a sane-srcdate to work around some weirdness in bitbake trunk --- packages/libmimedir/libmimedir_0.4.0-20060804.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index e28bd6a4e8..298b90ea70 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -11,7 +11,7 @@ PV = "0.4.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ file://mimedir-update.patch;patch=1 \ file://mimedir-write-sequence.patch;patch=1;pnum=0 \ - file://gslist-fix.patch;patch=1" + file://gslist-fix.patch;patch=1;maxdate=20060814" S = "${WORKDIR}/libmimedir" -- cgit v1.2.3 From d6aa197a5f26cad7dd38b19aa6cd017898944f40 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 14 Nov 2006 22:15:06 +0000 Subject: git: Set PV correctly, update for upstream changes in directory names --- packages/git/git-native.bb | 9 --------- packages/git/git-native_snapshot.bb | 9 +++++++++ packages/git/git.bb | 19 ------------------- packages/git/git_snapshot.bb | 25 +++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 packages/git/git-native.bb create mode 100644 packages/git/git-native_snapshot.bb delete mode 100644 packages/git/git.bb create mode 100644 packages/git/git_snapshot.bb (limited to 'packages') diff --git a/packages/git/git-native.bb b/packages/git/git-native.bb deleted file mode 100644 index 67ea960819..0000000000 --- a/packages/git/git-native.bb +++ /dev/null @@ -1,9 +0,0 @@ -require git.bb -inherit native -DEPENDS = "expat-native openssl-native curl-native" - -do_stage () { - oe_runmake install bindir=${STAGING_BINDIR} \ - template_dir=${STAGING_DIR}/${BUILD_SYS}/share/git-core/templates/ \ - GIT_PYTHON_DIR=${STAGING_DIR}/${BUILD_SYS}/share/git-core/python -} diff --git a/packages/git/git-native_snapshot.bb b/packages/git/git-native_snapshot.bb new file mode 100644 index 0000000000..84e6f96686 --- /dev/null +++ b/packages/git/git-native_snapshot.bb @@ -0,0 +1,9 @@ +require git_snapshot.bb +inherit native +DEPENDS = "expat-native openssl-native curl-native" + +do_stage () { + oe_runmake install bindir=${STAGING_BINDIR} \ + template_dir=${STAGING_DIR}/${BUILD_SYS}/share/git-core/templates/ \ + GIT_PYTHON_DIR=${STAGING_DIR}/${BUILD_SYS}/share/git-core/python +} diff --git a/packages/git/git.bb b/packages/git/git.bb deleted file mode 100644 index 7d5c2cbc35..0000000000 --- a/packages/git/git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DESCRIPTION = "The git revision control system used by the Linux kernel developers" -DEPENDS = "openssl curl" - -PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}" - -SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" - -S = "${WORKDIR}/git-snapshot-${DATE}" - -FILES_${PN} += "${datadir}/git-core" - -do_install () { - oe_runmake install prefix=${D} bindir=${D}${bindir} \ - template_dir=${D}${datadir}/git-core/templates \ - GIT_PYTHON_DIR=${D}${datadir}/git-core/python -} - diff --git a/packages/git/git_snapshot.bb b/packages/git/git_snapshot.bb new file mode 100644 index 0000000000..443fd299f6 --- /dev/null +++ b/packages/git/git_snapshot.bb @@ -0,0 +1,25 @@ +SECTION = "console/utils" +LICENSE = "GPL" +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +DEPENDS = "openssl curl" + +def get_git_pkgdate(d): + import bb + srcdate = bb.data.getVar('SRCDATE', d, 1) + return "-".join([srcdate[0:4], srcdate[4:6], srcdate[6:8]]) + +PKGDATE = "${@get_git_pkgdate(d)}" + +SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" +PV = "1.4.3.5+snapshot${PKGDATE}" + +S = "${WORKDIR}/git-${PKGDATE}" + +FILES_${PN} += "${datadir}/git-core" + +do_install () { + oe_runmake install prefix=${D} bindir=${D}${bindir} \ + template_dir=${D}${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${D}${datadir}/git-core/python +} + -- cgit v1.2.3