Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 12:47:46+01:00 mn-solutions.de!schurig
Allow patches to have names, otherwise you couldn't install patch-2.6.11-rc1 and
patch-2.6.11-rc1-bk7, because the auto-name-feature would set 'patch-2.6' as name
for both.

BKrev: 41efa6b7InwrkprDOdRS1P2ji_O2gw

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 1b26b4d..8c92ed6 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -448,11 +448,14 @@ python base_do_patch() {
                else:
                        pnum = "1"
 
-               dots = os.path.basename(unpacked).split(".")
-               if len(dots) > 1:
-                       pname = ".".join(dots[:-1])
+               if "pname" in parm:
+                       pname = parm["pname"]
                else:
-                       pname = os.path.basename(unpacked)
+                       dots = os.path.basename(unpacked).split(".")
+                       if len(dots) > 1:
+                               pname = ".".join(dots[:-1])
+                       else:
+                               pname = os.path.basename(unpacked)
 
                bb.note("Applying patch '%s'" % pname)
                bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)