diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 12:40:23 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 12:40:23 +0000 |
| commit | 3fff43da673534e60500beeb61ff7875f72cdff4 (patch) | |
| tree | 7e517145fe360f991c357c68ff0415aebe4f7c1f | |
| parent | 6c8028fb2898e1154fd588c1f03784c74c23feb3 (diff) | |
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
| -rw-r--r-- | classes/base.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1b26b4d9ba..8c92ed6f76 100644 --- 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) |