Skip to content

Commit 99aa19f

Browse files
shr-projectshr-project
committed
recipes: use oe.utils.conditional instead of deprecated base_conditional
Signed-off-by: Martin Jansa <[email protected]>
1 parent 6f53629 commit 99aa19f

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

‎meta-initramfs/recipes-devtools/klibc/klibc-utils.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ do_install() {
4848
ln -s gzip ${D}${base_bindir}/zcat
4949
}
5050

51-
EXTRA_KLIBC_DEPS = "${@base_conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
51+
EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
5252

5353
PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
5454

‎meta-networking/recipes-connectivity/samba/samba_4.7.0.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ EXTRA_OECONF += "--enable-fhs \
119119
--disable-rpath-install \
120120
--with-shared-modules=${SAMBA4_MODULES} \
121121
--bundled-libraries=${SAMBA4_LIBS} \
122-
${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
122+
${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
123123
--with-cluster-support \
124124
--with-profiling-data \
125125
--with-libiconv=${STAGING_DIR_HOST}${prefix} \

‎meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-shared \
6060
--with-defaults \
6161
--with-install-prefix=${D} \
6262
--with-persistent-directory=${localstatedir}/lib/net-snmp \
63-
${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
63+
${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
6464
"
6565

6666
# net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp

‎meta-oe/recipes-devtools/php/php.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-mbstring \
6060
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
6161
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
6262
--with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
63-
${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
63+
${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
6464
${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
6565
${COMMON_EXTRA_OECONF} \
6666
"

‎meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ S = "${WORKDIR}/git"
2020
inherit cmake
2121

2222
EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
23-
${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
24-
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
23+
${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
24+
${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
2525
"
2626

2727
LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

‎meta-oe/recipes-kernel/linux/linux.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CMDLINE_DEBUG ?= "loglevel=3"
1616

1717
# Kernel bootlogo is distro-specific (default is OE logo).
1818
# Logo resolution (qvga, vga, ...) is machine-specific.
19-
LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
19+
LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
2020
# To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
2121
# to your kernel recipe, and then structure your logos for each resolution
2222
# accordingly.

‎meta-oe/recipes-support/mongodb/mongodb_git.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \
5858
--use-system-zlib \
5959
--js-engine=none \
6060
--nostrip \
61-
--endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
61+
--endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
6262
${PACKAGECONFIG_CONFARGS} \
6363
mongod mongos"
6464

‎meta-oe/recipes-support/opencv/opencv_3.3.bb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
8282
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
8383
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
8484
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
85-
${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
86-
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
85+
${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
86+
${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
8787
"
8888
EXTRA_OECMAKE_append_x86 = " -DX86=ON"
8989

‎meta-oe/recipes-support/syslog-ng/syslog-ng.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ EXTRA_OECONF = " \
4141
"
4242

4343
CONFIG_TLS = "--enable-thread-tls"
44-
CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
44+
CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
4545

4646
PACKAGECONFIG ??= " \
4747
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \
@@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf"
101101

102102
# syslog initscript is handled explicitly because order of
103103
# update-rc.d and update-alternatives is important
104-
RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
104+
RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
105105

106106
RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog"
107107

‎meta-webserver/recipes-httpd/nginx/nginx.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ do_configure () {
5151

5252
./configure \
5353
--crossbuild=Linux:${TUNE_ARCH} \
54-
--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
54+
--with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
5555
--with-int=4 \
5656
--with-long=${PTRSIZE} \
5757
--with-long-long=8 \

0 commit comments

Comments
 (0)