aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-27 13:07:35 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-27 13:07:35 -0700
commitac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9 (patch)
tree70a28b644238277a5ff97f07d3c484ebbb439063
parent7cb990de933f22331cd701ecb45d1e30dd8f3c11 (diff)
downloadopenembedded-ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9.zip
openembedded-ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9.tar.gz
openembedded-ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9.tar.bz2
Revert "base.bbclass: fixed 'apply=no' behavior"
This reverts commit eb8ad2af3a59dc7b4c64814815fc13977efaec6b.
-rw-r--r--classes/base.bbclass5
1 files changed, 1 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index a36fcbf..8bac509 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -163,7 +163,6 @@ python base_do_fetch() {
def oe_unpack_file(file, data, url = None):
import subprocess
- import oe.utils
if not url:
url = "file://%s" % file
dots = file.split(".")
@@ -208,9 +207,7 @@ def oe_unpack_file(file, data, url = None):
cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
else:
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
- is_patch = path.endswith('.diff') or path.endswith('.patch')
- if not oe.utils.param_bool(parm, 'apply', is_patch) and \
- not oe.utils.param_bool(parm, 'patch', False):
+ if not 'apply' in parm and not 'patch' in parm:
# The "destdir" handling was specifically done for FILESPATH
# items. So, only do so for file:// entries.
if type == "file":