Skip to contentSkip to conversation

recipes: use oe.utils.conditional instead of deprecated base_conditional

PATCH In review Martin Jansa 5 participants 7 messages Jan 30, 2018 – Feb 1, 2018

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/1 recipes: use oe.utils.conditional instead of deprecated base_conditional

Signed-off-by Martin Jansa <[email protected]>
---
 meta-initramfs/recipes-devtools/klibc/klibc-utils.inc        | 2 +-
 meta-networking/recipes-connectivity/samba/samba_4.7.0.bb    | 2 +-
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +-
 meta-oe/recipes-devtools/php/php.inc                         | 2 +-
 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb    | 4 ++--
 meta-oe/recipes-kernel/linux/linux.inc                       | 2 +-
 meta-oe/recipes-support/mongodb/mongodb_git.bb               | 2 +-
 meta-oe/recipes-support/opencv/opencv_3.3.bb                 | 4 ++--
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc              | 4 ++--
 meta-webserver/recipes-httpd/nginx/nginx.inc                 | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +1 -1
index 9014f5267f..7df33d64e4 100644
@@ -48,7 +48,7 @@ do_install() {
     ln -s gzip ${D}${base_bindir}/zcat
 }
 
-EXTRA_KLIBC_DEPS = "${@base_conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
+EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
 
 PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +1 -1
index f33c1384bf..686998e5ef 100644
@@ -119,7 +119,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --disable-rpath-install \
                  --with-shared-modules=${SAMBA4_MODULES} \
                  --bundled-libraries=${SAMBA4_LIBS} \
-                 ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
+                 ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
                  --with-cluster-support \
                  --with-profiling-data \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix} \
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -1
index 3c05874690..29cd6b3bf4 100644
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-shared \
                 --with-defaults \
                 --with-install-prefix=${D} \
                 --with-persistent-directory=${localstatedir}/lib/net-snmp \
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
 "
 
 # net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp
meta-oe/recipes-devtools/php/php.inc +1 -1
index e466cdaf61..8394c4f647 100644
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-mbstring \
                 --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
                 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
                 ${COMMON_EXTRA_OECONF} \
 "
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +2 -2
index cbf04734e1..0f798d2334 100644
@@ -20,8 +20,8 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
-                 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
-                 ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+                 ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+                 ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
                 "
 
 LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
meta-oe/recipes-kernel/linux/linux.inc +1 -1
index e200127718..9f14370cd8 100644
@@ -16,7 +16,7 @@ CMDLINE_DEBUG ?= "loglevel=3"
 
 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
-LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
+LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
 # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
 # to your kernel recipe, and then structure your logos for each resolution
 # accordingly.
meta-oe/recipes-support/mongodb/mongodb_git.bb +1 -1
index 0ff7d0b59f..8acbf071b4 100644
@@ -58,7 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \
                  --use-system-zlib \
                  --js-engine=none \
                  --nostrip \
-                 --endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
+                 --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
                  ${PACKAGECONFIG_CONFARGS} \
                  mongod mongos"
meta-oe/recipes-support/opencv/opencv_3.3.bb +2 -2
index 3663d30e92..ca62de7c8f 100644
@@ -82,8 +82,8 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@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)} \
-    ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
-    ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+    ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+    ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +2 -2
index f1bf9b06f6..771cdb1969 100644
@@ -41,7 +41,7 @@ EXTRA_OECONF = " \
 "
 
 CONFIG_TLS = "--enable-thread-tls"
-CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
+CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \

@@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf"
 
 # syslog initscript is handled explicitly because order of
 # update-rc.d and update-alternatives is important
-RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
 
 RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog"
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
index 51523b606f..e6ae52a09f 100644
@@ -51,7 +51,7 @@ do_configure () {
 
     ./configure \
     --crossbuild=Linux:${TUNE_ARCH} \
-    --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
+    --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
     --with-int=4 \
     --with-long=${PTRSIZE} \
     --with-long-long=8 \
Signature · 1 line
2.15.1
#1 lore raw

Hi Martin

I wonder if we can use overrides logic to achieve the same effect here.

Quoted 158 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta-initramfs/recipes-devtools/klibc/klibc-utils.inc        | 2 +-
 meta-networking/recipes-connectivity/samba/samba_4.7.0.bb    | 2 +-
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +-
 meta-oe/recipes-devtools/php/php.inc                         | 2 +-
 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb    | 4 ++--
 meta-oe/recipes-kernel/linux/linux.inc                       | 2 +-
 meta-oe/recipes-support/mongodb/mongodb_git.bb               | 2 +-
 meta-oe/recipes-support/opencv/opencv_3.3.bb                 | 4 ++--
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc              | 4 ++--
 meta-webserver/recipes-httpd/nginx/nginx.inc                 | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +1 -1
index 9014f5267f..7df33d64e4 100644
@@ -48,7 +48,7 @@ do_install() {
     ln -s gzip ${D}${base_bindir}/zcat
 }
 
-EXTRA_KLIBC_DEPS = "${@base_conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
+EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"
 
 PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +1 -1
index f33c1384bf..686998e5ef 100644
@@ -119,7 +119,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --disable-rpath-install \
                  --with-shared-modules=${SAMBA4_MODULES} \
                  --bundled-libraries=${SAMBA4_LIBS} \
-                 ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
+                 ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \
                  --with-cluster-support \
                  --with-profiling-data \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix} \
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -1
index 3c05874690..29cd6b3bf4 100644
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-shared \
                 --with-defaults \
                 --with-install-prefix=${D} \
                 --with-persistent-directory=${localstatedir}/lib/net-snmp \
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \
 "
 
 # net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp
meta-oe/recipes-devtools/php/php.inc +1 -1
index e466cdaf61..8394c4f647 100644
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-mbstring \
                 --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
                 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
                 ${COMMON_EXTRA_OECONF} \
 "
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +2 -2
index cbf04734e1..0f798d2334 100644
@@ -20,8 +20,8 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
-                 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
-                 ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+                 ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+                 ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
                 "
 
 LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
meta-oe/recipes-kernel/linux/linux.inc +1 -1
index e200127718..9f14370cd8 100644
@@ -16,7 +16,7 @@ CMDLINE_DEBUG ?= "loglevel=3"
 
 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
-LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
+LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
 # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
 # to your kernel recipe, and then structure your logos for each resolution
 # accordingly.
meta-oe/recipes-support/mongodb/mongodb_git.bb +1 -1
index 0ff7d0b59f..8acbf071b4 100644
@@ -58,7 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \
                  --use-system-zlib \
                  --js-engine=none \
                  --nostrip \
-                 --endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
+                 --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
                  ${PACKAGECONFIG_CONFARGS} \
                  mongod mongos"
meta-oe/recipes-support/opencv/opencv_3.3.bb +2 -2
index 3663d30e92..ca62de7c8f 100644
@@ -82,8 +82,8 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@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)} \
-    ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
-    ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+    ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+    ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +2 -2
index f1bf9b06f6..771cdb1969 100644
@@ -41,7 +41,7 @@ EXTRA_OECONF = " \
 "
 
 CONFIG_TLS = "--enable-thread-tls"
-CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
+CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \

@@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf"
 
 # syslog initscript is handled explicitly because order of
 # update-rc.d and update-alternatives is important
-RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
 
 RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog"
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
index 51523b606f..e6ae52a09f 100644
@@ -51,7 +51,7 @@ do_configure () {
 
     ./configure \
     --crossbuild=Linux:${TUNE_ARCH} \
-    --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
+    --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
     --with-int=4 \
     --with-long=${PTRSIZE} \
     --with-long-long=8 \
author
#2 lore raw

I've merged it now to unblock people doing the builds as discussed on meta-oe github and also meta-raspberrypi github.

Khem, I'm not sure which instance of this you were referring to, maybe the TARGET_ARCH one in samba? Feel free to send follow up change for that one.

Quoted 220 lines · Khem Raj

Hi Martin

I wonder if we can use overrides logic to achieve the same effect here.

Quoted 14 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta-initramfs/recipes-devtools/klibc/klibc-utils.inc        | 2 +-
 meta-networking/recipes-connectivity/samba/samba_4.7.0.bb    | 2 +-
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +-
 meta-oe/recipes-devtools/php/php.inc                         | 2 +-
 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb    | 4 ++--
 meta-oe/recipes-kernel/linux/linux.inc                       | 2 +-
 meta-oe/recipes-support/mongodb/mongodb_git.bb               | 2 +-
 meta-oe/recipes-support/opencv/opencv_3.3.bb                 | 4 ++--
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc              | 4 ++--
 meta-webserver/recipes-httpd/nginx/nginx.inc                 | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

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

meta-initramfs/recipes-devtools/klibc/klibc-utils.inc do_install() { · line 51

Quoted 8 lines

index 9014f5267f..7df33d64e4 100644

meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +0 -1
@@ -48,7 +48,7 @@ do_install() {
     ln -s gzip ${D}${base_bindir}/zcat
 }
 
-EXTRA_KLIBC_DEPS = "${@base_conditional('KLIBC_UTILS_VARIANT',

'shared', '${THIS_LIBKLIBC}', '', d)}"

