CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta-oe: remove True option to getVar calls (again)

Browse Source 
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).

Search & replace made using the following command:
    sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
        -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
             | cut -d':' -f1 \
             | sort -u)

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
André Draszik 2019-01-13 10:55:51 +00:00 committed by Khem Raj
parent 24af1f974c
commit e219649594
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/classes/scancode.bbclass
View File

@ -3,18 +3,18 @@
# For more informaiton https://github.com/nexB/scancode-toolkit # For more informaiton https://github.com/nexB/scancode-toolkit
SCANCODE_FORMAT ?= "html-app" 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_TOOLKIT = "${@get_scancode_toolkit(d)}"
SCANCODE_TAG = "v2.2.1" SCANCODE_TAG = "v2.2.1"
SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git"
SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode"
def get_scancode_toolkit(d): def get_scancode_toolkit(d):
lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock")
if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))):
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))) 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) bb.utils.unlockfile(lf)
return (d.getVar('SCANCODE_SRC_LOCATION', True)) return (d.getVar('SCANCODE_SRC_LOCATION'))
do_scancode() { do_scancode() {
mkdir -p ${DEPLOY_DIR_IMAGE}/scancode mkdir -p ${DEPLOY_DIR_IMAGE}/scancode

2
meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
View File

@ -22,7 +22,7 @@ BBCLASSEXTEND = "native"
# you need to install the multilib development package (e.g. # you need to install the multilib development package (e.g.
# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part # libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
# (HOST_CC="gcc -m32"). # (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 # The lua makefiles expect the TARGET_SYS to be from uname -s
# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD # Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD

2
meta-oe/recipes-devtools/php/php.inc
View File

@ -8,7 +8,7 @@ BBCLASSEXTEND = "native"
DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native"
DEPENDS_class-native = "zlib-native libxml2-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 \ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \

2
meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
View File

@ -21,7 +21,7 @@ LDFLAGS_append_libc-musl = " -largp"
def set_target_arch(d): def set_target_arch(d):
import re import re
arch = d.getVar('TARGET_ARCH', True) arch = d.getVar('TARGET_ARCH')
if re.match(r'i.86', arch, re.I): if re.match(r'i.86', arch, re.I):
return 'i386' return 'i386'
else: else:

2
meta-oe/recipes-kernel/bpftool/bpftool.bb
View File

@ -27,7 +27,7 @@ do_install() {
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
python do_package_prepend() { 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}" B = "${WORKDIR}/${BPN}-${PV}"

2
meta-oe/recipes-kernel/cpupower/cpupower.bb
View File

@ -30,7 +30,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
RDEPENDS_${PN} = "bash" RDEPENDS_${PN} = "bash"
python do_package_prepend() { 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}" B = "${WORKDIR}/${BPN}-${PV}"

4
meta-oe/recipes-support/opencv/opencv_3.4.3.bb
View File

@ -20,7 +20,7 @@ SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5
def ipp_filename(d): def ipp_filename(d):
import re import re
arch = d.getVar('TARGET_ARCH', True) arch = d.getVar('TARGET_ARCH')
if re.match("i.86$", arch): if re.match("i.86$", arch):
return "ippicv_2017u3_lnx_ia32_general_20180518.tgz" return "ippicv_2017u3_lnx_ia32_general_20180518.tgz"
else: else:
@ -28,7 +28,7 @@ def ipp_filename(d):
def ipp_md5sum(d): def ipp_md5sum(d):
import re import re
arch = d.getVar('TARGET_ARCH', True) arch = d.getVar('TARGET_ARCH')
if re.match("i.86$", arch): if re.match("i.86$", arch):
return "ea72de74dae3c604eb6348395366e78e" return "ea72de74dae3c604eb6348395366e78e"
else: else: