[oe-commits] org.oe.dev patch.bbclass: Add minrev and maxrev support for patches, cleanup maxdate and mindate support

[rpurdie commit]

patch.bbclass: Add minrev and maxrev support for patches, cleanup maxdate and mindate support

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 367d58a757ae4962c512a28e2025dfa6bb39d571
ViewMTN: http://monotone.openembedded.org/revision.psp?id=367d58a757ae4962c512a28e2025dfa6bb39d571
Files:
1
classes/patch.bbclass
Diffs:

#
# mt diff -ra2c65d7b332b126623a665dfdcd78d11b2c620d3 -r367d58a757ae4962c512a28e2025dfa6bb39d571
#
# 
# 
# patch "classes/patch.bbclass"
#  from [501ddb8911d7ccbf0fec063727781c8a4647692a]
#    to [13f060e11ac73613512bdea10a347394f120fba9]
# 
============================================================
--- classes/patch.bbclass	501ddb8911d7ccbf0fec063727781c8a4647692a
+++ classes/patch.bbclass	13f060e11ac73613512bdea10a347394f120fba9
@@ -492,34 +492,36 @@ python patch_do_patch() {
 		else:
 			pname = os.path.basename(unpacked)
 
-		if "mindate" in parm:
-			mindate = parm["mindate"]
-		else:
-			mindate = 0
+                if "mindate" in parm or "maxdate" in parm:
+			pn = bb.data.getVar('PN', d, 1)
+			srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+			if not srcdate:
+				srcdate = bb.data.getVar('SRCDATE', d, 1)
 
-		if "maxdate" in parm:
-			maxdate = parm["maxdate"]
-		else:
-			maxdate = "20711226"
+			if srcdate == "now":
+				srcdate = bb.data.getVar('DATE', d, 1)
 
-		pn = bb.data.getVar('PN', d, 1)
-		srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+			if "maxdate" in parm and parm["maxdate"] < srcdate:
+				bb.note("Patch '%s' is outdated" % pname)
+				continue
 
-		if not srcdate:
-			srcdate = bb.data.getVar('SRCDATE', d, 1)
+			if "mindate" in parm and parm["mindate"] > srcdate:
+				bb.note("Patch '%s' is predated" % pname)
+				continue
 
-		if srcdate == "now":
-			srcdate = bb.data.getVar('DATE', d, 1)
 
-		if (maxdate < srcdate) or (mindate > srcdate):
-			if (maxdate < srcdate):
-				bb.note("Patch '%s' is outdated" % pname)
+		if "minrev" in parm:
+			srcrev = bb.data.getVar('SRCREV', d, 1)
+			if srcrev and srcrev < parm["minrev"]:
+				bb.note("Patch '%s' applies to later revisions" % pname)
+				continue
 
-			if (mindate > srcdate):
-				bb.note("Patch '%s' is predated" % pname)
+		if "maxrev" in parm:
+			srcrev = bb.data.getVar('SRCREV', d, 1)		
+			if srcrev and srcrev > parm["maxrev"]:
+				bb.note("Patch '%s' applies to earlier revisions" % pname)
+				continue
 
-			continue
-
 		bb.note("Applying patch '%s'" % pname)
 		try:
 			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)