meta-initramfs/recipes-devtools/klibc/klibc-utils.inc do_install() { · line 51

Quoted 1 line
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +1 -0
+EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT',

'shared', '${THIS_LIBKLIBC}', '', d)}"

Review

Quoted 4 lines
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +0 -0
 PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
(quoted diff) +0 -0

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

meta-networking/recipes-connectivity/samba/samba_4.7.0.bb EXTRA_OECONF += "--enable-fhs \ · line 122

Quoted 8 lines

index f33c1384bf..686998e5ef 100644

meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +0 -1
@@ -119,7 +119,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --disable-rpath-install \
                  --with-shared-modules=${SAMBA4_MODULES} \
                  --bundled-libraries=${SAMBA4_LIBS} \
-                 ${@base_conditional('TARGET_ARCH', 'x86_64', '',

'--disable-glusterfs', d)} \

meta-networking/recipes-connectivity/samba/samba_4.7.0.bb EXTRA_OECONF += "--enable-fhs \ · line 122

Quoted 1 line
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +1 -0
+                 ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '',

'--disable-glusterfs', d)} \

Review

Quoted 4 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +0 -0
                  --with-cluster-support \
                  --with-profiling-data \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix} \
(quoted diff) +0 -0

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

meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb EXTRA_OECONF = "--enable-shared \ · line 62

Quoted 7 lines

index 3c05874690..29cd6b3bf4 100644

meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +0 -0
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-shared \
                 --with-defaults \
                 --with-install-prefix=${D} \
                 --with-persistent-directory=${localstatedir}/lib/net-snmp

\

meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb EXTRA_OECONF = "--enable-shared \ · line 63

Quoted 1 line
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +0 -1
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le',

'--with-endianness=little', '--with-endianness=big', d)} \

meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb EXTRA_OECONF = "--enable-shared \ · line 63

Quoted 1 line
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -0
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',

'--with-endianness=little', '--with-endianness=big', d)} \

meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb EXTRA_OECONF = "--enable-shared \ · line 66

Quoted 3 lines
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +0 -0
 "
 
 # net-snmp needs to have mib-modules=smux enabled to enable quagga to

support snmp

Review

Quoted 1 line
(quoted diff) +0 -0

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

meta-oe/recipes-devtools/php/php.inc EXTRA_OECONF = "--enable-mbstring \ · line 62

Quoted 7 lines

index e466cdaf61..8394c4f647 100644

meta-oe/recipes-devtools/php/php.inc +0 -0
@@ -60,7 +60,7 @@ EXTRA_OECONF = "--enable-mbstring \
                 --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}

\

meta-oe/recipes-devtools/php/php.inc EXTRA_OECONF = "--enable-mbstring \ · line 63

Quoted 1 line
meta-oe/recipes-devtools/php/php.inc +0 -1
-                ${@base_conditional('SITEINFO_ENDIANNESS', 'le',

'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \

meta-oe/recipes-devtools/php/php.inc EXTRA_OECONF = "--enable-mbstring \ · line 63

Quoted 1 line
meta-oe/recipes-devtools/php/php.inc +1 -0
+                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',

'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \

meta-oe/recipes-devtools/php/php.inc EXTRA_OECONF = "--enable-mbstring \ · line 64

Quoted 1 line
meta-oe/recipes-devtools/php/php.inc +0 -0
                 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '',

'ac_cv_lib_pam_pam_start=no', d)} \

Review

Quoted 3 lines
meta-oe/recipes-devtools/php/php.inc +0 -0
                 ${COMMON_EXTRA_OECONF} \
 "
(quoted diff) +0 -0

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

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb S = "${WORKDIR}/git" · line 23

Quoted 8 lines

