git: Set PV correctly, update for upstream changes in directory names

diff --git a/packages/git/git-native.bb b/packages/git/git-native_snapshot.bb
similarity index 91%
rename from packages/git/git-native.bb
rename to packages/git/git-native_snapshot.bb
index 67ea960..84e6f96 100644 (file)
--- a/packages/git/git-native.bb
+++ b/packages/git/git-native_snapshot.bb
@@ -1,4 +1,4 @@
-require git.bb
+require git_snapshot.bb
 inherit native
 DEPENDS = "expat-native openssl-native curl-native"
 

diff --git a/packages/git/git.bb b/packages/git/git_snapshot.bb
similarity index 64%
rename from packages/git/git.bb
rename to packages/git/git_snapshot.bb
index 7d5c2cb..443fd29 100644 (file)
--- a/packages/git/git.bb
+++ b/packages/git/git_snapshot.bb
@@ -3,11 +3,17 @@ 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())}"
+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-snapshot-${DATE}"
+S = "${WORKDIR}/git-${PKGDATE}"
 
 FILES_${PN} += "${datadir}/git-core"