diff options
-rw-r--r-- | meta-oe/classes/scancode.bbclass | 10 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.4.3.bb | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/classes/scancode.bbclass b/meta-oe/classes/scancode.bbclass index 701660f578..e0f0dbca40 100644 --- a/meta-oe/classes/scancode.bbclass +++ b/meta-oe/classes/scancode.bbclass @@ -3,18 +3,18 @@ # For more informaiton https://github.com/nexB/scancode-toolkit SCANCODE_FORMAT ?= "html-app" -EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else 'json'}" +EXT = "${@'html' if d.getVar('SCANCODE_FORMAT') == 'html-app' else 'json'}" SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" SCANCODE_TAG = "v2.2.1" SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" def get_scancode_toolkit(d): - lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") - if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): - os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION', True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True))) + lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock") + if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))): + os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION'), d.getVar('SCANCODE_SRC_LOCATION'), d.getVar('SCANCODE_TAG'))) bb.utils.unlockfile(lf) - return (d.getVar('SCANCODE_SRC_LOCATION', True)) + return (d.getVar('SCANCODE_SRC_LOCATION')) do_scancode() { mkdir -p ${DEPLOY_DIR_IMAGE}/scancode diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index f3a0f70ee2..c2d2180bae 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = "native" # you need to install the multilib development package (e.g. # libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part # (HOST_CC="gcc -m32"). -BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS', True) != '32']}" +BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" # The lua makefiles expect the TARGET_SYS to be from uname -s # Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index bfd0ddfb86..ca7bd91b2b 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -8,7 +8,7 @@ BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" DEPENDS_class-native = "zlib-native libxml2-native" -PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" +PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb index ca38e6aa21..30c8503650 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb @@ -21,7 +21,7 @@ LDFLAGS_append_libc-musl = " -largp" def set_target_arch(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match(r'i.86', arch, re.I): return 'i386' else: diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb index dd7eaa2aa6..f75ac6f81c 100644 --- a/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -27,7 +27,7 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" python do_package_prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } B = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index 4544f5b2ef..9289738716 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -30,7 +30,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "bash" python do_package_prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } B = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-oe/recipes-support/opencv/opencv_3.4.3.bb b/meta-oe/recipes-support/opencv/opencv_3.4.3.bb index 0a99700b4a..2b25e39dc9 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.4.3.bb @@ -20,7 +20,7 @@ SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5 def ipp_filename(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): return "ippicv_2017u3_lnx_ia32_general_20180518.tgz" else: @@ -28,7 +28,7 @@ def ipp_filename(d): def ipp_md5sum(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): return "ea72de74dae3c604eb6348395366e78e" else: |