index cbf04734e1..0f798d2334 100644

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +0 -1
@@ -20,8 +20,8 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
-                 ${@base_conditional("libdir", "/usr/lib64",

"-DLIB_SUFFIX=64", "", d)} \

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb S = "${WORKDIR}/git" · line 24

Quoted 1 line
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +0 -1
-                 ${@base_conditional("libdir", "/usr/lib32",

"-DLIB_SUFFIX=32", "", d)} \

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb S = "${WORKDIR}/git" · line 23

Quoted 1 line
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +1 -0
+                 ${@oe.utils.conditional("libdir", "/usr/lib64",

"-DLIB_SUFFIX=64", "", d)} \

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb S = "${WORKDIR}/git" · line 24

Quoted 1 line
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +1 -0
+                 ${@oe.utils.conditional("libdir", "/usr/lib32",

"-DLIB_SUFFIX=32", "", d)} \

meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb S = "${WORKDIR}/git" · line 27

Quoted 3 lines
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +0 -0
                 "
 
 LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES',

'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

Review

Quoted 1 line
(quoted diff) +0 -0

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

meta-oe/recipes-kernel/linux/linux.inc CMDLINE_DEBUG ?= "loglevel=3" · line 19

Quoted 8 lines

index e200127718..9f14370cd8 100644

meta-oe/recipes-kernel/linux/linux.inc +0 -1
@@ -16,7 +16,7 @@ CMDLINE_DEBUG ?= "loglevel=3"
 
 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
-LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen",

"vga", "qvga", d)}'

meta-oe/recipes-kernel/linux/linux.inc CMDLINE_DEBUG ?= "loglevel=3" · line 19

Quoted 1 line
meta-oe/recipes-kernel/linux/linux.inc +1 -0
+LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS",

"bigscreen", "vga", "qvga", d)}'

meta-oe/recipes-kernel/linux/linux.inc CMDLINE_DEBUG ?= "loglevel=3" · line 20

Quoted 1 line
meta-oe/recipes-kernel/linux/linux.inc +0 -0
 # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or

similar

meta-oe/recipes-kernel/linux/linux.inc CMDLINE_DEBUG ?= "loglevel=3" · line 21

Quoted 1 line
meta-oe/recipes-kernel/linux/linux.inc +0 -0
 # to your kernel recipe, and then structure your logos for each

resolution

Review

Quoted 2 lines
meta-oe/recipes-kernel/linux/linux.inc +0 -0
 # accordingly.
(quoted diff) +0 -0

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

meta-oe/recipes-support/mongodb/mongodb_git.bb EXTRA_OESCONS = "--prefix=${D}${prefix} \ · line 61

Quoted 8 lines

index 0ff7d0b59f..8acbf071b4 100644

meta-oe/recipes-support/mongodb/mongodb_git.bb +0 -1
@@ -58,7 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \
                  --use-system-zlib \
                  --js-engine=none \
                  --nostrip \
-                 --endian=${@base_conditional('SITEINFO_ENDIANNESS',

'le', 'little', 'big', d)} \

meta-oe/recipes-support/mongodb/mongodb_git.bb EXTRA_OESCONS = "--prefix=${D}${prefix} \ · line 61

Quoted 1 line
meta-oe/recipes-support/mongodb/mongodb_git.bb +1 -0
+                 --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS',

'le', 'little', 'big', d)} \

Review

Quoted 4 lines
meta-oe/recipes-support/mongodb/mongodb_git.bb +0 -0
                  ${PACKAGECONFIG_CONFARGS} \
                  mongod mongos"
(quoted diff) +0 -0

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

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules

Quoted 4 lines

index 3663d30e92..ca62de7c8f 100644

meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
@@ -82,8 +82,8 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules

\

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 82

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1

-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 83

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1

-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
(quoted diff) +0 -2
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 85

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -1
-    ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "",

d)} \

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 86

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -1
-    ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "",

d)} \

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 85

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +1 -0
+    ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64",

"", d)} \

meta-oe/recipes-support/opencv/opencv_3.3.bb EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules · line 86

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +1 -0
+    ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32",

"", d)} \

Review

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
 "
 EXTRA_OECMAKE_append_x86 = " -DX86=ON"
(quoted diff) +0 -0

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

meta-oe/recipes-support/syslog-ng/syslog-ng.inc EXTRA_OECONF = " \ · line 44

Quoted 8 lines

