mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
meta-oe: Remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Signed-off-by: Akash Hadke <akash.hadke27@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
66ec168505
commit
198cf66134
@@ -120,7 +120,7 @@ python do_create_v8_qemu_wrapper () {
|
|||||||
on the host."""
|
on the host."""
|
||||||
qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'),
|
qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'),
|
||||||
d.expand('${STAGING_DIR_HOST}${base_libdir}')]
|
d.expand('${STAGING_DIR_HOST}${base_libdir}')]
|
||||||
qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True),
|
qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'),
|
||||||
qemu_libdirs)
|
qemu_libdirs)
|
||||||
wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh')
|
wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh')
|
||||||
with open(wrapper_path, 'w') as wrapper_file:
|
with open(wrapper_path, 'w') as wrapper_file:
|
||||||
|
|||||||
@@ -19,14 +19,14 @@ RPROVIDES:${PN} = "mongoose graphblas"
|
|||||||
# the command line. To get around this problem, set these variables to only the
|
# the command line. To get around this problem, set these variables to only the
|
||||||
# program name and prepend the rest of the value onto the corresponding FLAGS
|
# program name and prepend the rest of the value onto the corresponding FLAGS
|
||||||
# variable.
|
# variable.
|
||||||
CFLAGS:prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} "
|
CFLAGS:prepend := "${@" ".join(d.getVar('CC').split()[1:])} "
|
||||||
export CC := "${@d.getVar('CC', True).split()[0]}"
|
export CC := "${@d.getVar('CC').split()[0]}"
|
||||||
|
|
||||||
CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} "
|
CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX').split()[1:])} "
|
||||||
export CXX := "${@d.getVar('CXX', True).split()[0]}"
|
export CXX := "${@d.getVar('CXX').split()[0]}"
|
||||||
|
|
||||||
LDFLAGS:prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} "
|
LDFLAGS:prepend := "${@" ".join(d.getVar('LD').split()[1:])} "
|
||||||
export LD := "${@d.getVar('LD', True).split()[0]}"
|
export LD := "${@d.getVar('LD').split()[0]}"
|
||||||
|
|
||||||
export CMAKE_OPTIONS = " \
|
export CMAKE_OPTIONS = " \
|
||||||
-DCMAKE_INSTALL_PREFIX=${D}${prefix} \
|
-DCMAKE_INSTALL_PREFIX=${D}${prefix} \
|
||||||
|
|||||||
@@ -23,7 +23,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}"
|
||||||
|
|||||||
@@ -65,5 +65,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|||||||
# Even though the libusbip is set to version 0.0.1, set the package version to match kernel
|
# Even though the libusbip is set to version 0.0.1, set the package version to match kernel
|
||||||
# e.g. usbip-tools-5.14.21-r0.qemux86_64.rpm for qemu package using kernel 5.14.21
|
# e.g. usbip-tools-5.14.21-r0.qemux86_64.rpm for qemu package using kernel 5.14.21
|
||||||
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])
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user