[oe-commits] org.oe.dev git: Set PV correctly, update for upstream changes in directory names

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 35628b6bd9343f9edffebb869b6ebd3dde83108e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=35628b6bd9343f9edffebb869b6ebd3dde83108e
Files:
1
packages/git/git-native.bb
packages/git/git-native_snapshot.bb
packages/git/git.bb
packages/git/git_snapshot.bb
Diffs:

#
# mt diff -rd72797720c3930b6d2d8332e9b71243979a4158a -r35628b6bd9343f9edffebb869b6ebd3dde83108e
#
# 
# 
# rename "packages/git/git-native.bb"
#     to "packages/git/git-native_snapshot.bb"
# 
# rename "packages/git/git.bb"
#     to "packages/git/git_snapshot.bb"
# 
# patch "packages/git/git-native_snapshot.bb"
#  from [d89719d8793d72b54fe7d72dac4edf0081f50ac1]
#    to [e076a80388012b193068cfd436625cbefa7a2467]
# 
# patch "packages/git/git_snapshot.bb"
#  from [d8cf48c352fbb0163dd855ef818179b99f2e4786]
#    to [bcd02ee66b30e72ca4842938372a969d10f78acd]
# 
============================================================
--- packages/git/git-native.bb	d89719d8793d72b54fe7d72dac4edf0081f50ac1
+++ packages/git/git-native_snapshot.bb	e076a80388012b193068cfd436625cbefa7a2467
@@ -1,4 +1,4 @@
-require git.bb
+require git_snapshot.bb
 inherit native
 DEPENDS = "expat-native openssl-native curl-native"
 
============================================================
--- packages/git/git.bb	d8cf48c352fbb0163dd855ef818179b99f2e4786
+++ packages/git/git_snapshot.bb	bcd02ee66b30e72ca4842938372a969d10f78acd
@@ -1,13 +1,19 @@ DEPENDS = "openssl curl"
 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())}"
+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"