diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 7 | ||||
| -rw-r--r-- | classes/module-base.bbclass | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e94e331fb4..c5b7ede8d0 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -361,7 +361,12 @@ def oe_unpack_file(file, data, url = None): else: (type, host, path, user, pswd, parm) = bb.decodeurl(url) if not 'patch' in parm: - destdir = bb.decodeurl(url)[1] or "." + # The "destdir" handling was specifically done for FILESPATH + # items. So, only do so for file:// entries. + if type == "file": + destdir = bb.decodeurl(url)[1] or "." + else: + destdir = "." bb.mkdirhier("%s/%s" % (os.getcwd(), destdir)) cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir) if not cmd: diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index d9580ed5dc..41192807be 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -7,6 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" export KERNEL_VERSION = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')} export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')} +KERNEL_OBJECT_SUFFIX = ${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]} KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')} KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')} KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}" |