From 7d6574bc264fbca8bc317551c09a7588bd0b49a0 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 18 Jan 2005 06:44:18 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/18 01:44:17-05:00 handhelds.org!kergoth qte: Correct a bug in a sed script in the do_configure, and disable PARALLEL_MAKE. 2005/01/18 01:09:16-05:00 handhelds.org!kergoth Properly mangle the messages for the BuildCompleted event. 2005/01/18 00:47:58-05:00 handhelds.org!kergoth Fix the new base_do_patch application dir problem, again, hopefully for the last time. BKrev: 41ecb042ECy_RNQJN4-AJGD_c8kZcQ --- classes/base.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index f4ee9d90d7..f09968e612 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -454,12 +454,10 @@ python base_do_patch() { else: pname = unpacked - patchdir = bb.data.getVar('S', d, 1) - os.chdir(patchdir) - bb.note("Applying patch '%s'" % pname) bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d) bb.data.setVarFlag("do_patchcmd", "func", 1, d) + bb.data.setVarFlag("do_patchcmd", "dirs", "${WORKDIR} ${S}", d) bb.build.exec_func("do_patchcmd", d) } @@ -471,6 +469,7 @@ python base_eventhandler() { import os messages = {} + messages["Completed"] = "completed" messages["Succeeded"] = "completed" messages["Started"] = "started" messages["Failed"] = "failed" -- cgit v1.2.3