waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"
PATCH 1/2 waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"
Waf doesn't handle -l. Use a function already provided by waf.bbclass in OE-Core. Inheriting waf.bbclass also makes overriding DISABLE_STATIC redundant, so drop it from recipes inheriting waf-samba.
Signed-off-by Andreas Oberritter <[email protected]>
--- meta-networking/classes/waf-samba.bbclass | 4 ++-- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 - meta-networking/recipes-support/libldb/libldb_1.1.29.bb | 1 - meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb | 1 - meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb | 1 - meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb | 1 - 6 files changed, 2 insertions(+), 7 deletions(-)
meta-networking/classes/waf-samba.bbclass +2 -2
@@ -1,7 +1,7 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf # -inherit qemu pythonnative +inherit qemu pythonnative waf DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python"
@@ -86,7 +86,7 @@ do_configure() { } do_compile () { - python ./buildtools/bin/waf ${PARALLEL_MAKE} + python ./buildtools/bin/waf ${@get_waf_parallel_make(d)} } do_install() {
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0 -1
@@ -94,7 +94,6 @@ EXTRA_OECONF += "--enable-fhs \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-pam --with-pammodulesdir=${base_libdir}/security \ " -DISABLE_STATIC = "" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
meta-networking/recipes-support/libldb/libldb_1.1.29.bb +0 -1
@@ -44,7 +44,6 @@ EXTRA_OECONF += "--disable-rpath \ --with-privatelibdir=${libdir}/ldb \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -DISABLE_STATIC = "" PACKAGES += "pyldb pyldb-dbg pyldb-dev"
meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb +0 -1
@@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \ --disable-silent-rules \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -DISABLE_STATIC = "" PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev"
meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb +0 -1
@@ -33,7 +33,6 @@ EXTRA_OECONF += "--disable-rpath \ --builtin-libraries=replace \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -DISABLE_STATIC = "" PACKAGES += "tdb-tools python-tdb python-tdb-dbg"
meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb +0 -1
@@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ " -DISABLE_STATIC = "" PACKAGES += "python-tevent python-tevent-dbg"
Signature · 1 line
2.7.4
PATCH 2/2 samba: conditionalize sed call for onnode
| sed: can't read .../4.4.5-r0/image/usr/bin/onnode: No such file or directory
Signed-off-by Andreas Oberritter <[email protected]>
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3 -1
@@ -150,7 +150,9 @@ do_install_append() { done # fix file-rdeps qa warning - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log }
Signature · 1 line
2.7.4