From c65af0edd12140dbc9f3422c2054ba6f7e0bdea9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 13 Sep 2004 22:40:21 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages into handhelds.org:/home/kergoth/code/oe/packages 2004/09/14 00:14:43+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/14 00:14:24+02:00 uni-frankfurt.de!mickeyl upgrade patcher to 20040913. patcher has a nifty new feature (based on my featurewish, thanks Holger). If you supply -R, it automatically refreshes a patch when line numbers changed (previously it only notified the user about that). The developer can then copy the patches back to the repository once in a while to ease upgrading or prevent unnecessary manual merges when upstream changes gradually. 2004/09/13 21:37:43+02:00 uni-frankfurt.de!mickeyl enable a couple of extra modules in defconfig-tosa BKrev: 414621d567thj7D0rCJV-paRni1fOQ --- classes/base.oeclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.oeclass b/classes/base.oeclass index 85c8826fef..8c50abb2cd 100644 --- a/classes/base.oeclass +++ b/classes/base.oeclass @@ -318,7 +318,7 @@ python base_do_patch() { cmd = "PATH=\"%s\" patcher" % oe.data.getVar("PATH", d, 1) if "pnum" in parm: cmd += " -p %s" % parm["pnum"] - cmd += " -n \"%s\" -i %s" % (os.path.basename(efile), efile) + cmd += " -R -n \"%s\" -i %s" % (os.path.basename(efile), efile) ret = os.system(cmd) if ret != 0: raise oe.build.FuncFailed("'patcher' execution failed") -- cgit v1.2.3