mirror of
https://git.yoctoproject.org/poky
synced 2026-07-25 18:57:02 +00:00
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
08a38a7865
commit
4c14b09498
@@ -44,7 +44,7 @@ do_compile_ptest () {
|
||||
oe_runmake buildtest-TESTS rootfs
|
||||
}
|
||||
|
||||
INHIBIT_PACKAGE_STRIP = "${@base_contains("DISTRO_FEATURES", "ptest", "1", "0", d)}"
|
||||
INHIBIT_PACKAGE_STRIP = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "1", "0", d)}"
|
||||
INSANE_SKIP_${PN}-ptest = "arch"
|
||||
|
||||
inherit update-alternatives
|
||||
|
||||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.latencytop.org/"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
|
||||
|
||||
DEPENDS = "virtual/libintl ncurses glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
|
||||
DEPENDS = "virtual/libintl ncurses glib-2.0 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
|
||||
|
||||
PR = "r3"
|
||||
|
||||
@@ -15,7 +15,7 @@ SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
|
||||
SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
|
||||
SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
|
||||
|
||||
EXTRA_OEMAKE_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}"
|
||||
EXTRA_OEMAKE_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}"
|
||||
|
||||
CFLAGS += "${LDFLAGS}"
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
|
||||
# entire image as -O0, we override it with -O2 here and give a note about it.
|
||||
def get_optimization(d):
|
||||
selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
|
||||
if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
|
||||
if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
|
||||
bb.note("systemtap can't be built with -O0, -O2 will be used instead.")
|
||||
return selected_optimization.replace("-O0", "-O2")
|
||||
return selected_optimization
|
||||
|
||||
Reference in New Issue
Block a user