index f1bf9b06f6..771cdb1969 100644

meta-oe/recipes-support/syslog-ng/syslog-ng.inc +0 -1
@@ -41,7 +41,7 @@ EXTRA_OECONF = " \
 "
 
 CONFIG_TLS = "--enable-thread-tls"
-CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", "

--disable-thread-tls", " --enable-thread-tls", d )}"

meta-oe/recipes-support/syslog-ng/syslog-ng.inc EXTRA_OECONF = " \ · line 44

Quoted 1 line
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +1 -0
+CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", "

--disable-thread-tls", " --enable-thread-tls", d )}"

meta-oe/recipes-support/syslog-ng/syslog-ng.inc CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf

Quoted 4 lines
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +0 -0
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \

@@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf

${sysconfdir}/scl.conf"

meta-oe/recipes-support/syslog-ng/syslog-ng.inc CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf"

Quoted 4 lines
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +0 -1
 # syslog initscript is handled explicitly because order of
 # update-rc.d and update-alternatives is important
-RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT",

"none", "", "update-rc.d", d)}"

meta-oe/recipes-support/syslog-ng/syslog-ng.inc CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf · line 103

Quoted 1 line
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +1 -0
+RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT",

"none", "", "update-rc.d", d)}"

Review

Quoted 4 lines
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +0 -0
 RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog"
(quoted diff) +0 -0

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

meta-webserver/recipes-httpd/nginx/nginx.inc do_configure () { · line 54

Quoted 8 lines

index 51523b606f..e6ae52a09f 100644

meta-webserver/recipes-httpd/nginx/nginx.inc +0 -1
@@ -51,7 +51,7 @@ do_configure () {
 
     ./configure \
     --crossbuild=Linux:${TUNE_ARCH} \
-    --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le',

'little', 'big', d)} \

meta-webserver/recipes-httpd/nginx/nginx.inc do_configure () { · line 54

Quoted 1 line
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -0
+    --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',

'little', 'big', d)} \

meta-webserver/recipes-httpd/nginx/nginx.inc do_configure () { · line 57

Quoted 4 lines
meta-webserver/recipes-httpd/nginx/nginx.inc +0 -0
     --with-int=4 \
     --with-long=${PTRSIZE} \
     --with-long-long=8 \

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#3 lore raw
Quoted 3 lines · Martin Jansa

I've merged it now to unblock people doing the builds as discussed on meta-oe github and also meta-raspberrypi github.

Thank you, it'll be nice to have a working master again

#4 lore raw
Quoted 10 lines · Trevor Woerner
Quoted 3 lines · Martin Jansa

I've merged it now to unblock people doing the builds as discussed on meta-oe github and also meta-raspberrypi github.

Thank you, it'll be nice to have a working master again

Should be fixed now.

--
Andrei Gherzan

#5 lore raw
Quoted 5 lines · Andrei Gherzan
Quoted 3 lines · Trevor Woerner

On Thu, Feb 1, 2018 at 8:51 AM, Martin Jansa <[email protected]> wrote:

Quoted 9 lines
Quoted 7 lines
Quoted 3 lines

I've merged it now to unblock people doing the builds as discussed on meta-oe github and also meta-raspberrypi github.

Thank you, it'll be nice to have a working master again

Should be fixed now.

Martin,

Any chance you can merge this to master-next? No reason to leave that branch busted.

Thanks,
Mark

Quoted 7 lines

--
Andrei Gherzan
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#6 lore raw

I didn't want to disrupt Armin's work flow more than I already did, but I've rebased and pushed updated master-next now.

Quoted 33 lines · Mark Asselstine
Quoted 1 line · Andrei Gherzan

On Thu, Feb 1, 2018 at 2:22 PM, Trevor Woerner <[email protected]>

Quoted 4 lines · wrote:
Quoted 4 lines

On Thu, Feb 1, 2018 at 8:51 AM, Martin Jansa <[email protected]> wrote:

Quoted 9 lines
Quoted 7 lines
Quoted 3 lines

I've merged it now to unblock people doing the builds as discussed on meta-oe github and also meta-raspberrypi github.

Thank you, it'll be nice to have a working master again

Should be fixed now.

Martin,

Any chance you can merge this to master-next? No reason to leave that branch busted.

Thanks,
Mark

Quoted 7 lines

--
Andrei Gherzan
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel