[PATCH 00/14] mete-oe Jethro-next

[PATCH 00/14] mete-oe Jethro-next

[Armin Kuster]

Please consider these changes for jethro-next

The following changes since commit 4fdb203c182dae6f451ca131c0edfd5f0c99fc28:

  vlc: add PACKAGECONFIG for samba, upnp, dvdnav, sftp, vorbis, dc1394, dv1394, svg, svgdec (2015-11-16 21:57:48 +0100)

are available in the git repository at:

  git://github.com/akuster/meta-openembedded akuster/jethro-next
  https://github.com/akuster/meta-openembedded/tree/akuster/jethro-next

Armin Kuster (1):
  tmux: Fix QA issue

Christopher Larson (1):
  ctdb: rdep on bash

Jackie Huang (2):
  netmap-modules: make deterministic builds for drivers
  netmap-modules: Modules may not have the same arch as userspace

Jian Liu (1):
  ypbind-mt: set path of ypdomainname in ypbind script

Li Xin (2):
  net-snmp: Modify snmpd.service
  opensaf: remove unused service file

Rafaël Carré (1):
  net-snmp: fix cross compilation

Robert Yang (1):
  netcat: add DESCRIPTION

Roy Li (4):
  lldpd: configure the systemd unit file dir
  ufw: improve RRECOMMENDS
  dovecot: add PACKAGECONFIG for lz4
  pure-ftpd: add PACKAGECONFIG for libsodium

Yue Tao (1):
  netcat-openbsd: replace patch with quilt

 .../recipes-connectivity/ufw/ufw_0.33.bb           |  8 ++++++
 .../recipes-daemons/lldpd/lldpd_0.7.17.bb          |  5 +++-
 .../opensaf/opensaf/plmcboot.service               | 13 ---------
 .../recipes-daemons/opensaf/opensaf/plmcd.service  | 15 -----------
 .../recipes-daemons/opensaf/opensaf_4.6.0.bb       |  6 +----
 .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb  |  2 ++
 .../recipes-kernel/netmap/netmap-modules_git.bb    | 31 +++++++++++++++++++++-
 .../0002-config_os_headers-Error-Fix.patch         | 31 ++++++++++++++++++++++
 .../net-snmp/net-snmp/snmpd.service                |  2 +-
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |  3 +++
 .../recipes-support/dovecot/dovecot_2.2.18.bb      |  1 +
 .../recipes-support/netcat/netcat-openbsd_1.105.bb |  3 ++-
 meta-networking/recipes-support/netcat/netcat.inc  | 10 +++++++
 .../recipes-support/netcat/netcat_0.7.1.bb         |  2 --
 .../recipes-support/nis/files/ypbind.init          | 11 ++++----
 .../recipes-support/nis/ypbind-mt_1.38.bb          |  2 ++
 meta-oe/recipes-extended/tmux/tmux_2.1.bb          |  2 ++
 17 files changed, 103 insertions(+), 44 deletions(-)
 delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service
 delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service
 create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch

-- 
1.9.1

[PATCH 01/14] netcat: add DESCRIPTION

[Armin Kuster]

From: Robert Yang <liezhi.yang@windriver.com>

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-support/netcat/netcat.inc      | 10 ++++++++++
 meta-networking/recipes-support/netcat/netcat_0.7.1.bb |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc
index 9cb243d..91a24a1 100644
--- a/meta-networking/recipes-support/netcat/netcat.inc
+++ b/meta-networking/recipes-support/netcat/netcat.inc
@@ -1,3 +1,13 @@
+SUMMARY = "GNU Netcat"
+HOMEPAGE = "http://netcat.sourceforge.net"
+DESCRIPTION = "A simple Unix utility which reads and writes data across network \
+connections using TCP or UDP protocol.  It is designed to be a reliable \
+'back-end' tool that can be used directly or easily driven by other \
+programs and scripts. At the same time it is a feature-rich network \
+debugging and exploration tool, since it can create almost any kind of \
+connection you would need and has several interesting built-in \
+capabilities."
+
 SECTION = "net"
 inherit update-alternatives gettext
 
diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
index 8710c36..d961af5 100644
--- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
+++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
@@ -1,6 +1,4 @@
 require netcat.inc
-SUMMARY = "GNU Netcat"
-HOMEPAGE = "http://netcat.sourceforge.net"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-- 
1.9.1

[PATCH 02/14] netcat-openbsd: replace patch with quilt

[Armin Kuster]

From: Yue Tao <Yue.Tao@windriver.com>

If run bitbake -c patch -f netcat-openbsd twice, the patch conflict
will happen, so replace the patch with quilt to avoid do_patch failed.

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
index 12409d4..89a646f 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
@@ -20,7 +20,8 @@ do_configure[noexec] = "1"
 
 netcat_do_patch() {
     cd ${S}
-    while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series
+    quilt pop -a || true
+    QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a
 }
 
 python do_patch() {
-- 
1.9.1

[PATCH 03/14] net-snmp: Modify snmpd.service

[Armin Kuster]

From: Li Xin <lixin.fnst@cn.fujitsu.com>

Add "-a" parameter in snmpd.service,it is needed to address logs.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service b/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
index 3b336a0..447683f 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=notify
 Environment=OPTIONS="-Ls0-6d"
 EnvironmentFile=-/etc/default/snmpd
-ExecStart=/usr/sbin/snmpd $OPTIONS -f
+ExecStart=/usr/sbin/snmpd $OPTIONS -a -f
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
-- 
1.9.1

[PATCH 04/14] net-snmp: fix cross compilation

[Armin Kuster]

From: Rafaël Carré <funman@videolan.org>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../0002-config_os_headers-Error-Fix.patch         | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
new file mode 100644
index 0000000..a90ce1f
--- /dev/null
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
@@ -0,0 +1,31 @@
+From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
+Date: Wed, 4 Nov 2015 16:49:30 +0100
+Subject: [PATCH] config_os_headers: Error Fix
+
+ERROR: This autoconf log indicates errors, it looked at host include
+and/or library paths while determining system capabilities.
+---
+ configure.d/config_os_libs2 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
+index 47491e2..e3647f9 100644
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
+     case $target_os in
+     linux*) # Check for libnl (linux)
+         netsnmp_save_CPPFLAGS="$CPPFLAGS"
+-        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
++        CPPFLAGS="$CPPFLAGS"
+         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
+             [AC_CHECK_HEADERS(netlink/netlink.h)
+-            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
++            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
+             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
+         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
+             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
+-- 
+2.5.0
+
-- 
1.9.1

Re: [PATCH 04/14] net-snmp: fix cross compilation

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2822 bytes --]

On Mon, Dec 14, 2015 at 07:33:57AM -0800, Armin Kuster wrote:
> From: Rafaël Carré <funman@videolan.org>
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  .../0002-config_os_headers-Error-Fix.patch         | 31 ++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch

There is another patch for net-snmp in master next, which actually adds
this .patch file to SRC_URI, this change alone doesn't do anything and
shouldn't be backported imho.

> 
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
> new file mode 100644
> index 0000000..a90ce1f
> --- /dev/null
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
> @@ -0,0 +1,31 @@
> +From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
> +Date: Wed, 4 Nov 2015 16:49:30 +0100
> +Subject: [PATCH] config_os_headers: Error Fix
> +
> +ERROR: This autoconf log indicates errors, it looked at host include
> +and/or library paths while determining system capabilities.
> +---
> + configure.d/config_os_libs2 | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
> +index 47491e2..e3647f9 100644
> +--- a/configure.d/config_os_libs2
> ++++ b/configure.d/config_os_libs2
> +@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
> +     case $target_os in
> +     linux*) # Check for libnl (linux)
> +         netsnmp_save_CPPFLAGS="$CPPFLAGS"
> +-        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
> ++        CPPFLAGS="$CPPFLAGS"
> +         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
> +             [AC_CHECK_HEADERS(netlink/netlink.h)
> +-            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
> ++            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
> +             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
> +         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
> +             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
> +-- 
> +2.5.0
> +
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 04/14] net-snmp: fix cross compilation

[akuster808]

On 12/14/2015 08:26 AM, Martin Jansa wrote:
> On Mon, Dec 14, 2015 at 07:33:57AM -0800, Armin Kuster wrote:
>> From: Rafaël Carré <funman@videolan.org>
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>  .../0002-config_os_headers-Error-Fix.patch         | 31 ++++++++++++++++++++++
>>  1 file changed, 31 insertions(+)
>>  create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
> 
> There is another patch for net-snmp in master next, which actually adds
> this .patch file to SRC_URI, this change alone doesn't do anything and
> shouldn't be backported imho.

hmm, I will take a look at that.

thanks,
Armin
> 
>>
>> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
>> new file mode 100644
>> index 0000000..a90ce1f
>> --- /dev/null
>> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
>> @@ -0,0 +1,31 @@
>> +From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
>> +Date: Wed, 4 Nov 2015 16:49:30 +0100
>> +Subject: [PATCH] config_os_headers: Error Fix
>> +
>> +ERROR: This autoconf log indicates errors, it looked at host include
>> +and/or library paths while determining system capabilities.
>> +---
>> + configure.d/config_os_libs2 | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
>> +index 47491e2..e3647f9 100644
>> +--- a/configure.d/config_os_libs2
>> ++++ b/configure.d/config_os_libs2
>> +@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
>> +     case $target_os in
>> +     linux*) # Check for libnl (linux)
>> +         netsnmp_save_CPPFLAGS="$CPPFLAGS"
>> +-        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
>> ++        CPPFLAGS="$CPPFLAGS"
>> +         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
>> +             [AC_CHECK_HEADERS(netlink/netlink.h)
>> +-            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
>> ++            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
>> +             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
>> +         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
>> +             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
>> +-- 
>> +2.5.0
>> +
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> 
> 

Re: [PATCH 04/14] net-snmp: fix cross compilation

[akuster808]

Martin,

On 12/14/2015 08:26 AM, Martin Jansa wrote:
> On Mon, Dec 14, 2015 at 07:33:57AM -0800, Armin Kuster wrote:
>> From: Rafaël Carré <funman@videolan.org>
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>  .../0002-config_os_headers-Error-Fix.patch         | 31 ++++++++++++++++++++++
>>  1 file changed, 31 insertions(+)
>>  create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
> 
> There is another patch for net-snmp in master next, which actually adds
> this .patch file to SRC_URI, this change alone doesn't do anything and
> shouldn't be backported imho.

How long before the fix ( c5d821770a5c71c6a905ca889299f027874e9a98) is
merged to master? I would rather append that commit to jethro than undo
the above  and forget to back port later.  I an pull in more changes
then too and do another pull-request.

- armin
> 
>>
>> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
>> new file mode 100644
>> index 0000000..a90ce1f
>> --- /dev/null
>> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
>> @@ -0,0 +1,31 @@
>> +From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
>> +Date: Wed, 4 Nov 2015 16:49:30 +0100
>> +Subject: [PATCH] config_os_headers: Error Fix
>> +
>> +ERROR: This autoconf log indicates errors, it looked at host include
>> +and/or library paths while determining system capabilities.
>> +---
>> + configure.d/config_os_libs2 | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
>> +index 47491e2..e3647f9 100644
>> +--- a/configure.d/config_os_libs2
>> ++++ b/configure.d/config_os_libs2
>> +@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
>> +     case $target_os in
>> +     linux*) # Check for libnl (linux)
>> +         netsnmp_save_CPPFLAGS="$CPPFLAGS"
>> +-        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
>> ++        CPPFLAGS="$CPPFLAGS"
>> +         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
>> +             [AC_CHECK_HEADERS(netlink/netlink.h)
>> +-            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
>> ++            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
>> +             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
>> +         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
>> +             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
>> +-- 
>> +2.5.0
>> +
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> 
> 

[PATCH 05/14] ypbind-mt: set path of ypdomainname in ypbind script

[Armin Kuster]

From: Jian Liu <jian.liu@windriver.com>

The script ypbind will cause error if using ypdomainname command
provided by busybox. So add RDEPENDCY on yp-tools and change
the path of ypdomainname.

Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-support/nis/files/ypbind.init | 11 ++++++-----
 meta-networking/recipes-support/nis/ypbind-mt_1.38.bb |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-support/nis/files/ypbind.init b/meta-networking/recipes-support/nis/files/ypbind.init
index 244dc78..669c19c 100644
--- a/meta-networking/recipes-support/nis/files/ypbind.init
+++ b/meta-networking/recipes-support/nis/files/ypbind.init
@@ -26,6 +26,7 @@
 
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
+YPDOMAINNAME_bin=/usr/bin/ypdomainname
 
 [ -f /etc/default/ypbind ] && . /etc/default/ypbind
 
@@ -34,14 +35,14 @@ case "$1" in
 	echo -n "Starting ypbind"
 	## If the domainname is not set, skip starting of ypbind
 	## and return with "program not configured"
-        /bin/ypdomainname >/dev/null 2>&1
-        if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+        $YPDOMAINNAME_bin >/dev/null 2>&1
+        if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
            if [ -f /etc/defaultdomain ]; then
              XDOMAINNAME=`cat /etc/defaultdomain`
-             /bin/ypdomainname "$XDOMAINNAME"
+             $YPDOMAINNAME_bin "$XDOMAINNAME"
 	   fi
-           /bin/ypdomainname >/dev/null 2>&1
-           if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+           $YPDOMAINNAME_bin >/dev/null 2>&1
+           if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
 	     # Tell the user this has skipped
 	     echo -n " . . . . . . . . . . No domainname set"
              # service is not configured
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index 5702cd6..d113b82 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -21,6 +21,8 @@ DEPENDS = " \
            yp-tools \
            ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
           "
+RDEPENDS_${PN} += "yp-tools"
+
 # ypbind-mt now provides all the functionality of ypbind
 # and is used in place of it.
 PROVIDES += "ypbind"
-- 
1.9.1

[PATCH 06/14] opensaf: remove unused service file

[Armin Kuster]

From: Li Xin <lixin.fnst@cn.fujitsu.com>

Upstream ships systemd service file plmcboot.service and plmcd.service now,
so we don't need this anymore.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-daemons/opensaf/opensaf/plmcboot.service      | 13 -------------
 .../recipes-daemons/opensaf/opensaf/plmcd.service         | 15 ---------------
 meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb  |  6 +-----
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service
 delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service

diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service b/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service
deleted file mode 100644
index 76ec73a..0000000
--- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=PLMCBOOT Program
-After=network.target
-ConditionPathExists=@SYSCONFDIR@/plmcd.conf
-
-[Service]
-Type=oneshot
-ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -s
-ExecStop=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -x
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service b/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service
deleted file mode 100644
index 1d48e77..0000000
--- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Plmcd Daemon
-Requires=plmcboot.service
-After=network.target plmcboot.service
-ConditionPathExists=@SYSCONFDIR@/plmcd.conf
-
-[Service]
-Type=forking
-ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf
-ExecStartPost=/bin/touch /var/lock/subsys/plmcd
-ExecStopPost=/bin/rm -rf /var/lock/subsys/plmcd
-PIDFile=/var/run/plmcd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb
index 28f4c00..9084524 100644
--- a/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb
+++ b/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb
@@ -15,8 +15,6 @@ inherit autotools useradd systemd pkgconfig
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
            file://install-samples-from-srcdir.patch \
-           file://plmcd.service \
-           file://plmcboot.service \
            file://0001-plmcd-error-fix.patch \
            file://Revert_imma_client_node_replyPending_to_unsigned_char.patch \
            file://Fix_GCC_5.1.0_compiler_warning.patch \
@@ -65,8 +63,6 @@ do_install_append() {
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \
         ${D}${systemd_unitdir}/system
-    install -m 644 ${WORKDIR}/plmc*.service ${D}/${systemd_unitdir}/system
-    sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/plmc*.service
-    sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/plmc*.service
+    install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system
 
 }
-- 
1.9.1

[PATCH 07/14] lldpd: configure the systemd unit file dir

[Armin Kuster]

From: Roy Li <rongqing.li@windriver.com>

configure the systemd unit file dir, otherwise it will be auto-checked
by 'pkg-config --variable=systemdsystemunitdir systemd', but if systemd
is not built firstly, and the the unit file will not be installed, and
lead to below error:
    ERROR: Function failed: SYSTEMD_SERVICE_lldpd value lldpd.service does not exist
and disable sysusersdir, since sysuser is not used currently.

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
index 47d3c38..ba7f09e 100644
--- a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
+++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
@@ -24,7 +24,10 @@ GROUPADD_PARAM_${PN} = "--system lldpd"
 EXTRA_OECONF += "--without-embedded-libevent \
                  --disable-oldies \
                  --with-privsep-user=lldpd \
-                 --with-privsep-group=lldpd"
+                 --with-privsep-group=lldpd \
+                 --with-systemdsystemunitdir=${systemd_system_unitdir} \
+                 --without-sysusersdir \
+"
 
 PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3"
 PACKAGECONFIG[json] = "--with-json,--without-json,jansson"
-- 
1.9.1

[PATCH 08/14] ctdb: rdep on bash

[Armin Kuster]

From: Christopher Larson <chris_larson@mentor.com>

onnode is a shell script with bashisms and bash #!.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index 3731efd..5718c5f 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -41,3 +41,6 @@ do_install_append() {
 SYSTEMD_SERVICE_${PN} = "ctdb.service"
 
 FILES_${PN} += "/run"
+
+# onnode is a shell script with bashisms and bash #!
+RDEPENDS_${PN} += "bash"
-- 
1.9.1

[PATCH 09/14] netmap-modules: make deterministic builds for drivers

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

The driver builds are optional, but for deterministic builds,
we should should be able to explicitly enable/disable the
builds for them in a proper place (maybe in BSP).
But we can't use PACKAGECONFIG since there is no option for
each driver, and the options are:
 --no-drivers    do not compile any driver
 --no-drivers=   do not compile the given drivers (comma sep.)
 --drivers=      only compile the given drivers (comma sep.)

So use NETMAP_DRIVERS to list the needed drivers and add proper
configs to EXTRA_OECONF, the default is no drivers, and all
supported drivers are listed in NETMAP_ALL_DRIVERS.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-kernel/netmap/netmap-modules_git.bb    | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
index 6365fee..23f3094 100644
--- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
+++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
@@ -15,7 +15,31 @@ EXTRA_OECONF = "--kernel-dir=${STAGING_KERNEL_BUILDDIR} \
                 --driver-suffix="-netmap" \
                 "
 
-EXTRA_OECONF += "--no-drivers=ixgbe --no-drivers=virtio_net.c"
+# The driver builds are optional, but for deterministic builds,
+# we should be able to explicitly enable/disable the builds
+# for them in a proper place (maybe in BSP).
+# But we can't use PACKAGECONFIG since there is no option for
+# each driver, and the options are:
+#  --no-drivers    do not compile any driver
+#  --no-drivers=   do not compile the given drivers (comma sep.)
+#  --drivers=      only compile the given drivers (comma sep.)
+#
+# So use NETMAP_DRIVERS and the following python code to add proper
+# configs to EXTRA_OECONF.
+#
+# The default is no-drivers, and all supported drivers are listed
+# in NETMAP_ALL_DRIVERS.
+NETMAP_DRIVERS ??= ""
+NETMAP_ALL_DRIVERS = "ixgbe igb e1000e e1000 veth.c forcedeth.c virtio_net.c r8169.c"
+
+python __anonymous () {
+    drivers_list = d.getVar("NETMAP_DRIVERS", True).split()
+    all_drivers_list = d.getVar("NETMAP_ALL_DRIVERS", True).split()
+    config_drivers = "--drivers=" + ",".join(drivers_list)
+
+    extra_oeconf_drivers = bb.utils.contains_any('NETMAP_DRIVERS', all_drivers_list, config_drivers, '--no-drivers', d)
+    d.appendVar("EXTRA_OECONF", extra_oeconf_drivers)
+}
 
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
-- 
1.9.1

[PATCH 10/14] netmap-modules: Modules may not have the same arch as userspace

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

Kernel modules may not have the same architecture as user space.  So we
tell INSANE_SKIP to skip checking the arch for the modules.  This is
consistent with other kernel modules and the kernel recipe.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-kernel/netmap/netmap-modules_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
index 23f3094..6e6f02c 100644
--- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
+++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
@@ -39,6 +39,11 @@ python __anonymous () {
 
     extra_oeconf_drivers = bb.utils.contains_any('NETMAP_DRIVERS', all_drivers_list, config_drivers, '--no-drivers', d)
     d.appendVar("EXTRA_OECONF", extra_oeconf_drivers)
+
+    # skip the arch test for kernel modules
+    if drivers_list:
+        for driver in drivers_list:
+            d.setVar("INSANE_SKIP_kernel-module-%s-netmap" % bb.utils.prune_suffix(driver, ['.c'], d), "arch")
 }
 
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
-- 
1.9.1

[PATCH 11/14] ufw: improve RRECOMMENDS

[Armin Kuster]

From: Roy Li <rongqing.li@windriver.com>

ufw needs lots of netfilter module to run

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
index 66e917e..19cfe46 100644
--- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
+++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
@@ -30,6 +30,14 @@ RDEPENDS_${PN} = " \
 
 RRECOMMENDS_${PN} = " \
                      kernel-module-ipv6 \
+                     kernel-module-nf-conntrack-ipv6 \
+                     kernel-module-nf-log-common \
+                     kernel-module-nf-log-ipv4 \
+                     kernel-module-nf-log-ipv6 \
+                     kernel-module-nf-addrtype \
+                     kernel-module-nf-limit \
+                     kernel-module-nf-log \
+                     kernel-module-nf-recent \
 "
 
 # Certain items are explicitly put under /lib, not base_libdir when installed.
-- 
1.9.1

[PATCH 12/14] dovecot: add PACKAGECONFIG for lz4

[Armin Kuster]

From: Roy Li <rongqing.li@windriver.com>

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
index 9b5f536..a01ef83 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
@@ -23,6 +23,7 @@ PACKAGECONFIG ??= " \
 
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
 PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap,"
+PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
 
 # From native build in armv7a-hf/eglibc
 CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \
-- 
1.9.1

[PATCH 13/14] pure-ftpd: add PACKAGECONFIG for libsodium

[Armin Kuster]

From: Roy Li <rongqing.li@windriver.com>

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
index fa592dc..c1f1504 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
@@ -18,3 +18,5 @@ SRC_URI[sha256sum] = "7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68
 inherit autotools
 
 EXTRA_OECONF = "--with-minimal"
+PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \
+                       ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium"
-- 
1.9.1

[PATCH 14/14] tmux: Fix QA issue

[Armin Kuster]

WARNING: QA Issue: tmux rdepends on libutempter, but it isn't a build dependency? [build-deps]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/tmux/tmux_2.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/tmux/tmux_2.1.bb b/meta-oe/recipes-extended/tmux/tmux_2.1.bb
index 6e2c88d..2f59898 100644
--- a/meta-oe/recipes-extended/tmux/tmux_2.1.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_2.1.bb
@@ -15,3 +15,5 @@ S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 inherit autotools pkgconfig
+
+RDEPENDS_${PN} = "libutempter"
-- 
1.9.1