[oe] [meta-networking][PATCH] update maintainers
Signed-off-by: Joe MacDonald --- meta-networking/MAINTAINERS | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-networking/MAINTAINERS b/meta-networking/MAINTAINERS index bbb2d1b..5c4c4ce 100644 --- a/meta-networking/MAINTAINERS +++ b/meta-networking/MAINTAINERS @@ -26,7 +26,11 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Joe MacDonald +M: Khem Raj +M: "Joe MacDonald (backup)" +L: openembedded-devel@lists.openembedded.org +Q: https://patchwork.openembedded.org/project/oe/ +S: Maintained F: conf F: recipes-* -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v3] bird: initial import
[Re: [oe] [meta-networking][PATCH v3] bird: initial import] On 18.08.17 (Fri
21:17) Stefan BOSAK wrote:
> I have one question related to bbapend custom recipe to bird original
> recipe. I will need to generate customized bird?.conf files through
> own generator, would be following approach sufficient or you have
> another more efficient suggestion as part of bbapend:
>
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> SRC_URI += "file://bird_cfg_generator.sh file://bird_template.cfg"
I don't know what you're looking to accomplish with this, but you could
certainly use that in your own bbappend file and then use it in some way
with a do_install_append() function.
> I have also added one comment in message to proposal from Kem.
>
>
> Thanks.
>
> On Fri, Aug 17, 2018 at 8:25 PM Khem Raj wrote:
>
> On Fri, Aug 17, 2018 at 10:52 AM Joe MacDonald
> wrote:
> >
> > Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
> >
> > Signed-off-by: Joe MacDonald
> > ---
> >
> > v3:
> >- Dropped the v2.0.x series recipe due to issues building IPv6 client
> and
> > server
> >
> >- Reworked v1.6.4 to remove the now-unnecessary .inc file
> >
> >- Added support for building ipv4 and ipv6 clients and servers in a
> single
> > package
> >
> >- Cleaned up variable usage in the recipe
> >
> >- Included full-featured init script
> >
>
> perhaps it will be good to have a systemd script too while you are here.
>
>
> > .../recipes-protocols/bird/bird_1.6.4.bb | 70 +
> > ...-extend-config.sub-to-recognize-musl.patch | 4430 +
> > .../recipes-protocols/bird/files/bird.init| 97 +
> > 3 files changed, 4597 insertions(+)
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > create mode 100644 meta-networking/recipes-protocols/bird/files/
> 0001-musl-extend-config.sub-to-recognize-musl.patch
> > create mode 100644 meta-networking/recipes-protocols/bird/files/
> bird.init
> >
> > diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb b/
> meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > new file mode 100644
> > index 0..90c4e02ae
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > @@ -0,0 +1,70 @@
> > +SUMMARY = "BIRD Internet Routing Daemon"
> > +DESCRIPTION = "\
> > +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of
> routing \
> > +protocols BGP, RIP and OSPF."
> > +HOMEPAGE = "http://bird.network.cz";
> > +SECTION = "console/network"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM = "file://README;beginline=87;endline=103;md5=
> 0efecc23f039022580d0bac9a52f6117"
> > +DEPENDS = "flex-native bison-native ncurses readline"
> > +
> > +inherit autotools
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
> > +SRC_URI[sha256sum] =
> "c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
> > +
> > +EXTRA_OECONF += "\
> > +--enable-pthreads \
> > +"
> > +
> > +do_configure() {
> > +
> > +# IPv4 build
> > +rm -fr ${WORKDIR}/build-ipv4
> > +mkdir -p ${B}
> > +cd ${B}
> > +oe_runconf ${EXTRA_OECONF}
> > +mv ${B} ${WORKDIR}/build-ipv4
> > +
> > +# IPv6 build
> > +rm -fr ${WORKDIR}/build-ipv6
> > +mkdir -p ${B}
> > +cd ${B}
> > +oe_runconf ${EXTRA_OECONF} --enable-ipv6
>
> ipv6 is a distro feature as well. probably make it conditional upon
> that would be nice.
> and this recipe tells me that ipv6 version probably should be an
> separate recipe.
>
> Probably separated recipes would not be needed, just integrate condition based
> on similar approach like (inspired by busybox recipe):
> DO_IPv4 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}"
> DO
Re: [oe] [meta-networking][PATCH v3] bird: initial import
[Re: [oe] [meta-networking][PATCH v3] bird: initial import] On 18.08.17 (Fri
11:25) Khem Raj wrote:
> On Fri, Aug 17, 2018 at 10:52 AM Joe MacDonald
> wrote:
> >
> > Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
> >
> > Signed-off-by: Joe MacDonald
> > ---
> >
> > v3:
> >- Dropped the v2.0.x series recipe due to issues building IPv6 client and
> > server
> >
> >- Reworked v1.6.4 to remove the now-unnecessary .inc file
> >
> >- Added support for building ipv4 and ipv6 clients and servers in a
> > single
> > package
> >
> >- Cleaned up variable usage in the recipe
> >
> >- Included full-featured init script
> >
>
> perhaps it will be good to have a systemd script too while you are here.
I didn't want to do that since that'd be just further mixing the initial
recipe as submitted by Stefan with new development from me, though (I
hope) obviously that was the next step I'd planned for this. At least
the sysvinit files are present in the original tree, a systemd unit file
is brand new.
> > .../recipes-protocols/bird/bird_1.6.4.bb | 70 +
> > ...-extend-config.sub-to-recognize-musl.patch | 4430 +
> > .../recipes-protocols/bird/files/bird.init| 97 +
> > 3 files changed, 4597 insertions(+)
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > create mode 100644
> > meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> > create mode 100644 meta-networking/recipes-protocols/bird/files/bird.init
> >
> > diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > new file mode 100644
> > index 0..90c4e02ae
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > @@ -0,0 +1,70 @@
> > +SUMMARY = "BIRD Internet Routing Daemon"
> > +DESCRIPTION = "\
> > +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of
> > routing \
> > +protocols BGP, RIP and OSPF."
> > +HOMEPAGE = "http://bird.network.cz";
> > +SECTION = "console/network"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM =
> > "file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
> > +DEPENDS = "flex-native bison-native ncurses readline"
> > +
> > +inherit autotools
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
> > +SRC_URI[sha256sum] =
> > "c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
> > +
> > +EXTRA_OECONF += "\
> > +--enable-pthreads \
> > +"
> > +
> > +do_configure() {
> > +
> > +# IPv4 build
> > +rm -fr ${WORKDIR}/build-ipv4
> > +mkdir -p ${B}
> > +cd ${B}
> > +oe_runconf ${EXTRA_OECONF}
> > +mv ${B} ${WORKDIR}/build-ipv4
> > +
> > +# IPv6 build
> > +rm -fr ${WORKDIR}/build-ipv6
> > +mkdir -p ${B}
> > +cd ${B}
> > +oe_runconf ${EXTRA_OECONF} --enable-ipv6
>
> ipv6 is a distro feature as well. probably make it conditional upon
> that would be nice.
Yeah, that's doable.
> and this recipe tells me that ipv6 version probably should be an
> separate recipe.
Based on the comments from Stefan and from the content of the init
script, I don't think that makes sense in this case.
-J.
> > +mv ${B} ${WORKDIR}/build-ipv6
> > +
> > +}
> > +
> > +do_compile() {
> > +
> > +for ver in ipv4 ipv6; do
> > +cd ${WORKDIR}/build-$ver
> > +oe_runmake
> > +done
> > +
> > +}
> > +
> > +do_install() {
> > +for ver in ipv4 ipv6; do
> > +cd ${WORKDIR}/build-$ver
> > +oe_runmake 'DESTDIR=${D}' install
> > +done
> > +install -d ${D}${sysconfdir}/init.d
> > +install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
> > +if [ -d ${D}/run ]; then
> > +rmdir ${D}/run
> > +fi
> > +if [ -d ${D}${localstatedir}/run ]; then
> > +rmdir ${D}${localstatedir}/run
> > +fi
> > +}
> > +
> > +PACKAGES =+ "bird-client
[oe] [meta-networking][PATCH v3] bird: initial import
Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
Signed-off-by: Joe MacDonald
---
v3:
- Dropped the v2.0.x series recipe due to issues building IPv6 client and
server
- Reworked v1.6.4 to remove the now-unnecessary .inc file
- Added support for building ipv4 and ipv6 clients and servers in a single
package
- Cleaned up variable usage in the recipe
- Included full-featured init script
.../recipes-protocols/bird/bird_1.6.4.bb | 70 +
...-extend-config.sub-to-recognize-musl.patch | 4430 +
.../recipes-protocols/bird/files/bird.init| 97 +
3 files changed, 4597 insertions(+)
create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
create mode 100644
meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
create mode 100644 meta-networking/recipes-protocols/bird/files/bird.init
diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
new file mode 100644
index 0..90c4e02ae
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
@@ -0,0 +1,70 @@
+SUMMARY = "BIRD Internet Routing Daemon"
+DESCRIPTION = "\
+BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing \
+protocols BGP, RIP and OSPF."
+HOMEPAGE = "http://bird.network.cz";
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
+DEPENDS = "flex-native bison-native ncurses readline"
+
+inherit autotools
+
+SRC_URI = "\
+ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
+file://bird.init \
+file://0001-musl-extend-config.sub-to-recognize-musl.patch \
+"
+SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
+SRC_URI[sha256sum] =
"c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
+
+EXTRA_OECONF += "\
+--enable-pthreads \
+"
+
+do_configure() {
+
+# IPv4 build
+rm -fr ${WORKDIR}/build-ipv4
+mkdir -p ${B}
+cd ${B}
+oe_runconf ${EXTRA_OECONF}
+mv ${B} ${WORKDIR}/build-ipv4
+
+# IPv6 build
+rm -fr ${WORKDIR}/build-ipv6
+mkdir -p ${B}
+cd ${B}
+oe_runconf ${EXTRA_OECONF} --enable-ipv6
+mv ${B} ${WORKDIR}/build-ipv6
+
+}
+
+do_compile() {
+
+for ver in ipv4 ipv6; do
+cd ${WORKDIR}/build-$ver
+oe_runmake
+done
+
+}
+
+do_install() {
+for ver in ipv4 ipv6; do
+cd ${WORKDIR}/build-$ver
+oe_runmake 'DESTDIR=${D}' install
+done
+install -d ${D}${sysconfdir}/init.d
+install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
+if [ -d ${D}/run ]; then
+rmdir ${D}/run
+fi
+if [ -d ${D}${localstatedir}/run ]; then
+rmdir ${D}${localstatedir}/run
+fi
+}
+
+PACKAGES =+ "bird-client"
+FILES_bird-client = "${sbindir}/birdc*"
+
+RUNIT_SERVICES = "bird"
diff --git
a/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
new file mode 100644
index 0..578f9b6f0
--- /dev/null
+++
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
@@ -0,0 +1,4430 @@
+From 21baaa6870edb68f0a417ea3b4de5c75e5cf5a0d Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Thu, 16 Aug 2018 01:56:05 +
+Subject: [PATCH] musl: update config.guess and config.sub
+
+Just bringing config.guess and config.sub up to date is enough to enable
+musl to build BIRD.
+
+Upstream-Status: Backport
[https://gitlab.labs.nic.cz/labs/bird/commit/822a7ee6d5cd9bf38548026e0dd52fbc4634030d]
+
+Signed-off-by: Joe MacDonald
+---
+ tools/config.guess | 1193 ++---
+ tools/config.sub | 1810 +++-
+ 2 files changed, 1520 insertions(+), 1483 deletions(-)
+
+diff --git a/tools/config.guess b/tools/config.guess
+index da83314..445c406 100755
+--- a/tools/config.guess
b/tools/config.guess
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-# Free Software Foundation, Inc.
++# Copyright 1992-2018 Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2018-06-26'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This progr
Re: [oe] [meta-networking][PATCH v2] bird: initial import
[Re: [oe] [meta-networking][PATCH v2] bird: initial import] On 18.08.16 (Thu
17:02) Khem Raj wrote:
>
>
> On 8/16/18 8:29 AM, Joe MacDonald wrote:
> > Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
> >
> > Signed-off-by: Joe MacDonald
> > ---
> >
> > v2:
> >- adding upstream-status and link to upstream commit accomplishing the
> > same
> > goal.
> >
> > .../recipes-protocols/bird/bird.inc | 32 +
> > .../recipes-protocols/bird/bird_1.6.4.bb |9 +
> > .../recipes-protocols/bird/bird_2.0.2.bb |9 +
> > ...-extend-config.sub-to-recognize-musl.patch | 4430 +
> > .../recipes-protocols/bird/files/bird.init|2 +
> > 5 files changed, 4482 insertions(+)
> > create mode 100644 meta-networking/recipes-protocols/bird/bird.inc
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > create mode 100644
> > meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> > create mode 100755 meta-networking/recipes-protocols/bird/files/bird.init
> >
> > diff --git a/meta-networking/recipes-protocols/bird/bird.inc
> > b/meta-networking/recipes-protocols/bird/bird.inc
> > new file mode 100644
> > index 0..33d17dcb7
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird.inc
> > @@ -0,0 +1,32 @@
> > +SUMMARY = "BIRD Internet Routing Daemon"
> > +DESCRIPTION = "\
> > +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of
> > routing \
> > +protocols BGP, RIP and OSPF."
> > +HOMEPAGE = "http://bird.network.cz";
> > +SECTION = "console/network"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM =
> > "file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
> > +DEPENDS = "flex bison ncurses readline"
> > +
>
> does it need flex and bison on target ? or just native versions
Confirmed in my rework tree now that we only need the native versions.
> > +inherit autotools
> > +
> > +EXTRA_OECONF += "\
> > +--enable-pthreads \
> > +"
> > +
> > +do_configure() {
> > +oe_runconf ${EXTRA_OECONF}
> > +}
> > +
> > +do_install_append() {
> > +install -m 0755 -d ${D}${sysconfdir}/init.d
> > +install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
>
> may be use a single line
>
> install -D -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
I actually prefer this split over two steps since it makes things
cleaner when we inevitably need to change what gets included in our
do_install*(). In my reworked version I've removed the mode set on the
first line, though, to better align with the other examples elsewhere in
the meta-openembedded tree.
> > +rm -rf ${D}/run ${D}/var/run
> > +}
> > +
> > +PACKAGES += " bird-client"
> > +
> > +FILES_${PN} += "/run /var/run"
>
> I think we don't need this
Yeah, we don't need this.
> > +FILES_${PN}-client = "/usr/sbin/birdc*"
> > +
>
> may be use ${sbindir} here
I've fixed this too.
> > +RUNIT_SERVICES = "bird"
> > diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > new file mode 100644
> > index 0..27c62aeee
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > @@ -0,0 +1,9 @@
> > +require bird.inc
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
> > +SRC_URI[sha256sum] =
> > "c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
> > diff --git a/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > new file mode 100644
> > index 0..92d858869
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > @@ -0,0 +1,9 @@
> > +require bird.inc
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "de17645b045fa13912409aea59420132"
> > +SRC_URI[sha256sum] =
> > "035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f"
>
> do we need to maintain both 1.6 and 2.x versions ?
> I guess they must be incompatible with each other and 1.6 still
> deployed. but I would prefer to just maintain latest version
That's a much bigger question, ongoing in the v1 thread.
-J.
signature.asc
Description: PGP signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] bird: initial import
[Re: [meta-networking][PATCH] bird: initial import] On 18.08.17 (Fri 07:51)
Stefan BOSAK wrote:
> Hi Joe and Khem,
>
> @Joe
> I am writting within your message.
>
> @Khem Raj
> In the term of Bird versions:
> - both versions are mutually not compatible (config
> transitions/transformations
> are required), that's correct
> - 1.6.x is production ready (officially supported by many distributions, it is
> kind of LTS, would be/stay maintainable for several next years)
> - 2.0.x would go to production ready mode later (still not supported, sadly i
> do not know about any distribution which is supporting this version)
>
> My suggestion is to import at least version 1.6.x into official repository
> within Yocto ecosystem.
This wouldn't be the first time we've encountered this scenario and
while it's not ideal, I don't see it as a show stopper either. I'd had
it in mind that I'd start with integrating your recipe then move out the
2.0.x version in favour of a git version so we can more easily track
updates (so ultimately it'll look more like the refpolicy recipes in
meta-selinux) but this seems like an okay first step. That said,
there's possibly more to it than just that, in my comments below.
> On Fri, Aug 17, 2018 at 3:31 AM Joe MacDonald
> wrote:
>
> Hi Stefan,
>
> Based on the information you've share here, then, I have some additional
> questions about this, because I'm now not confident I can correlate what
> you've said with what I'm seeing.
>
> [Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu
> 22:56)
> Stefan BOSAK wrote:
>
> > this ipv6 compilation option is still relevant for versions
> > 1.6.x (this is production ready line).
>
> This much makes sense. So the obvious approach, then, would be to
> add --enable-ipv6 to the 1.6.4 recipe's EXTRA_OECONF options and leave
> --enable-pthreads in the bird.inc file.
>
> Exactly, option --enable-ipv6 is specific to versions 1.6.x, it means
> EXTRA_OECONF should have additional extension within recipe only for version
> 1.6.x.
>
>
> When I do, though, the result is not what I would expect based on what
> you're saying below.
>
> First, the output of each of these are:
>
>bird-2.0.2-r0.core2_64
>├── etc
>│ ├── bird.conf
>│ └── init.d
>│ └── bird
>├── usr
>│ └── sbin
>│ ├── bird
>│ ├── birdc
>│ └── birdcl
>└── var
>
> This seems to be not correct, because {bird, birdc}6 are missing.
> There are implementation reasons why authors isolated IPv4 and IPv6
> through dedicated applications/binaries.
>
> See these files (there are no major differences between versions):
> https://gitlab.labs.nic.cz/labs/bird/blob/v2.0.2/misc/bird.init
> https://gitlab.labs.nic.cz/labs/bird/blob/v1.6.4/misc/bird.init
Alright, so based on this I think the recipes need some amount of rework
beyond just the style things Khem requested. At a minimum, I'm going to
replace the bird.init in your original submission with the ones linked
above and I'll review what's happening with the v6 binaries, because it
very much looks like they're not being built in the 2.0.2 recipe.
> and
>
>bird-1.6.4-r0.core2_64
>├── etc
>│ ├── bird6.conf
>│ └── init.d
>│ └── bird
>├── usr
>│ └── sbin
>│ ├── bird6
>│ ├── birdc6
>│ └── birdcl6
>└── var
>
> and if I remove the --enable-ipv6 option from the 1.6.4 recipe I see:
>
>bird-1.6.4-r0.core2_64
>├── etc
>│ ├── bird.conf
>│ └── init.d
>│ └── bird
>├── usr
>│ └── sbin
>│ ├── bird
>│ ├── birdc
>│ └── birdcl
>└── var
>
>
> In this case without setting of --enable-ipv6 compilation option only IPv4
> protocol will be supported which is not sufficient.
>
> > There is also one reminder from my side that there are to be several
> > applications and two independent
> > init scripts needed at least for versions 1.6.x (the same should be for
> 2.0.x):
> > /usr/sbin/{bird,birdc}, /usr/sbin/{birdc,birdc6}; /etc/init.d/{bird,
> bird6}.
>
> So then it almost looks like the --enable-ipv6 option for the 1.6.4
> recipe will only build one of the two versions at a time whereas (maybe)
> the single binary (client or daemon) will provide both ipv4
Re: [oe] [meta-networking][PATCH] bird: initial import
Hi Stefan,
Based on the information you've share here, then, I have some additional
questions about this, because I'm now not confident I can correlate what
you've said with what I'm seeing.
[Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu 22:56)
Stefan BOSAK wrote:
> Hi Joe,
>
> this ipv6 compilation option is still relevant for versions 1.6.x (this is
> production ready line).
> For versions 2.0.x (would go to production ready mode later), you are right,
> it
> has been changed longer time ago
> (given option will be configured internally, no external configuration is
> supported in this scope).
> Within Yocto recipe rules/procedures/processes only bird_1.6.x has to apply
> above mentioned
> compilation configuration attribute to be able to support dual-stack mode
> (IPv4
> & IPv6).
This much makes sense. So the obvious approach, then, would be to
add --enable-ipv6 to the 1.6.4 recipe's EXTRA_OECONF options and leave
--enable-pthreads in the bird.inc file.
When I do, though, the result is not what I would expect based on what
you're saying below.
First, the output of each of these are:
bird-2.0.2-r0.core2_64
├── etc
│ ├── bird.conf
│ └── init.d
│ └── bird
├── usr
│ └── sbin
│ ├── bird
│ ├── birdc
│ └── birdcl
└── var
and
bird-1.6.4-r0.core2_64
├── etc
│ ├── bird6.conf
│ └── init.d
│ └── bird
├── usr
│ └── sbin
│ ├── bird6
│ ├── birdc6
│ └── birdcl6
└── var
and if I remove the --enable-ipv6 option from the 1.6.4 recipe I see:
bird-1.6.4-r0.core2_64
├── etc
│ ├── bird.conf
│ └── init.d
│ └── bird
├── usr
│ └── sbin
│ ├── bird
│ ├── birdc
│ └── birdcl
└── var
> There is also one reminder from my side that there are to be several
> applications and two independent
> init scripts needed at least for versions 1.6.x (the same should be for
> 2.0.x):
> /usr/sbin/{bird,birdc}, /usr/sbin/{birdc,birdc6}; /etc/init.d/{bird, bird6}.
So then it almost looks like the --enable-ipv6 option for the 1.6.4
recipe will only build one of the two versions at a time whereas (maybe)
the single binary (client or daemon) will provide both ipv4 and v6
functionality. Can you help we understand what's happening here? Do we
potentially need two different recipes for each of the v4 and v6
versions of the 1.6.4 recipe?
Thanks,
-Joe.
> As I wrote in my first message I am not Yocto recipe expert (still in kind of
> learning phase), potentially some additional alignment would be needed.
> Bird is one of the best BGP daemon available worldwide and would be really
> great to have this tool within native Yocto ecosystem.
> Again let me say thank you to all contributors and supporters in this scope.
>
> Have a nice day.
>
> Ing. Stefan Bosak
>
> M +421 948 852 092
> E stefan.bo...@gmail.com
>
>
> On Thu, Aug 16, 2018 at 9:45 PM Joe MacDonald
> wrote:
>
> Hi Stefan,
>
> [Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu
> 19:59)
> Stefan BOSAK wrote:
>
> > Hi Joe and other contributors/supporters,
> >
> > i got through changes prepared by Joe, one important configuration
> attribute is
> > missing (--enable-ipv6):
> > meta-networking/recipes-protocols/bird/bird.inc:
> > EXTRA_OECONF += "\
> > --enable-pthreads \
> > --enable-ipv6 \
> > "
> > May I kindly ask you to add above mentioned within changes coming into
> official
> > branches please ?
>
> I had a quick look at the configure options for bird 2.0.2 and I don't
> see --enable-ipv6 listed:
>
>/build/jjm/misc/buildx $ ../bird-2.0.2/configure --enable-ipv6
>configure: WARNING: unrecognized options: --enable-ipv6
>
> It looks like it might have been removed last December maybe from the
> changelog:
>
>commit b5257bea853850809be7f03eb0e1dbb398c56c34
>Author: Ondrej Filip
>Date: Tue Dec 12 10:43:56 2017 +0100
>
>Removed '--enable-ipv6' reference.
>
>
> Are you sure it's still required?
>
> -J.
>
> >
> > Huge thank you for the support to all of you.
> >
> > Have a nice day.
> >
> > Ing. Stefan Bosak
> >
> > M +421 948 852 092
> > E stefan.bo...@gmail.com
> >
> >
> > On Thu, Aug 16, 2018 at 6:19 PM Joe MacDonald
> wrote:
> >
> > [Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu
> 07:06)
>
Re: [oe] [meta-networking][PATCH] bird: initial import
Hi Stefan, [Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu 19:59) Stefan BOSAK wrote: > Hi Joe and other contributors/supporters, > > i got through changes prepared by Joe, one important configuration attribute > is > missing (--enable-ipv6): > meta-networking/recipes-protocols/bird/bird.inc: > EXTRA_OECONF += "\ > --enable-pthreads \ > --enable-ipv6 \ > " > May I kindly ask you to add above mentioned within changes coming into > official > branches please ? I had a quick look at the configure options for bird 2.0.2 and I don't see --enable-ipv6 listed: /build/jjm/misc/buildx $ ../bird-2.0.2/configure --enable-ipv6 configure: WARNING: unrecognized options: --enable-ipv6 It looks like it might have been removed last December maybe from the changelog: commit b5257bea853850809be7f03eb0e1dbb398c56c34 Author: Ondrej Filip Date: Tue Dec 12 10:43:56 2017 +0100 Removed '--enable-ipv6' reference. Are you sure it's still required? -J. > > Huge thank you for the support to all of you. > > Have a nice day. > > Ing. Stefan Bosak > > M +421 948 852 092 > E stefan.bo...@gmail.com > > > On Thu, Aug 16, 2018 at 6:19 PM Joe MacDonald > wrote: > > [Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu > 07:06) > Stefan BOSAK wrote: > > > Hi Joe and other contributors, > > > > thank you very much for your kind support in the term of adding of > > bird (BGP daemon) recipe into meta-networking layer. > > I would like to ask you about expected merge/commit time line into > > official branch(es). > > Generally something like this won't take long to make it into the master > branch. Already released branches are rarely (as a rule never, I would > say) updated with new content. > > -J. > > > > > Thanks. > > > > Have a nice day. > > > > Ing. Stefan Bosak > > > > M +421 948 852 092 > > E stefan.bo...@gmail.com > > > > > > On Thu, Aug 16, 2018 at 4:42 AM Joe MacDonald > wrote: > > > > Initial integration of the two stable BIRD releases, 1.6.4 and > 2.0.2. > > > > Signed-off-by: Joe MacDonald > > --- > > > > This set of recipes came my way quite a while back from Stefan > Bosak. I've > > updated the recipes a bit, made them compile with MUSL and verified > basic > > functionality on x86_64 and qemuarm. > > > > .../recipes-protocols/bird/bird.inc | 32 + > > .../recipes-protocols/bird/bird_1.6.4.bb |9 + > > .../recipes-protocols/bird/bird_2.0.2.bb |9 + > > ...-extend-config.sub-to-recognize-musl.patch | 4428 > + > > .../recipes-protocols/bird/files/bird.init|2 + > > 5 files changed, 4480 insertions(+) > > create mode 100644 meta-networking/recipes-protocols/bird/bird.inc > > create mode 100644 meta-networking/recipes-protocols/bird/ > bird_1.6.4.bb > > create mode 100644 meta-networking/recipes-protocols/bird/ > bird_2.0.2.bb > > create mode 100644 meta-networking/recipes-protocols/bird/files/ > > 0001-musl-extend-config.sub-to-recognize-musl.patch > > create mode 100755 meta-networking/recipes-protocols/bird/files/ > bird.init > > > > diff --git a/meta-networking/recipes-protocols/bird/bird.inc b/ > > meta-networking/recipes-protocols/bird/bird.inc > > new file mode 100644 > > index 0..33d17dcb7 > > --- /dev/null > > +++ b/meta-networking/recipes-protocols/bird/bird.inc > > @@ -0,0 +1,32 @@ > > +SUMMARY = "BIRD Internet Routing Daemon" > > +DESCRIPTION = "\ > > +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of > > routing \ > > +protocols BGP, RIP and OSPF." > > +HOMEPAGE = "http://bird.network.cz"; > > +SECTION = "console/network" > > +LICENSE = "GPLv2" > > +LIC_FILES_CHKSUM = "file://README;beginline=87;endline=103;md5= > > 0efecc23f039022580d0bac9a52f6117" > > +DEPENDS = "flex bison ncurses readline" > > + > > +inherit autotools > > + > > +EXTRA_OECONF += &quo
Re: [oe] [meta-networking][PATCH] bird: initial import
[Re: [meta-networking][PATCH] bird: initial import] On 18.08.16 (Thu 07:06)
Stefan BOSAK wrote:
> Hi Joe and other contributors,
>
> thank you very much for your kind support in the term of adding of
> bird (BGP daemon) recipe into meta-networking layer.
> I would like to ask you about expected merge/commit time line into
> official branch(es).
Generally something like this won't take long to make it into the master
branch. Already released branches are rarely (as a rule never, I would
say) updated with new content.
-J.
>
> Thanks.
>
> Have a nice day.
>
> Ing. Stefan Bosak
>
> M +421 948 852 092
> E stefan.bo...@gmail.com
>
>
> On Thu, Aug 16, 2018 at 4:42 AM Joe MacDonald
> wrote:
>
> Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
>
> Signed-off-by: Joe MacDonald
> ---
>
> This set of recipes came my way quite a while back from Stefan Bosak.
> I've
> updated the recipes a bit, made them compile with MUSL and verified basic
> functionality on x86_64 and qemuarm.
>
> .../recipes-protocols/bird/bird.inc | 32 +
> .../recipes-protocols/bird/bird_1.6.4.bb |9 +
> .../recipes-protocols/bird/bird_2.0.2.bb |9 +
> ...-extend-config.sub-to-recognize-musl.patch | 4428 +
> .../recipes-protocols/bird/files/bird.init|2 +
> 5 files changed, 4480 insertions(+)
> create mode 100644 meta-networking/recipes-protocols/bird/bird.inc
> create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> create mode 100644 meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> create mode 100644 meta-networking/recipes-protocols/bird/files/
> 0001-musl-extend-config.sub-to-recognize-musl.patch
> create mode 100755 meta-networking/recipes-protocols/bird/files/bird.init
>
> diff --git a/meta-networking/recipes-protocols/bird/bird.inc b/
> meta-networking/recipes-protocols/bird/bird.inc
> new file mode 100644
> index 0..33d17dcb7
> --- /dev/null
> +++ b/meta-networking/recipes-protocols/bird/bird.inc
> @@ -0,0 +1,32 @@
> +SUMMARY = "BIRD Internet Routing Daemon"
> +DESCRIPTION = "\
> +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of
> routing \
> +protocols BGP, RIP and OSPF."
> +HOMEPAGE = "http://bird.network.cz";
> +SECTION = "console/network"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://README;beginline=87;endline=103;md5=
> 0efecc23f039022580d0bac9a52f6117"
> +DEPENDS = "flex bison ncurses readline"
> +
> +inherit autotools
> +
> +EXTRA_OECONF += "\
> +--enable-pthreads \
> +"
> +
> +do_configure() {
> +oe_runconf ${EXTRA_OECONF}
> +}
> +
> +do_install_append() {
> +install -m 0755 -d ${D}${sysconfdir}/init.d
> +install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
> +rm -rf ${D}/run ${D}/var/run
> +}
> +
> +PACKAGES += " bird-client"
> +
> +FILES_${PN} += "/run /var/run"
> +FILES_${PN}-client = "/usr/sbin/birdc*"
> +
> +RUNIT_SERVICES = "bird"
> diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb b/
> meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> new file mode 100644
> index 0..27c62aeee
> --- /dev/null
> +++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> @@ -0,0 +1,9 @@
> +require bird.inc
> +
> +SRC_URI = "\
> +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> +file://bird.init \
> +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> +"
> +SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
> +SRC_URI[sha256sum] =
> "c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
> diff --git a/meta-networking/recipes-protocols/bird/bird_2.0.2.bb b/
> meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> new file mode 100644
> index 0..92d858869
> --- /dev/null
> +++ b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> @@ -0,0 +1,9 @@
> +require bird.inc
> +
> +SRC_URI = "\
> +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> +file://bird.init \
> +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> +"
> +SRC_URI[md5sum] = "de17645b045fa13912409aea59420132
Re: [oe] [meta-networking][PATCH] bird: initial import
[Re: [oe] [meta-networking][PATCH] bird: initial import] On 18.08.15 (Wed
20:29) akuster808 wrote:
>
>
> On 08/15/2018 07:42 PM, Joe MacDonald wrote:
> > Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
> >
> > Signed-off-by: Joe MacDonald
> > ---
> >
> > This set of recipes came my way quite a while back from Stefan Bosak. I've
> > updated the recipes a bit, made them compile with MUSL and verified basic
> > functionality on x86_64 and qemuarm.
> >
> > .../recipes-protocols/bird/bird.inc | 32 +
> > .../recipes-protocols/bird/bird_1.6.4.bb |9 +
> > .../recipes-protocols/bird/bird_2.0.2.bb |9 +
> > ...-extend-config.sub-to-recognize-musl.patch | 4428 +
> > .../recipes-protocols/bird/files/bird.init|2 +
> > 5 files changed, 4480 insertions(+)
> > create mode 100644 meta-networking/recipes-protocols/bird/bird.inc
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > create mode 100644 meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > create mode 100644
> > meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> > create mode 100755 meta-networking/recipes-protocols/bird/files/bird.init
> >
> > diff --git a/meta-networking/recipes-protocols/bird/bird.inc
> > b/meta-networking/recipes-protocols/bird/bird.inc
> > new file mode 100644
> > index 0..33d17dcb7
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird.inc
> > @@ -0,0 +1,32 @@
> > +SUMMARY = "BIRD Internet Routing Daemon"
> > +DESCRIPTION = "\
> > +BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of
> > routing \
> > +protocols BGP, RIP and OSPF."
> > +HOMEPAGE = "http://bird.network.cz";
> > +SECTION = "console/network"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM =
> > "file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
> > +DEPENDS = "flex bison ncurses readline"
> > +
> > +inherit autotools
> > +
> > +EXTRA_OECONF += "\
> > +--enable-pthreads \
> > +"
> > +
> > +do_configure() {
> > +oe_runconf ${EXTRA_OECONF}
> > +}
> > +
> > +do_install_append() {
> > +install -m 0755 -d ${D}${sysconfdir}/init.d
> > +install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
> > +rm -rf ${D}/run ${D}/var/run
> > +}
> > +
> > +PACKAGES += " bird-client"
> > +
> > +FILES_${PN} += "/run /var/run"
> > +FILES_${PN}-client = "/usr/sbin/birdc*"
> > +
> > +RUNIT_SERVICES = "bird"
> > diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > new file mode 100644
> > index 0..27c62aeee
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
> > @@ -0,0 +1,9 @@
> > +require bird.inc
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
> > +SRC_URI[sha256sum] =
> > "c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
> > diff --git a/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > new file mode 100644
> > index 0..92d858869
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
> > @@ -0,0 +1,9 @@
> > +require bird.inc
> > +
> > +SRC_URI = "\
> > +ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
> > +file://bird.init \
> > +file://0001-musl-extend-config.sub-to-recognize-musl.patch \
> > +"
> > +SRC_URI[md5sum] = "de17645b045fa13912409aea59420132"
> > +SRC_URI[sha256sum] =
> > "035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f"
> > diff --git
> > a/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> >
> > b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> > new file mode 100644
> > index 0..4feb7f786
> > --- /dev/null
> > +++
> > b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
> > @@ -0,0 +1,4428 @@
> > +From 21baaa6870edb68f0a417ea3b4de5c75e5cf5a0d Mon Sep 17 00:00:00 2001
> > +From: Joe MacDonald
> > +Date: Thu, 16 Aug 2018 01:56:05 +
> > +Subject: [PATCH] musl: update config.guess and config.sub
> > +
> > +Just bringing config.guess and config.sub up to date is enough to enable
> > +musl to build BIRD.
> Think "Upstream-Status:" is missing
Oop, you're right. I should've caught that since I intend to send this
upstream, too.
-J.
signature.asc
Description: PGP signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2] bird: initial import
Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
Signed-off-by: Joe MacDonald
---
v2:
- adding upstream-status and link to upstream commit accomplishing the same
goal.
.../recipes-protocols/bird/bird.inc | 32 +
.../recipes-protocols/bird/bird_1.6.4.bb |9 +
.../recipes-protocols/bird/bird_2.0.2.bb |9 +
...-extend-config.sub-to-recognize-musl.patch | 4430 +
.../recipes-protocols/bird/files/bird.init|2 +
5 files changed, 4482 insertions(+)
create mode 100644 meta-networking/recipes-protocols/bird/bird.inc
create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
create mode 100644 meta-networking/recipes-protocols/bird/bird_2.0.2.bb
create mode 100644
meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
create mode 100755 meta-networking/recipes-protocols/bird/files/bird.init
diff --git a/meta-networking/recipes-protocols/bird/bird.inc
b/meta-networking/recipes-protocols/bird/bird.inc
new file mode 100644
index 0..33d17dcb7
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird.inc
@@ -0,0 +1,32 @@
+SUMMARY = "BIRD Internet Routing Daemon"
+DESCRIPTION = "\
+BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing \
+protocols BGP, RIP and OSPF."
+HOMEPAGE = "http://bird.network.cz";
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
+DEPENDS = "flex bison ncurses readline"
+
+inherit autotools
+
+EXTRA_OECONF += "\
+--enable-pthreads \
+"
+
+do_configure() {
+oe_runconf ${EXTRA_OECONF}
+}
+
+do_install_append() {
+install -m 0755 -d ${D}${sysconfdir}/init.d
+install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
+rm -rf ${D}/run ${D}/var/run
+}
+
+PACKAGES += " bird-client"
+
+FILES_${PN} += "/run /var/run"
+FILES_${PN}-client = "/usr/sbin/birdc*"
+
+RUNIT_SERVICES = "bird"
diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
new file mode 100644
index 0..27c62aeee
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
@@ -0,0 +1,9 @@
+require bird.inc
+
+SRC_URI = "\
+ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
+file://bird.init \
+file://0001-musl-extend-config.sub-to-recognize-musl.patch \
+"
+SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
+SRC_URI[sha256sum] =
"c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
diff --git a/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
new file mode 100644
index 0..92d858869
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
@@ -0,0 +1,9 @@
+require bird.inc
+
+SRC_URI = "\
+ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
+file://bird.init \
+file://0001-musl-extend-config.sub-to-recognize-musl.patch \
+"
+SRC_URI[md5sum] = "de17645b045fa13912409aea59420132"
+SRC_URI[sha256sum] =
"035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f"
diff --git
a/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
new file mode 100644
index 0..578f9b6f0
--- /dev/null
+++
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
@@ -0,0 +1,4430 @@
+From 21baaa6870edb68f0a417ea3b4de5c75e5cf5a0d Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Thu, 16 Aug 2018 01:56:05 +
+Subject: [PATCH] musl: update config.guess and config.sub
+
+Just bringing config.guess and config.sub up to date is enough to enable
+musl to build BIRD.
+
+Upstream-Status: Backport
[https://gitlab.labs.nic.cz/labs/bird/commit/822a7ee6d5cd9bf38548026e0dd52fbc4634030d]
+
+Signed-off-by: Joe MacDonald
+---
+ tools/config.guess | 1193 ++---
+ tools/config.sub | 1810 +++-
+ 2 files changed, 1520 insertions(+), 1483 deletions(-)
+
+diff --git a/tools/config.guess b/tools/config.guess
+index da83314..445c406 100755
+--- a/tools/config.guess
b/tools/config.guess
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-# Free Software Foundation, Inc.
++# Copyright 1992-2018 Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2018-06-26'
+
+ # This file is free software; you can redistribute it and/or mod
[oe] [meta-networking][PATCH] bird: initial import
Initial integration of the two stable BIRD releases, 1.6.4 and 2.0.2.
Signed-off-by: Joe MacDonald
---
This set of recipes came my way quite a while back from Stefan Bosak. I've
updated the recipes a bit, made them compile with MUSL and verified basic
functionality on x86_64 and qemuarm.
.../recipes-protocols/bird/bird.inc | 32 +
.../recipes-protocols/bird/bird_1.6.4.bb |9 +
.../recipes-protocols/bird/bird_2.0.2.bb |9 +
...-extend-config.sub-to-recognize-musl.patch | 4428 +
.../recipes-protocols/bird/files/bird.init|2 +
5 files changed, 4480 insertions(+)
create mode 100644 meta-networking/recipes-protocols/bird/bird.inc
create mode 100644 meta-networking/recipes-protocols/bird/bird_1.6.4.bb
create mode 100644 meta-networking/recipes-protocols/bird/bird_2.0.2.bb
create mode 100644
meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
create mode 100755 meta-networking/recipes-protocols/bird/files/bird.init
diff --git a/meta-networking/recipes-protocols/bird/bird.inc
b/meta-networking/recipes-protocols/bird/bird.inc
new file mode 100644
index 0..33d17dcb7
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird.inc
@@ -0,0 +1,32 @@
+SUMMARY = "BIRD Internet Routing Daemon"
+DESCRIPTION = "\
+BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing \
+protocols BGP, RIP and OSPF."
+HOMEPAGE = "http://bird.network.cz";
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://README;beginline=87;endline=103;md5=0efecc23f039022580d0bac9a52f6117"
+DEPENDS = "flex bison ncurses readline"
+
+inherit autotools
+
+EXTRA_OECONF += "\
+--enable-pthreads \
+"
+
+do_configure() {
+oe_runconf ${EXTRA_OECONF}
+}
+
+do_install_append() {
+install -m 0755 -d ${D}${sysconfdir}/init.d
+install -m 0755 ${WORKDIR}/bird.init ${D}${sysconfdir}/init.d/bird
+rm -rf ${D}/run ${D}/var/run
+}
+
+PACKAGES += " bird-client"
+
+FILES_${PN} += "/run /var/run"
+FILES_${PN}-client = "/usr/sbin/birdc*"
+
+RUNIT_SERVICES = "bird"
diff --git a/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
new file mode 100644
index 0..27c62aeee
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird_1.6.4.bb
@@ -0,0 +1,9 @@
+require bird.inc
+
+SRC_URI = "\
+ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
+file://bird.init \
+file://0001-musl-extend-config.sub-to-recognize-musl.patch \
+"
+SRC_URI[md5sum] = "d62ec2547338e8d3dfb934b4c7b2faa4"
+SRC_URI[sha256sum] =
"c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0"
diff --git a/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
new file mode 100644
index 0..92d858869
--- /dev/null
+++ b/meta-networking/recipes-protocols/bird/bird_2.0.2.bb
@@ -0,0 +1,9 @@
+require bird.inc
+
+SRC_URI = "\
+ftp://bird.network.cz/pub/${PN}/${PN}-${PV}.tar.gz \
+file://bird.init \
+file://0001-musl-extend-config.sub-to-recognize-musl.patch \
+"
+SRC_URI[md5sum] = "de17645b045fa13912409aea59420132"
+SRC_URI[sha256sum] =
"035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f"
diff --git
a/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
new file mode 100644
index 0..4feb7f786
--- /dev/null
+++
b/meta-networking/recipes-protocols/bird/files/0001-musl-extend-config.sub-to-recognize-musl.patch
@@ -0,0 +1,4428 @@
+From 21baaa6870edb68f0a417ea3b4de5c75e5cf5a0d Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Thu, 16 Aug 2018 01:56:05 +
+Subject: [PATCH] musl: update config.guess and config.sub
+
+Just bringing config.guess and config.sub up to date is enough to enable
+musl to build BIRD.
+
+Signed-off-by: Joe MacDonald
+---
+ tools/config.guess | 1193 ++---
+ tools/config.sub | 1810 +++-
+ 2 files changed, 1520 insertions(+), 1483 deletions(-)
+
+diff --git a/tools/config.guess b/tools/config.guess
+index da83314..445c406 100755
+--- a/tools/config.guess
b/tools/config.guess
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-# Free Software Foundation, Inc.
++# Copyright 1992-2018 Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2018-06-26'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under th
Re: [oe] Splitting meta-oe?
[Re: [oe] Splitting meta-oe?] On 18.02.21 (Wed 09:20) Tom Rini wrote: > On Wed, Feb 21, 2018 at 09:02:53AM -0500, Joe MacDonald wrote: > > [Re: [oe] Splitting meta-oe?] On 18.02.21 (Wed 11:22) Martin Jansa wrote: > > > > > There is good example of inter-layer dependencies from real world: > > > http://lists.openembedded.org/pipermail/openembedded-devel/2017-February/111447.html > > > > > > Do you want > > > A) new git repository meta-libio-socket-ssl-perl so that meta-networking > > > will depend on this on instead of whole meta-perl > > > B) meta-ddclient which will probably depend on both meta-perl and > > > meta-networking > > > C) ddclient and its dependencies in meta-perl > > > D) libio-socket-ssl-perl moved to oe-core, so that next time we can say > > > that oe-core is just like old oe-classic just with a bit less stuff in it > > > > > > Neither of these options is ideal, but meta-networking getting meta-perl > > > dependency is the one which causes fewest issues to OE users. > > > > Yeah, I've been thinking about this and trying to decide what is the > > "right" thing to do here. Because I already have added layer > > dependencies in meta-networking that I didn't originally envision, so > > what's one more that is, as you say, almost certainly in the majority of > > consumers' projects anyway? But it does force a new layer dependency on > > consumers of the meta-networking layer who may not care about ddclient, > > and I'd like to avoid that if possible. > > > > Honestly, now that I'm back from my vacation, I think the right thing is > > to add the dependency and then start thinking about a way to specify > > layer dependencies with greater granularity than on a meta-layer basis. > > Like, there's no question meta-networking depends on core. It's > > nonsense to think of it without that dependency. But it'd be nice to be > > able to specify a layer dependency that only exists if your project > > includes specific recipes out of that layer. > > > > But that kind of mechanism seems highly prone to breakage and likely to > > be highly contentious even if it was shown to be reliable, so it may not > > get beyond a "that'd be nice" thing for me. > > > > Unless someone else has already implemented it and I'm just not aware of > > how to use it? :-) > > One thing I've been thinking about is that some layers need more > sub-layers. Taking a very tiny peek into meta-networking, perhaps > re-organize into meta-networking-core, meta-networking-iscsi, > meta-networking-vpn, etc. Or maybe that won't help with dependencies. > But the need for layer X for a single recipe can sometimes I think be > solved by re-thinking the layer. I really like that idea. We effectively started that with the netkit stuff when Armin first submitted it, so making it more formal isn't a big step anyway. > All that said, it might be better instead to add something like > RECIPE_LAYERDEPENDS so that for the one-or-two offs, the recipe will > fail to build (and implement that similar to the logic in > image-container.bbclass? so that you only get a failure on building that > recipe rather than anything in the layer) ? Yeah, that's kind of what I'd been thinking. In the short term, though, the reorg you suggested above sounds *very* appealing to me at first glance. Might be a "let's do both" situation. -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Splitting meta-oe?
yers that reside in > > >>> >>> meta-openbedded just like you have no control over all the other > > >>> layers > > >>> >>> residing in the community. It makes maintaining stable versions > > very > > >>> >>> difficult. Well, unless The Yocto Project takes over them.. I guess > > >>> that > > >>> >>> would work then. > > >>> >>> > > >>> >>>> > > >>> >>>> Another advantage of splitting out the high quality layers is that > > >>> we'd > > >>> >>>> like to look at running more community layers through the Yocto > > >>> >>>> autobuilder, and granular layers make that easier to manage. > > >>> >>> I thought not including layers in bblayers.conf was easy enough. > > >>> >>>> > > >>> >>>> Comments? > > >>> >>> > > >>> >>> What problem do you thing you are trying to solve here? > > >>> >> > > >>> >> My unrelated issues are that I can't update one layer, without > > getting > > >>> >> all of the updates. > > >>> >> .. but that is both a good thing (i.e. they are all tested together, > > >>> >> so you know that the > > >>> >> single SRCREV update is good for all layers), and a bad thing (when > > >>> >> you just want a > > >>> >> new python recipe update from meta-python, but don't want other > > >>> changes). > > >>> >> > > >>> > > > >>> > if you dont include the layers in your BBLAYERS and they become > > >>> > effectively non existent, unless you are on metered internet > > connection, > > >>> > where downloading unused stuff would save you bandwidth, it should be > > >>> > ok. No ? > > >>> > > >>> Its not that. > > >>> > > >>> I *am* building the different layers, but say I have a stable set of > > >>> packages > > >>> and working images .. but for whatever reason, I need an updated > > >>> python- > > >>> package for an unrelated package, or some other layer that needs a > > newer > > >>> version, etc. > > >>> > > >>> How do I get that, without taking updates to all the layers ? .. and > > >>> layers that > > >>> I really didn't want to update. I have to do some sort of combo-layer, > > >>> carry > > >>> my own copy of the recipe, etc. > > >>> > > >>> So there are definitely ways to do it, I'm just pointing out that I > > >>> end up taking > > >>> some build failures/issues from time to time on packages I didn't > > really > > >>> need to update. > > >>> > > >>> The flip side of that argument is that all of the layers and sub layers > > >>> have > > >>> gone through some sort of global build, and hence I know that they all > > >>> have > > >>> worked together for someone. If I can update pieces individually, I > > break > > >>> that .. and I own the broken bits after that .. which again, goes to > > >>> my point that > > >>> fixing one workflow/issue can break another :D > > >>> > > >>> Bruce > > >>> > > >>> > > > >>> >> It is very likely that splitting the layer would help one issue, but > > >>> >> make the other worse. > > >>> >> > > >>> >> So no solution from me, just an observation about potential issue. > > >>> >> > > >>> >> Cheers, > > >>> >> > > >>> >> Bruce > > >>> >> > > >>> >>> > > >>> >>> - armin > > >>> >>>> > > >>> >>>> Ross > > >>> >>> > > >>> >>> > > >>> >>> -- > > >>> >>> ___ > > >>> >>> Openembedded-devel mailing list > > >>> >>> Openembedded-devel@lists.openembedded.org > > >>> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > >>> >> > > >>> >> > > >>> >> > > >>> > > > >>> > > >>> > > >>> > > >>> -- > > >>> "Thou shalt not follow the NULL pointer, for chaos and madness await > > >>> thee at its end" > > >>> -- > > >>> ___ > > >>> Openembedded-devel mailing list > > >>> Openembedded-devel@lists.openembedded.org > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > >>> > > >> > > >> > > > -- > > > ___ > > > Openembedded-devel mailing list > > > Openembedded-devel@lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Splitting meta-oe?
7;t want to update. I have to do some sort of combo-layer, > > carry > > my own copy of the recipe, etc. > > > > So there are definitely ways to do it, I'm just pointing out that I > > end up taking > > some build failures/issues from time to time on packages I didn't really > > need to update. > > > > The flip side of that argument is that all of the layers and sub layers > > have > > gone through some sort of global build, and hence I know that they all have > > worked together for someone. If I can update pieces individually, I break > > that .. and I own the broken bits after that .. which again, goes to > > my point that > > fixing one workflow/issue can break another :D > > > > Bruce > > > > > > > >> It is very likely that splitting the layer would help one issue, but > > >> make the other worse. > > >> > > >> So no solution from me, just an observation about potential issue. > > >> > > >> Cheers, > > >> > > >> Bruce > > >> > > >>> > > >>> - armin > > >>>> > > >>>> Ross > > >>> > > >>> > > >>> -- > > >>> ___ > > >>> Openembedded-devel mailing list > > >>> Openembedded-devel@lists.openembedded.org > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > >> > > >> > > >> > > > > > > > > > > > -- > > "Thou shalt not follow the NULL pointer, for chaos and madness await > > thee at its end" > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Splitting meta-oe?
[[oe] Splitting meta-oe?] On 18.02.20 (Tue 10:45) Burton, Ross wrote: > Hi, > > Is now a good time to talk about splitting up meta-oe? Some layers are > actively developed and maintained (one example: meta-python), others are > basically bitrotting and only get touched when something else causes them > to break world builds (one example: meta-gnome). I've long felt that > meta-oe should be split up and the high quality layers managed in their own > repositories so patches to them don't get held up by breakage in other > sub-layers. Way back when I first proposed creating meta-networking I pitched it as a separate layer managed outside the meta-oe umbrella. At the time I thought it made sense for my use case and for the use case I anticipated from consumers of meta-networking packages both for the reasons you state below and because my intent was to create a layer primarily useful for creating network-centric devices (bridges, firewalls, switches, APs, etc.) with an absolute minimum of other layer dependencies. I think I actually proposed the highly ambitious goal of oe-core + meta-networking as a functional set. Anyway, in the intervening time there's been enough situations crop up that now the minimal set is something like oe-core + meta-oe + meta-perl(we're still open on that, I think) + meta-python + meta-networking. So my original goal of keeping meta-networking largely independent of other layers isn't practical (wasn't from get-go, really) and I'm okay with that. I also think there's considerable value in being able to say "we don't need that recipe in this layer, it's already maintained by someone else in a common area in the same repo, just a different layer". I wouldn't want to start down a path that leads to multiple incompatible versions of recipes being maintained in layers purely out of convenience to the layer maintainer. I can see a lot of value in removing old recipes / layers that aren't being used and / or have fallen far out of date, though. If you've got a list of those you'd like to discuss, I'm sure that's a useful discussion to have. I'll also take the opportunity to plug my old patch for flagging recipes as deprecated (https://patchwork.openembedded.org/series/5489/). It's never gotten any traction, but I think it's a good early-warning for consumers of recipes that are quietly using them with reasonable success as-is despite any issues the maintainers may have with them. Could be a good way to determine who actually cares about these problem child recipes before they become a big enough headache that we just need to abandon them. -J. > Another advantage of splitting out the high quality layers is that we'd > like to look at running more community layers through the Yocto > autobuilder, and granular layers make that easier to manage. > > Comments? > > Ross -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] lldpad: new add
_ALEN];
> +
> + struct agenttimers {
> + /* Tx */
> +diff --git a/lldp_util.c b/lldp_util.c
> +index 754b0cd..304ddc5 100644
> +--- a/lldp_util.c
> b/lldp_util.c
> +@@ -1177,7 +1177,7 @@ int check_link_status(const char *ifname)
> + int get_arg_val_list(char *ibuf, int ilen, int *ioff,
> + char **args, char **argvals)
> + {
> +-u8 arglen;
> ++u8 arglen = 0;
> + u16 argvalue_len;
> + int *arglens = NULL;
> + int *argvallens = NULL;
> +@@ -1245,7 +1245,7 @@ int get_arg_val_list(char *ibuf, int ilen, int *ioff,
> +
> + int get_arg_list(char *ibuf, int ilen, int *ioff, char **args)
> + {
> +-u8 arglen;
> ++u8 arglen = 0;
> + int *arglens = NULL;
> + int *p;
> + int numargs;
> +--
> +2.7.4
> +
> diff --git
> a/meta-networking/recipes-daemons/lldpad/lldpad/0002-Change-CFLAGS-to-avoid-error.patch
>
> b/meta-networking/recipes-daemons/lldpad/lldpad/0002-Change-CFLAGS-to-avoid-error.patch
> new file mode 100644
> index 000..5cb2a0a
> --- /dev/null
> +++
> b/meta-networking/recipes-daemons/lldpad/lldpad/0002-Change-CFLAGS-to-avoid-error.patch
> @@ -0,0 +1,25 @@
> +Subject: [PATCH] Change CFLAGS to avoid error
> +Fix compile error like: warning: this statement may fall
> + through [-Wimplicit-fallthrough=]
> +
> +Signed-off-by: Zheng Ruoqin
> +---
> + Makefile.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 4889d32..321bd7c 100644
> +--- a/Makefile.am
> b/Makefile.am
> +@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4
> + parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error
> +
> + ## system requires a shared libconfig
> +-AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS)
> $(LIBNL_CFLAGS)
> ++AM_CFLAGS = -Wall -Wno-error -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS)
> $(LIBNL_CFLAGS)
> + AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS)
> +
> + ## header files to be installed, for programs using the client interface to
> lldpad
> +--
> +2.7.4
> +
> diff --git a/meta-networking/recipes-daemons/lldpad/lldpad_git.bb
> b/meta-networking/recipes-daemons/lldpad/lldpad_git.bb
> new file mode 100644
> index 000..5203eb1
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/lldpad/lldpad_git.bb
> @@ -0,0 +1,35 @@
> +SUMMARY = "Intel LLDP Agent"
> +DESCRIPTION = "\
> +This package contains the Linux user space daemon and configuration tool for
> \
> +Intel LLDP Agent with Enhanced Ethernet support for the Data Center."
> +
> +HOMEPAGE = "http://open-lldp.org/";
> +SECTION = "System Environment/Daemons"
> +LICENSE = "GPLv2"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162"
> +DEPENDS = "libconfig libnl readline"
> +
> +SRC_URI = "git://open-lldp.org/open-lldp.git \
> + file://0001-fix-build-warnings.patch \
> + file://0002-Change-CFLAGS-to-avoid-error.patch \
> + "
> +
> +SRCREV = "2b7e05cff2b461efd0fb3e6e73b1bb0a23a330c1"
> +
> +PV = "1.0.1+git${SRCPV}"
> +S = "${WORKDIR}/git"
> +
> +inherit autotools-brokensep pkgconfig systemd
> +
> +do_configure_prepend () {
> +${S}/bootstrap.sh
> +}
> +
> +do_install_append () {
> +install -m 0755 -d ${D}${systemd_unitdir}
> +mv ${D}${prefix}${systemd_unitdir}/* ${D}${systemd_unitdir}/
> +rmdir ${D}${prefix}${systemd_unitdir}
> +}
> +
> +FILES_${PN} += "${systemd_unitdir}"
> --
> 2.7.4
>
>
>
--
-Joe MacDonald.
:wq
signature.asc
Description: PGP signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 3/6] freediameter: add new recipe
From: Jackie Huang
freeDiameter is an open source Diameter protocol
implementation. It provides an extensible platform
for deploying a Diameter network for your Authentication,
Authorization and Accounting needs.
Signed-off-by: Jackie Huang
Signed-off-by: Joe MacDonald
---
...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223 ++
.../freediameter/files/freeDiameter.conf | 250 +
.../freediameter/files/freediameter.init | 72 ++
.../freediameter/files/freediameter.service| 11 +
.../freediameter/files/install_test.patch | 22 ++
.../freediameter/files/pass-ptest-env.patch| 72 ++
.../recipes-protocols/freediameter/files/run-ptest | 11 +
.../freediameter/freediameter_1.2.1.bb | 136 +++
8 files changed, 797 insertions(+)
create mode 100644
meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
create mode 100644
meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf
create mode 100755
meta-networking/recipes-protocols/freediameter/files/freediameter.init
create mode 100644
meta-networking/recipes-protocols/freediameter/files/freediameter.service
create mode 100644
meta-networking/recipes-protocols/freediameter/files/install_test.patch
create mode 100644
meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
create mode 100644
meta-networking/recipes-protocols/freediameter/files/run-ptest
create mode 100644
meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
diff --git
a/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
new file mode 100644
index 000..71a5a1a
--- /dev/null
+++
b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
@@ -0,0 +1,223 @@
+Replace murmurhash algorithm with Robert Jenkin's hash algorithm
+
+Upstream-Status: Pending
+
+From test result, murmurhash algorithm does not work in big endian
+processor, so replace it with Robert Jenkin's hash which has worked
+in linux kernel for many years and has more adaptability.
+
+Signed-off-by: Roy.Li
+---
+ libfdproto/ostr.c | 192 +
+ 1 file changed, 74 insertions(+), 118 deletions(-)
+
+diff --git a/libfdproto/ostr.c b/libfdproto/ostr.c
+index 8f29b48..ce1f4dd 100644
+--- a/libfdproto/ostr.c
b/libfdproto/ostr.c
+@@ -430,128 +430,84 @@ after_proto:
+
+
+
//
+-/* Hash function -- credits to Austin Appleby, thank you ^^ */
+-/* See http://murmurhash.googlepages.com for more information on this
function */
+-
+-/* the strings are NOT always aligned properly (ex: received in RADIUS
message), so we use the aligned MurmurHash2 function as needed */
+-#define _HASH_MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
+-uint32_t fd_os_hash ( uint8_t * string, size_t len )
++/*
++ * Robert Jenkin's hash function.
++ * http://burtleburtle.net/bob/hash/evahash.html
++ * This is in the public domain.
++ */
++#define mix(a, b, c) \
++ do {\
++ a = a - b; a = a - c; a = a ^ (c >> 13); \
++ b = b - c; b = b - a; b = b ^ (a << 8); \
++ c = c - a; c = c - b; c = c ^ (b >> 13); \
++ a = a - b; a = a - c; a = a ^ (c >> 12); \
++ b = b - c; b = b - a; b = b ^ (a << 16); \
++ c = c - a; c = c - b; c = c ^ (b >> 5); \
++ a = a - b; a = a - c; a = a ^ (c >> 3); \
++ b = b - c; b = b - a; b = b ^ (a << 10); \
++ c = c - a; c = c - b; c = c ^ (b >> 15); \
++ } while (0)
++
++unsigned hash_rjenkins(const char *str, unsigned length)
+ {
+- uint32_t hash = len;
+- uint8_t * data = string;
+-
+- const unsigned int m = 0x5bd1e995;
+- const int r = 24;
+- int align = (long)string & 3;
+-
+- if (!align || (len < 4)) {
+- /* In case data is aligned, MurmurHash2 function */
+- while(len >= 4)
+- {
+- /* Mix 4 bytes at a time into the hash */
+- uint32_t k = *(uint32_t *)data; /* We don't care about
the byte order */
+-
+- _HASH_MIX(hash, k, m);
+-
+- data += 4;
+- len -= 4;
+- }
+-
+- /* Handle the last few bytes of the in
[oe] [meta-networking][PATCH v2 6/6] bridge-utils: update to v1.6
Updating to the latest version (1.6) and taking the opportunity to clean
up the old patches, switch to the upstream git repo for SRC_URI and make
the requested change to the older AR patch from a while back.
Signed-off-by: Joe MacDonald
---
.../recipes-support/bridge-utils/bridge-utils.inc | 28 ---
...ld-error-out-correctly-if-a-submake-fails.patch | 69 -
...idge-fix-some-build-time-warnings-fcntl.h.patch | 64
...idge-fix-some-build-time-warnings-errno.h.patch | 46
...dd-missing-include-s-fix-build-against-mu.patch | 47
...uild-don-t-ignore-CFLAGS-from-environment.patch | 29 ++--
...ridge-Modifying-the-AR-to-cross-toolchain.patch | 51 +
...5-check-error-returns-from-write-to-sysfs.patch | 87 --
...5-fix-error-message-for-incorrect-command.patch | 33
...utils-1.5-fix-incorrect-command-in-manual.patch | 33
.../bridge-utils/bridge-utils/kernel-headers.patch | 29 +---
.../bridge-utils/bridge-utils_1.5.bb | 16
.../bridge-utils/bridge-utils_1.6.bb | 35 +
13 files changed, 114 insertions(+), 453 deletions(-)
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils.inc
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch
create mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb
create mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
deleted file mode 100644
index 0fb18d5..000
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Tools for ethernet bridging"
-HOMEPAGE =
"http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge";
-SECTION = "net"
-LICENSE = "GPLv2"
-
-DEPENDS = "sysfsutils"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \
-
file://bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch \
-
file://bridge-utils-1.5-fix-error-message-for-incorrect-command.patch \
- file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \
-"
-
-inherit autotools-brokensep update-alternatives
-
-ALTERNATIVE_${PN} = "brctl"
-ALTERNATIVE_PRIORITY[brctl] = "100"
-ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl"
-
-EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
-
-do_install_append () {
-install -d ${D}/${datadir}/bridge-utils
-install -d ${D}/${sysconfdir}/network/if-pre-up.d
-install -d ${D}/${sysconfdir}/network/if-post-down.d
-}
-
-RRECOMMENDS_${PN} = "kernel-module-bridge"
diff --git
a/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
deleted file mode 100644
index c6897b4..000
---
a/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 5e102b453e254d16af1f95053134f58348e0f83a Mon Sep 17 00:00:00 2001
-From: root
-Date: Wed, 20 Jul 2016 23:40:30 +0100
-Subject: [PATCH 1/5] build: error out correctly if a submake fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Due to use of a for loop, return status from submake was always
-ignored.
-
-In the context of build-systems like OE this causes them to not
-detect any errors and continue happily, resulting in a successful,
-but incomplete, build.
-
-Fix by having a nicer Makefile.in which now has rules for the
-individual targets (directories) so that ma
[oe] [meta-networking][PATCH v2 5/6] stunnel: fix compile error when openssl disable des support
From: Kai Kang
When openssl disable des support with configure option 'no-des', it
doesn't provide des related header file and functions. That causes
stunnel compile failed. Fix it by checking macro OPENSSL_NO_DES to use
openssl des related library conditionaly.
Signed-off-by: Kai Kang
Signed-off-by: Joe MacDonald
---
.../stunnel/stunnel/fix-openssl-no-des.patch | 54 ++
.../recipes-support/stunnel/stunnel_5.35.bb| 4 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
diff --git
a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
new file mode 100644
index 000..209b0dd
--- /dev/null
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -0,0 +1,54 @@
+Upstream-Status: Pending
+
+When openssl disable des support with configure option 'no-des', it doesn't
+provide des related header file and functions. That causes stunnel compile
+failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related
+library conditionaly.
+
+Signed-off-by: Kai Kang
+---
+diff --git a/src/common.h b/src/common.h
+index f7d38b0..bf485af 100644
+--- a/src/common.h
b/src/common.h
+@@ -471,7 +471,9 @@ extern char *sys_errlist[];
+ #ifndef OPENSSL_NO_MD4
+ #include
+ #endif /* !defined(OPENSSL_NO_MD4) */
++#ifndef OPENSSL_NO_DES
+ #include
++#endif
+ #ifndef OPENSSL_NO_DH
+ #include
+ #if OPENSSL_VERSION_NUMBER<0x1010L
+diff --git a/src/protocol.c b/src/protocol.c
+index 587df09..8198eb6 100644
+--- a/src/protocol.c
b/src/protocol.c
+@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const
PHASE);
+ NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
+ NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
+ NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+ NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
+ NOEXPORT char *ntlm1();
+ NOEXPORT char *ntlm3(char *, char *, char *, char *);
+@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS
*opt, const PHASE phase) {
+ fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
+ if(opt->protocol_username && opt->protocol_password) {
+ if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+ ntlm(c, opt);
+ #else
+ s_log(LOG_ERR, "NTLM authentication is not available");
+@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS
*opt, const PHASE phase) {
+ return NULL;
+ }
+
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+
+ /*
+ * NTLM code is based on the following documentation:
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
b/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
index efe9d9e..ec8478d 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
@@ -8,7 +8,9 @@ DEPENDS = "openssl zlib tcp-wrappers"
RDEPENDS_${PN} += "perl"
-SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz";
+SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \
+ file://fix-openssl-no-des.patch \
+"
SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a"
SRC_URI[sha256sum] =
"ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 4/6] net-snmp: support openssl without 3des
From: Jackie Huang
net-snmp enables 3des support by default and fails to build with distro
feature openssl-no-weak-ciphers:
| ../../net-snmp-5.7.3/snmplib/scapi.c:82:25: fatal error: openssl/des.h: No
such file or directory
| #include
To fix the issue:
* add a patch to include des.h only if it's found in openssl
* disable des when openssl-no-weak-ciphers is enabled
Signed-off-by: Jackie Huang
Signed-off-by: Joe MacDonald
---
.../net-snmp/net-snmp-fix-for-disable-des.patch| 32 ++
.../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
diff --git
a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
new file mode 100644
index 000..25eb9c9
--- /dev/null
+++
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
@@ -0,0 +1,32 @@
+From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001
+From: Jackie Huang
+Date: Thu, 22 Jun 2017 10:25:08 +0800
+Subject: [PATCH] net-snmp: fix for --disable-des
+
+Include des.h only if it's found in openssl so that
+the --disable-des works correctly.
+
+Upstream-Status: Submitted [net-snmp-cod...@lists.sourceforge.net]
+
+Signed-off-by: Jackie Huang
+---
+ snmplib/scapi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/snmplib/scapi.c b/snmplib/scapi.c
+index 16ac829..271684b 100644
+--- a/snmplib/scapi.c
b/snmplib/scapi.c
+@@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support)
+ #include
+ #include
+ #include
++#ifdef HAVE_OPENSSL_DES_H
+ #include
++#endif
+ #ifdef HAVE_AES
+ #include
+ #endif
+--
+2.11.0
+
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index af6fd1b..849ae07 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -31,6 +31,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \
file://0004-configure-fix-incorrect-variable.patch \
file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
+ file://net-snmp-fix-for-disable-des.patch \
"
SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee"
SRC_URI[sha256sum] =
"e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e"
@@ -59,7 +60,8 @@ 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)}"
+${@base_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
EXTRA_OECONF += "--with-mib-modules=smux"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 1/6] ddclient: new package
From: "Kinsella, Ray"
Adding the package ddclient. DDClient updates Dynamic DNS servers with an IP
address.
Recipe is based on the original OE recipe found here.
http://cgit.openembedded.org/openembedded/tree/recipes/ddclient/ddclient_3.6.3.bb
with modifications based on the recipe at:
https://github.com/cshoredaniel/meta-cshored/blob/master/recipes-connectivity/ddclient/ddclient_3.8.3.bb
DDClient version has been updated to 3.8.3.
Signed-off-by: Ray Kinsella
Signed-off-by: Joe MacDonald
---
.../recipes-daemons/ddclient/ddclient_3.8.3.bb | 45 ++
.../recipes-daemons/ddclient/files/ip-up | 4 ++
.../recipes-daemons/ddclient/files/persistent | 1 +
3 files changed, 50 insertions(+)
create mode 100644 meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up
create mode 100644 meta-networking/recipes-daemons/ddclient/files/persistent
diff --git a/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
new file mode 100644
index 000..f4ef536
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
@@ -0,0 +1,45 @@
+SECTION = "net/misc"
+DESCRIPTION = "Ddclient is a Perl client used to update dynamic DNS entries
for accounts on Dynamic DNS Network Services"
+HOMEPAGE = "http://ddclient.sourceforge.net/";
+LICENSE = "GPLv2"
+
+SRC_URI = "\
+${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
+file://ip-up"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+RDEPENDS_${PN} = "\
+perl-module-getopt-long \
+perl-module-sys-hostname \
+perl-module-io-socket \
+perl-module-vars \
+perl-module-overload \
+perl-module-overloading \
+perl-module-config \
+perl-module-integer \
+perl-module-exporter-heavy \
+perl-module-symbol \
+perl-module-selectsaver \
+bash \
+perl \
+libio-socket-ssl-perl"
+
+do_install() {
+install -d ${D}${sbindir} ${D}${sysconfdir}/ddclient
${D}${sysconfdir}/init.d ${D}${sysconfdir}/default/persistent
+install -d ${D}${sysconfdir}/ppp/ip-up.d/ install -d ${D}${docdir}/ddclient
+install -m 755 ${S}/ddclient ${D}${sbindir}
+install ${S}/sample-etc_ddclient.conf
${D}${sysconfdir}/ddclient/ddclient.conf
+install -m 755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ip-up.d/ddclient
+install -m 0644 ${WORKDIR}/persistent
${D}/${sysconfdir}/default/persistent/50_ddclient
+sed -e 's|/etc/ddclient.conf|/etc/ddclient/ddclient.conf|g'
${S}/sample-etc_rc.d_init.d_ddclient > ${S}/rc_init
+install -m 755 ${S}/rc_init ${D}${sysconfdir}/init.d/ddclient
+install ${S}/README* ${D}${docdir}/ddclient
+install ${S}/COPY* ${D}${docdir}/ddclient
+install ${S}/sample* ${D}${docdir}/ddclient
+}
+
+CONFFILES_${PN} = "${sysconfdir}/ddclient/ddclient.conf"
+
+SRC_URI[md5sum] = "3b426ae52d509e463b42eeb08fb89e0b"
+SRC_URI[sha256sum] =
"d40e2f1fd3f4bff386d27bbdf4b8645199b1995d27605a886b8c71e44d819591"
diff --git a/meta-networking/recipes-daemons/ddclient/files/ip-up
b/meta-networking/recipes-daemons/ddclient/files/ip-up
new file mode 100644
index 000..4411db9
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/files/ip-up
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+logger -t ddclient $PPP_IFACE $PPP_LOCAL
+ddclient -daemon=0 -syslog -use=if -if=$PPP_IFACE >/dev/null 2>&1
diff --git a/meta-networking/recipes-daemons/ddclient/files/persistent
b/meta-networking/recipes-daemons/ddclient/files/persistent
new file mode 100644
index 000..b721272
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/files/persistent
@@ -0,0 +1 @@
+l root root 0644 /etc/ddclient.conf /var/persistent/etc/ddclient.conf
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 2/6] lksctp-tools: update and remove from blacklist
Switching lksctp-tools to build from the upstream git repository rather
than a source tarball. At the same time we'll un-blacklist it since it
appears the gold-as-ld issue has been resolved underneath us, probably
related to a Debian bug of the same form that was also resolved with a
binutils update.
Signed-off-by: Joe MacDonald
---
.../lksctp-tools/lksctp-tools_1.0.17.bb | 21 +
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git
a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
index 11c43ff..121cc99 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
@@ -8,22 +8,19 @@ LIC_FILES_CHKSUM = " \
file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
"
-SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \
+SRCREV = "736b91d340e3f2519714f2930ed63b164d363511"
+
+PV .= "+git${SRCPV}"
+LK_REL = "1.0.17"
+
+SRC_URI = " \
+git://github.com/sctp/lksctp-tools.git \
file://run-ptest \
file://v4test.sh \
file://v6test.sh \
"
-SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5"
-SRC_URI[sha256sum] =
"1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15"
-
-#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc
-march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared
-fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o
.libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o-march=armv5te -marm
-mthumb-interwork
--sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2
-Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o
.libs/libsctp.so.1.0.16
-#|
/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld:
error: symbol sctp_connectx has undefined version
-#| collect2: error: ld returned 1 exit status
-#| make[4]: *** [libsctp.la] Error 1
-PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
-
-S = "${WORKDIR}/${BP}"
+S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"
@@ -37,7 +34,7 @@ do_install_ptest () {
done
}
-SOLIBVERSION="${PV}"
+SOLIBVERSION="${LK_REL}"
SOLIBMAJORVERSION="1"
PACKAGES =+ "${PN}-withsctp ${PN}-utils"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 0/6] meta-networking patchwork cleanup
New in v2: - Correctly installed persistent file in ddclient recipe - Added commit hash to PV for lksctp-tools - Merged freediameter recipe updates from meta-security, once this has settled, I'll follow up with a patch to remove freediameter from meta-security v1: When I started comparing the state of meta-networking/master to master-next and to patchwork's own view of pending meta-networking patches I found some disconnects. So I've been chipping away at this for the last few days, trying to bring everything in sync. I've rejected/accepted the patches in patchwork that I was able to verify have either been rejected or merged already. ddclient died on the vine for no particular reason, so I refreshed it and added the persistence support as noted in the patch itself. Following that was Jackie's update to include freediameter, but it depended on the currently-broken lksctp-tools, so I took a stab at fixing that. There was a pending update to bridge-utils for using the xtools AR, but that needed rework, so I did the rework and updated bridge-utils at the same time. Finally, most of openssl-no-weak-cyphers was thrown away for good reason, but two of the patches still made sense to include in meta-networking, IMO, with just some minor rework, so I did that too. Here's the report: Jackie Huang (2): freediameter: add new recipe net-snmp: support openssl without 3des Joe MacDonald (2): lksctp-tools: update and remove from blacklist bridge-utils: update to v1.6 Kai Kang (1): stunnel: fix compile error when openssl disable des support Kinsella, Ray (1): ddclient: new package .../recipes-daemons/ddclient/ddclient_3.8.3.bb | 45 .../recipes-daemons/ddclient/files/ip-up | 4 + .../recipes-daemons/ddclient/files/persistent | 1 + ...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223 ++ .../freediameter/files/freeDiameter.conf | 250 + .../freediameter/files/freediameter.init | 72 ++ .../freediameter/files/freediameter.service| 11 + .../freediameter/files/install_test.patch | 22 ++ .../freediameter/files/pass-ptest-env.patch| 72 ++ .../recipes-protocols/freediameter/files/run-ptest | 11 + .../freediameter/freediameter_1.2.1.bb | 136 +++ .../net-snmp/net-snmp-fix-for-disable-des.patch| 32 +++ .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 4 +- .../recipes-support/bridge-utils/bridge-utils.inc | 28 --- ...ld-error-out-correctly-if-a-submake-fails.patch | 69 -- ...idge-fix-some-build-time-warnings-fcntl.h.patch | 64 -- ...idge-fix-some-build-time-warnings-errno.h.patch | 46 ...dd-missing-include-s-fix-build-against-mu.patch | 47 ...uild-don-t-ignore-CFLAGS-from-environment.patch | 29 +-- ...ridge-Modifying-the-AR-to-cross-toolchain.patch | 51 + ...5-check-error-returns-from-write-to-sysfs.patch | 87 --- ...5-fix-error-message-for-incorrect-command.patch | 33 --- ...utils-1.5-fix-incorrect-command-in-manual.patch | 33 --- .../bridge-utils/bridge-utils/kernel-headers.patch | 29 ++- .../bridge-utils/bridge-utils_1.5.bb | 16 -- .../bridge-utils/bridge-utils_1.6.bb | 35 +++ .../lksctp-tools/lksctp-tools_1.0.17.bb| 21 +- .../stunnel/stunnel/fix-openssl-no-des.patch | 54 + .../recipes-support/stunnel/stunnel_5.35.bb| 4 +- 29 files changed, 1062 insertions(+), 467 deletions(-) create mode 100644 meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up create mode 100644 meta-networking/recipes-daemons/ddclient/files/persistent create mode 100644 meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch create mode 100644 meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf create mode 100755 meta-networking/recipes-protocols/freediameter/files/freediameter.init create mode 100644 meta-networking/recipes-protocols/freediameter/files/freediameter.service create mode 100644 meta-networking/recipes-protocols/freediameter/files/install_test.patch create mode 100644 meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch create mode 100644 meta-networking/recipes-protocols/freediameter/files/run-ptest create mode 100644 meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils.inc delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch delete mode 100644 meta-networking/recipes-support/
Re: [oe] [meta-networking][PATCH 1/6] ddclient: new package
[Re: [oe] [meta-networking][PATCH 1/6] ddclient: new package] On 17.10.30 (Mon
16:14) Khem Raj wrote:
> On Mon, Oct 30, 2017 at 11:11 AM, Joe MacDonald
> wrote:
> > From: "Kinsella, Ray"
> >
> > Adding the package ddclient. DDClient updates Dynamic DNS servers with an
> > IP address.
> > Recipe is based on the original OE recipe found here.
> >
> > http://cgit.openembedded.org/openembedded/tree/recipes/ddclient/ddclient_3.6.3.bb
> >
> > with modifications based on the recipe at:
> >
> > https://github.com/cshoredaniel/meta-cshored/blob/master/recipes-connectivity/ddclient/ddclient_3.8.3.bb
> >
> > DDClient version has been updated to 3.8.3.
> >
> > Signed-off-by: Ray Kinsella
> > Signed-off-by: Joe MacDonald
> > ---
> > .../recipes-daemons/ddclient/ddclient_3.8.3.bb | 44
> > ++
> > .../recipes-daemons/ddclient/files/ip-up | 4 ++
> > .../recipes-daemons/ddclient/files/persistent | 1 +
> > 3 files changed, 49 insertions(+)
> > create mode 100644
> > meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> > create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up
> > create mode 100644
> > meta-networking/recipes-daemons/ddclient/files/persistent
> >
> > diff --git a/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> > b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> > new file mode 100644
> > index 000..d83a4d4
> > --- /dev/null
> > +++ b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> > @@ -0,0 +1,44 @@
> > +SECTION = "net/misc"
> > +DESCRIPTION = "Ddclient is a Perl client used to update dynamic DNS
> > entries for accounts on Dynamic DNS Network Services"
> > +HOMEPAGE = "http://ddclient.sourceforge.net/";
> > +LICENSE = "GPLv2"
> > +
> > +SRC_URI = "\
> > +${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
> > +file://ip-up"
> > +
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
> > +
> > +RDEPENDS_${PN} = "\
> > +perl-module-getopt-long \
> > +perl-module-sys-hostname \
> > +perl-module-io-socket \
> > +perl-module-vars \
> > +perl-module-overload \
> > +perl-module-overloading \
> > +perl-module-config \
> > +perl-module-integer \
> > +perl-module-exporter-heavy \
> > +perl-module-symbol \
> > +perl-module-selectsaver \
> > +bash \
> > +perl \
> > +libio-socket-ssl-perl"
> > +
> > +do_install() {
> > +install -d ${D}${sbindir} ${D}${sysconfdir}/ddclient
> > ${D}${sysconfdir}/init.d
> > +install -d ${D}${sysconfdir}/ppp/ip-up.d/ install -d
> > ${D}${docdir}/ddclient
> > +install -m 755 ${S}/ddclient ${D}${sbindir}
> > +install ${S}/sample-etc_ddclient.conf
> > ${D}${sysconfdir}/ddclient/ddclient.conf
> > +install -m 755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ip-up.d/ddclient
> > +sed -e 's|/etc/ddclient.conf|/etc/ddclient/ddclient.conf|g'
> > ${S}/sample-etc_rc.d_init.d_ddclient > ${S}/rc_init
> > +install -m 755 ${S}/rc_init ${D}${sysconfdir}/init.d/ddclient
> > +install ${S}/README* ${D}${docdir}/ddclient
> > +install ${S}/COPY* ${D}${docdir}/ddclient
> > +install ${S}/sample* ${D}${docdir}/ddclient
> > +}
> > +
> > +CONFFILES_${PN} = "${sysconfdir}/ddclient/ddclient.conf"
> > +
> > +SRC_URI[md5sum] = "3b426ae52d509e463b42eeb08fb89e0b"
> > +SRC_URI[sha256sum] =
> > "d40e2f1fd3f4bff386d27bbdf4b8645199b1995d27605a886b8c71e44d819591"
> > diff --git a/meta-networking/recipes-daemons/ddclient/files/ip-up
> > b/meta-networking/recipes-daemons/ddclient/files/ip-up
> > new file mode 100644
> > index 000..4411db9
> > --- /dev/null
> > +++ b/meta-networking/recipes-daemons/ddclient/files/ip-up
> > @@ -0,0 +1,4 @@
> > +#!/bin/sh
> > +
> > +logger -t ddclient $PPP_IFACE $PPP_LOCAL
> > +ddclient -daemon=0 -syslog -use=if -if=$PPP_IFACE >/dev/null 2>&1
> > diff --git a/meta-networking/recipes-daemons/ddclient/files/persistent
> > b/meta-networking/recipes-daemons/ddclient/files/persistent
> > new file mode 100644
> > index 000..b721272
> > --- /dev/null
> > +++ b/meta-networking/recipes-daemons/ddclient/files/persistent
> > @@ -0,0 +1 @@
> > +l root root 0644 /etc/ddclient.conf /var/persistent/etc/ddclient.conf
>
> this file seems to be unused. Can we delete it if no needed.
Actually, that appears to be an oversight, it was supposed to be
installed in this style:
https://github.com/cshoredaniel/meta-cshored/blob/master/recipes-connectivity/ddclient/ddclient_3.8.3.bb#L31
Corrected in the next version.
--
-Joe MacDonald.
:wq
signature.asc
Description: PGP signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/6] lksctp-tools: update and remove from blacklist
[Re: [oe] [meta-networking][PATCH 2/6] lksctp-tools: update and remove from
blacklist] On 17.10.30 (Mon 16:21) Khem Raj wrote:
> On Mon, Oct 30, 2017 at 11:11 AM, Joe MacDonald
> wrote:
> > Switching lksctp-tools to build from the upstream git repository rather
> > than a source tarball. At the same time we'll un-blacklist it since it
> > appears the gold-as-ld issue has been resolved underneath us, probably
> > related to a Debian bug of the same form that was also resolved with a
> > binutils update.
> >
> > Signed-off-by: Joe MacDonald
> > ---
> > .../recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb | 16
> > +---
> > 1 file changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git
> > a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> > b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> > index 11c43ff..9166aa5 100644
> > --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> > +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> > @@ -8,22 +8,16 @@ LIC_FILES_CHKSUM = " \
> > file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
> > "
> >
> > -SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \
> > +SRCREV = "736b91d340e3f2519714f2930ed63b164d363511"
> > +
>
> perhaps we need to reflect it in PV as well.
>
> PV .= "+git${SRCPV}"
I was less inclined to decorate the PV with the git hash since the
SRCREV points at the release tag for 1.0.17, but I suppose if upstream
chose to move the tag then this would be out of sync, so it's worth it.
-J.
>
> > +SRC_URI = " \
> > +git://github.com/sctp/lksctp-tools.git \
> > file://run-ptest \
> > file://v4test.sh \
> > file://v6test.sh \
> > "
> >
> > -SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5"
> > -SRC_URI[sha256sum] =
> > "1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15"
> > -
> > -#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc
> > -march=armv5te -marm -mthumb-interwork
> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm
> > -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o
> > .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o
> > -march=armv5te -marm -mthumb-interwork
> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2
> > -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map
> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname
> > -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16
> > -#|
> > /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld:
> > error: symbol sctp_connectx has undefined version
> > -#| collect2: error: ld returned 1 exit status
> > -#| make[4]: *** [libsctp.la] Error 1
> > -PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES',
> > 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
> > -
> > -S = "${WORKDIR}/${BP}"
> > +S = "${WORKDIR}/git"
> >
> > BBCLASSEXTEND = "native"
> >
> > --
> > 2.7.4
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
-Joe MacDonald.
:wq
signature.asc
Description: PGP signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 3/6] freediameter: add new recipe
[Re: [oe] [meta-networking][PATCH 3/6] freediameter: add new recipe] On
17.10.30 (Mon 17:47) akuster808 wrote:
>
>
> On 10/30/2017 11:11 AM, Joe MacDonald wrote:
> > From: Jackie Huang
> >
> > freeDiameter is an open source Diameter protocol
> > implementation. It provides an extensible platform
> > for deploying a Diameter network for your Authentication,
> > Authorization and Accounting needs.
> >
> > Signed-off-by: Jackie Huang
> > Signed-off-by: Joe MacDonald
> If you want this in meta-networking, please send a patch to remove it
> from meta-security.
I never even thought of looking for it in meta-security. Since I've
always encountered it in the CGL space it just never occurred, and since
the patch was still apparently active in patchwork, I just assumed it'd
been lost.
Do you (or anyone else using the layers) have a preference for what we
do with the recipe? Unfortunately at a glance they look at least a bit
different from each other, so if I'm going to include it in
meta-networking I'll want to review what's in meta-security first to
determine what changes are appropriate to the meta-networking version.
-J.
>
> - armin
> > ---
> > ...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223
> > +
> > .../freediameter/files/freediameter.init | 72 +++
> > .../freediameter/files/freediameter.service| 11 +
> > .../freediameter/files/install_test.patch | 22 ++
> > .../freediameter/files/pass-ptest-env.patch| 72 +++
> > .../recipes-protocols/freediameter/files/run-ptest | 11 +
> > .../freediameter/freediameter.inc | 98 +
> > .../freediameter/freediameter_1.2.1.bb | 7 +
> > 8 files changed, 516 insertions(+)
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
> > create mode 100755
> > meta-networking/recipes-protocols/freediameter/files/freediameter.init
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/files/freediameter.service
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/files/install_test.patch
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/files/run-ptest
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/freediameter.inc
> > create mode 100644
> > meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
> >
> > diff --git
> > a/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
> >
> > b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
> > new file mode 100644
> > index 000..71a5a1a
> > --- /dev/null
> > +++
> > b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
> > @@ -0,0 +1,223 @@
> > +Replace murmurhash algorithm with Robert Jenkin's hash algorithm
> > +
> > +Upstream-Status: Pending
> > +
> > +From test result, murmurhash algorithm does not work in big endian
> > +processor, so replace it with Robert Jenkin's hash which has worked
> > +in linux kernel for many years and has more adaptability.
> > +
> > +Signed-off-by: Roy.Li
> > +---
> > + libfdproto/ostr.c | 192
> > +
> > + 1 file changed, 74 insertions(+), 118 deletions(-)
> > +
> > +diff --git a/libfdproto/ostr.c b/libfdproto/ostr.c
> > +index 8f29b48..ce1f4dd 100644
> > +--- a/libfdproto/ostr.c
> > b/libfdproto/ostr.c
> > +@@ -430,128 +430,84 @@ after_proto:
> > +
> > +
> > +
> > //
> > +-/* Hash function -- credits to Austin Appleby, thank you ^^ */
> > +-/* See http://murmurhash.googlepages.com for more information on this
> > function */
> > +-
> > +-/* the strings are NOT always aligned properly (ex: received in RADIUS
> > message), so we use the aligned MurmurHash2 function as needed */
> > +-#define _HASH_MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
> > +-uint32_t fd_os_hash ( uint8_t * string, size_t len )
> > ++/*
> > ++ * Robert Jenkin's hash function.
> > ++ * ht
[oe] [meta-networking][PATCH 4/6] net-snmp: support openssl without 3des
From: Jackie Huang
net-snmp enables 3des support by default and fails to build with distro
feature openssl-no-weak-ciphers:
| ../../net-snmp-5.7.3/snmplib/scapi.c:82:25: fatal error: openssl/des.h: No
such file or directory
| #include
To fix the issue:
* add a patch to include des.h only if it's found in openssl
* disable des when openssl-no-weak-ciphers is enabled
Signed-off-by: Jackie Huang
Signed-off-by: Joe MacDonald
---
.../net-snmp/net-snmp-fix-for-disable-des.patch| 32 ++
.../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
diff --git
a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
new file mode 100644
index 000..25eb9c9
--- /dev/null
+++
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
@@ -0,0 +1,32 @@
+From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001
+From: Jackie Huang
+Date: Thu, 22 Jun 2017 10:25:08 +0800
+Subject: [PATCH] net-snmp: fix for --disable-des
+
+Include des.h only if it's found in openssl so that
+the --disable-des works correctly.
+
+Upstream-Status: Submitted [net-snmp-cod...@lists.sourceforge.net]
+
+Signed-off-by: Jackie Huang
+---
+ snmplib/scapi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/snmplib/scapi.c b/snmplib/scapi.c
+index 16ac829..271684b 100644
+--- a/snmplib/scapi.c
b/snmplib/scapi.c
+@@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support)
+ #include
+ #include
+ #include
++#ifdef HAVE_OPENSSL_DES_H
+ #include
++#endif
+ #ifdef HAVE_AES
+ #include
+ #endif
+--
+2.11.0
+
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index af6fd1b..849ae07 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -31,6 +31,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \
file://0004-configure-fix-incorrect-variable.patch \
file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
+ file://net-snmp-fix-for-disable-des.patch \
"
SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee"
SRC_URI[sha256sum] =
"e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e"
@@ -59,7 +60,8 @@ 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)}"
+${@base_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
EXTRA_OECONF += "--with-mib-modules=smux"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 5/6] stunnel: fix compile error when openssl disable des support
From: Kai Kang
When openssl disable des support with configure option 'no-des', it
doesn't provide des related header file and functions. That causes
stunnel compile failed. Fix it by checking macro OPENSSL_NO_DES to use
openssl des related library conditionaly.
Signed-off-by: Kai Kang
Signed-off-by: Joe MacDonald
---
.../stunnel/stunnel/fix-openssl-no-des.patch | 54 ++
.../recipes-support/stunnel/stunnel_5.35.bb| 4 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
diff --git
a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
new file mode 100644
index 000..209b0dd
--- /dev/null
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -0,0 +1,54 @@
+Upstream-Status: Pending
+
+When openssl disable des support with configure option 'no-des', it doesn't
+provide des related header file and functions. That causes stunnel compile
+failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related
+library conditionaly.
+
+Signed-off-by: Kai Kang
+---
+diff --git a/src/common.h b/src/common.h
+index f7d38b0..bf485af 100644
+--- a/src/common.h
b/src/common.h
+@@ -471,7 +471,9 @@ extern char *sys_errlist[];
+ #ifndef OPENSSL_NO_MD4
+ #include
+ #endif /* !defined(OPENSSL_NO_MD4) */
++#ifndef OPENSSL_NO_DES
+ #include
++#endif
+ #ifndef OPENSSL_NO_DH
+ #include
+ #if OPENSSL_VERSION_NUMBER<0x1010L
+diff --git a/src/protocol.c b/src/protocol.c
+index 587df09..8198eb6 100644
+--- a/src/protocol.c
b/src/protocol.c
+@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const
PHASE);
+ NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
+ NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
+ NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+ NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
+ NOEXPORT char *ntlm1();
+ NOEXPORT char *ntlm3(char *, char *, char *, char *);
+@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS
*opt, const PHASE phase) {
+ fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
+ if(opt->protocol_username && opt->protocol_password) {
+ if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+ ntlm(c, opt);
+ #else
+ s_log(LOG_ERR, "NTLM authentication is not available");
+@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS
*opt, const PHASE phase) {
+ return NULL;
+ }
+
+-#ifndef OPENSSL_NO_MD4
++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
+
+ /*
+ * NTLM code is based on the following documentation:
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
b/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
index efe9d9e..ec8478d 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
@@ -8,7 +8,9 @@ DEPENDS = "openssl zlib tcp-wrappers"
RDEPENDS_${PN} += "perl"
-SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz";
+SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \
+ file://fix-openssl-no-des.patch \
+"
SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a"
SRC_URI[sha256sum] =
"ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 6/6] bridge-utils: update to v1.6
Updating to the latest version (1.6) and taking the opportunity to clean
up the old patches, switch to the upstream git repo for SRC_URI and make
the requested change to the older AR patch from a while back.
Signed-off-by: Joe MacDonald
---
.../recipes-support/bridge-utils/bridge-utils.inc | 28 ---
...ld-error-out-correctly-if-a-submake-fails.patch | 69 -
...idge-fix-some-build-time-warnings-fcntl.h.patch | 64
...idge-fix-some-build-time-warnings-errno.h.patch | 46
...dd-missing-include-s-fix-build-against-mu.patch | 47
...uild-don-t-ignore-CFLAGS-from-environment.patch | 29 ++--
...ridge-Modifying-the-AR-to-cross-toolchain.patch | 51 +
...5-check-error-returns-from-write-to-sysfs.patch | 87 --
...5-fix-error-message-for-incorrect-command.patch | 33
...utils-1.5-fix-incorrect-command-in-manual.patch | 33
.../bridge-utils/bridge-utils/kernel-headers.patch | 29 +---
.../bridge-utils/bridge-utils_1.5.bb | 16
.../bridge-utils/bridge-utils_1.6.bb | 35 +
13 files changed, 114 insertions(+), 453 deletions(-)
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils.inc
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch
create mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch
delete mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb
create mode 100644
meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
deleted file mode 100644
index 0fb18d5..000
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Tools for ethernet bridging"
-HOMEPAGE =
"http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge";
-SECTION = "net"
-LICENSE = "GPLv2"
-
-DEPENDS = "sysfsutils"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \
-
file://bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch \
-
file://bridge-utils-1.5-fix-error-message-for-incorrect-command.patch \
- file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \
-"
-
-inherit autotools-brokensep update-alternatives
-
-ALTERNATIVE_${PN} = "brctl"
-ALTERNATIVE_PRIORITY[brctl] = "100"
-ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl"
-
-EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
-
-do_install_append () {
-install -d ${D}/${datadir}/bridge-utils
-install -d ${D}/${sysconfdir}/network/if-pre-up.d
-install -d ${D}/${sysconfdir}/network/if-post-down.d
-}
-
-RRECOMMENDS_${PN} = "kernel-module-bridge"
diff --git
a/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
deleted file mode 100644
index c6897b4..000
---
a/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 5e102b453e254d16af1f95053134f58348e0f83a Mon Sep 17 00:00:00 2001
-From: root
-Date: Wed, 20 Jul 2016 23:40:30 +0100
-Subject: [PATCH 1/5] build: error out correctly if a submake fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Due to use of a for loop, return status from submake was always
-ignored.
-
-In the context of build-systems like OE this causes them to not
-detect any errors and continue happily, resulting in a successful,
-but incomplete, build.
-
-Fix by having a nicer Makefile.in which now has rules for the
-individual targets (directories) so that ma
[oe] [meta-networking][PATCH 3/6] freediameter: add new recipe
From: Jackie Huang
freeDiameter is an open source Diameter protocol
implementation. It provides an extensible platform
for deploying a Diameter network for your Authentication,
Authorization and Accounting needs.
Signed-off-by: Jackie Huang
Signed-off-by: Joe MacDonald
---
...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223 +
.../freediameter/files/freediameter.init | 72 +++
.../freediameter/files/freediameter.service| 11 +
.../freediameter/files/install_test.patch | 22 ++
.../freediameter/files/pass-ptest-env.patch| 72 +++
.../recipes-protocols/freediameter/files/run-ptest | 11 +
.../freediameter/freediameter.inc | 98 +
.../freediameter/freediameter_1.2.1.bb | 7 +
8 files changed, 516 insertions(+)
create mode 100644
meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
create mode 100755
meta-networking/recipes-protocols/freediameter/files/freediameter.init
create mode 100644
meta-networking/recipes-protocols/freediameter/files/freediameter.service
create mode 100644
meta-networking/recipes-protocols/freediameter/files/install_test.patch
create mode 100644
meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
create mode 100644
meta-networking/recipes-protocols/freediameter/files/run-ptest
create mode 100644
meta-networking/recipes-protocols/freediameter/freediameter.inc
create mode 100644
meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
diff --git
a/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
new file mode 100644
index 000..71a5a1a
--- /dev/null
+++
b/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
@@ -0,0 +1,223 @@
+Replace murmurhash algorithm with Robert Jenkin's hash algorithm
+
+Upstream-Status: Pending
+
+From test result, murmurhash algorithm does not work in big endian
+processor, so replace it with Robert Jenkin's hash which has worked
+in linux kernel for many years and has more adaptability.
+
+Signed-off-by: Roy.Li
+---
+ libfdproto/ostr.c | 192 +
+ 1 file changed, 74 insertions(+), 118 deletions(-)
+
+diff --git a/libfdproto/ostr.c b/libfdproto/ostr.c
+index 8f29b48..ce1f4dd 100644
+--- a/libfdproto/ostr.c
b/libfdproto/ostr.c
+@@ -430,128 +430,84 @@ after_proto:
+
+
+
//
+-/* Hash function -- credits to Austin Appleby, thank you ^^ */
+-/* See http://murmurhash.googlepages.com for more information on this
function */
+-
+-/* the strings are NOT always aligned properly (ex: received in RADIUS
message), so we use the aligned MurmurHash2 function as needed */
+-#define _HASH_MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
+-uint32_t fd_os_hash ( uint8_t * string, size_t len )
++/*
++ * Robert Jenkin's hash function.
++ * http://burtleburtle.net/bob/hash/evahash.html
++ * This is in the public domain.
++ */
++#define mix(a, b, c) \
++ do {\
++ a = a - b; a = a - c; a = a ^ (c >> 13); \
++ b = b - c; b = b - a; b = b ^ (a << 8); \
++ c = c - a; c = c - b; c = c ^ (b >> 13); \
++ a = a - b; a = a - c; a = a ^ (c >> 12); \
++ b = b - c; b = b - a; b = b ^ (a << 16); \
++ c = c - a; c = c - b; c = c ^ (b >> 5); \
++ a = a - b; a = a - c; a = a ^ (c >> 3); \
++ b = b - c; b = b - a; b = b ^ (a << 10); \
++ c = c - a; c = c - b; c = c ^ (b >> 15); \
++ } while (0)
++
++unsigned hash_rjenkins(const char *str, unsigned length)
+ {
+- uint32_t hash = len;
+- uint8_t * data = string;
+-
+- const unsigned int m = 0x5bd1e995;
+- const int r = 24;
+- int align = (long)string & 3;
+-
+- if (!align || (len < 4)) {
+- /* In case data is aligned, MurmurHash2 function */
+- while(len >= 4)
+- {
+- /* Mix 4 bytes at a time into the hash */
+- uint32_t k = *(uint32_t *)data; /* We don't care about
the byte order */
+-
+- _HASH_MIX(hash, k, m);
+-
+- data += 4;
+- len -= 4;
+- }
+-
+- /* Handle the last few bytes of the input */
+- switch(len) {
+-
[oe] [meta-networking][PATCH 1/6] ddclient: new package
From: "Kinsella, Ray"
Adding the package ddclient. DDClient updates Dynamic DNS servers with an IP
address.
Recipe is based on the original OE recipe found here.
http://cgit.openembedded.org/openembedded/tree/recipes/ddclient/ddclient_3.6.3.bb
with modifications based on the recipe at:
https://github.com/cshoredaniel/meta-cshored/blob/master/recipes-connectivity/ddclient/ddclient_3.8.3.bb
DDClient version has been updated to 3.8.3.
Signed-off-by: Ray Kinsella
Signed-off-by: Joe MacDonald
---
.../recipes-daemons/ddclient/ddclient_3.8.3.bb | 44 ++
.../recipes-daemons/ddclient/files/ip-up | 4 ++
.../recipes-daemons/ddclient/files/persistent | 1 +
3 files changed, 49 insertions(+)
create mode 100644 meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up
create mode 100644 meta-networking/recipes-daemons/ddclient/files/persistent
diff --git a/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
new file mode 100644
index 000..d83a4d4
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
@@ -0,0 +1,44 @@
+SECTION = "net/misc"
+DESCRIPTION = "Ddclient is a Perl client used to update dynamic DNS entries
for accounts on Dynamic DNS Network Services"
+HOMEPAGE = "http://ddclient.sourceforge.net/";
+LICENSE = "GPLv2"
+
+SRC_URI = "\
+${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
+file://ip-up"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+RDEPENDS_${PN} = "\
+perl-module-getopt-long \
+perl-module-sys-hostname \
+perl-module-io-socket \
+perl-module-vars \
+perl-module-overload \
+perl-module-overloading \
+perl-module-config \
+perl-module-integer \
+perl-module-exporter-heavy \
+perl-module-symbol \
+perl-module-selectsaver \
+bash \
+perl \
+libio-socket-ssl-perl"
+
+do_install() {
+install -d ${D}${sbindir} ${D}${sysconfdir}/ddclient
${D}${sysconfdir}/init.d
+install -d ${D}${sysconfdir}/ppp/ip-up.d/ install -d ${D}${docdir}/ddclient
+install -m 755 ${S}/ddclient ${D}${sbindir}
+install ${S}/sample-etc_ddclient.conf
${D}${sysconfdir}/ddclient/ddclient.conf
+install -m 755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ip-up.d/ddclient
+sed -e 's|/etc/ddclient.conf|/etc/ddclient/ddclient.conf|g'
${S}/sample-etc_rc.d_init.d_ddclient > ${S}/rc_init
+install -m 755 ${S}/rc_init ${D}${sysconfdir}/init.d/ddclient
+install ${S}/README* ${D}${docdir}/ddclient
+install ${S}/COPY* ${D}${docdir}/ddclient
+install ${S}/sample* ${D}${docdir}/ddclient
+}
+
+CONFFILES_${PN} = "${sysconfdir}/ddclient/ddclient.conf"
+
+SRC_URI[md5sum] = "3b426ae52d509e463b42eeb08fb89e0b"
+SRC_URI[sha256sum] =
"d40e2f1fd3f4bff386d27bbdf4b8645199b1995d27605a886b8c71e44d819591"
diff --git a/meta-networking/recipes-daemons/ddclient/files/ip-up
b/meta-networking/recipes-daemons/ddclient/files/ip-up
new file mode 100644
index 000..4411db9
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/files/ip-up
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+logger -t ddclient $PPP_IFACE $PPP_LOCAL
+ddclient -daemon=0 -syslog -use=if -if=$PPP_IFACE >/dev/null 2>&1
diff --git a/meta-networking/recipes-daemons/ddclient/files/persistent
b/meta-networking/recipes-daemons/ddclient/files/persistent
new file mode 100644
index 000..b721272
--- /dev/null
+++ b/meta-networking/recipes-daemons/ddclient/files/persistent
@@ -0,0 +1 @@
+l root root 0644 /etc/ddclient.conf /var/persistent/etc/ddclient.conf
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/6] lksctp-tools: update and remove from blacklist
Switching lksctp-tools to build from the upstream git repository rather
than a source tarball. At the same time we'll un-blacklist it since it
appears the gold-as-ld issue has been resolved underneath us, probably
related to a Debian bug of the same form that was also resolved with a
binutils update.
Signed-off-by: Joe MacDonald
---
.../recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git
a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
index 11c43ff..9166aa5 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
@@ -8,22 +8,16 @@ LIC_FILES_CHKSUM = " \
file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
"
-SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \
+SRCREV = "736b91d340e3f2519714f2930ed63b164d363511"
+
+SRC_URI = " \
+git://github.com/sctp/lksctp-tools.git \
file://run-ptest \
file://v4test.sh \
file://v6test.sh \
"
-SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5"
-SRC_URI[sha256sum] =
"1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15"
-
-#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc
-march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared
-fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o
.libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o-march=armv5te -marm
-mthumb-interwork
--sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2
-Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o
.libs/libsctp.so.1.0.16
-#|
/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld:
error: symbol sctp_connectx has undefined version
-#| collect2: error: ld returned 1 exit status
-#| make[4]: *** [libsctp.la] Error 1
-PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
-
-S = "${WORKDIR}/${BP}"
+S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 0/6] meta-networking patchwork cleanup
When I started comparing the state of meta-networking/master to master-next and to patchwork's own view of pending meta-networking patches I found some disconnects. So I've been chipping away at this for the last few days, trying to bring everything in sync. I've rejected/accepted the patches in patchwork that I was able to verify have either been rejected or merged already. ddclient died on the vine for no particular reason, so I refreshed it and added the persistence support as noted in the patch itself. Following that was Jackie's update to include freediameter, but it depended on the currently-broken lksctp-tools, so I took a stab at fixing that. There was a pending update to bridge-utils for using the xtools AR, but that needed rework, so I did the rework and updated bridge-utils at the same time. Finally, most of openssl-no-weak-cyphers was thrown away for good reason, but two of the patches still made sense to include in meta-networking, IMO, with just some minor rework, so I did that too. Here's the report: Jackie Huang (2): freediameter: add new recipe net-snmp: support openssl without 3des Joe MacDonald (2): lksctp-tools: update and remove from blacklist bridge-utils: update to v1.6 Kai Kang (1): stunnel: fix compile error when openssl disable des support Kinsella, Ray (1): ddclient: new package .../recipes-daemons/ddclient/ddclient_3.8.3.bb | 44 .../recipes-daemons/ddclient/files/ip-up | 4 + .../recipes-daemons/ddclient/files/persistent | 1 + ...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223 + .../freediameter/files/freediameter.init | 72 +++ .../freediameter/files/freediameter.service| 11 + .../freediameter/files/install_test.patch | 22 ++ .../freediameter/files/pass-ptest-env.patch| 72 +++ .../recipes-protocols/freediameter/files/run-ptest | 11 + .../freediameter/freediameter.inc | 98 + .../freediameter/freediameter_1.2.1.bb | 7 + .../net-snmp/net-snmp-fix-for-disable-des.patch| 32 +++ .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 4 +- .../recipes-support/bridge-utils/bridge-utils.inc | 28 --- ...ld-error-out-correctly-if-a-submake-fails.patch | 69 --- ...idge-fix-some-build-time-warnings-fcntl.h.patch | 64 -- ...idge-fix-some-build-time-warnings-errno.h.patch | 46 - ...dd-missing-include-s-fix-build-against-mu.patch | 47 - ...uild-don-t-ignore-CFLAGS-from-environment.patch | 29 +-- ...ridge-Modifying-the-AR-to-cross-toolchain.patch | 51 + ...5-check-error-returns-from-write-to-sysfs.patch | 87 ...5-fix-error-message-for-incorrect-command.patch | 33 --- ...utils-1.5-fix-incorrect-command-in-manual.patch | 33 --- .../bridge-utils/bridge-utils/kernel-headers.patch | 29 ++- .../bridge-utils/bridge-utils_1.5.bb | 16 -- .../bridge-utils/bridge-utils_1.6.bb | 35 .../lksctp-tools/lksctp-tools_1.0.17.bb| 16 +- .../stunnel/stunnel/fix-openssl-no-des.patch | 54 + .../recipes-support/stunnel/stunnel_5.35.bb| 4 +- 29 files changed, 776 insertions(+), 466 deletions(-) create mode 100644 meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up create mode 100644 meta-networking/recipes-daemons/ddclient/files/persistent create mode 100644 meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch create mode 100755 meta-networking/recipes-protocols/freediameter/files/freediameter.init create mode 100644 meta-networking/recipes-protocols/freediameter/files/freediameter.service create mode 100644 meta-networking/recipes-protocols/freediameter/files/install_test.patch create mode 100644 meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch create mode 100644 meta-networking/recipes-protocols/freediameter/files/run-ptest create mode 100644 meta-networking/recipes-protocols/freediameter/freediameter.inc create mode 100644 meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils.inc delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch delete mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-agai
Re: [oe] [meta-networking][PATCH] bridge-utils: modify the AR to cross toolchain
[Re: [oe] [meta-networking][PATCH] bridge-utils: modify the AR to cross toolchain] On 17.10.19 (Thu 09:06) Khem Raj wrote: > On Thu, Oct 19, 2017 at 12:12 AM, Li Zhou wrote: > > The Makefile uses the host “ar” tool when it should be using the > > ar from the target toolchain. > > > > Signed-off-by: Jiwei Sun > > Signed-off-by: Li Zhou > > --- > > ...ridge-Modifying-the-AR-to-cross-toolchain.patch | 34 > > ++ > > .../bridge-utils/bridge-utils_1.5.bb | 1 + > > 2 files changed, 35 insertions(+) > > create mode 100644 > > meta-networking/recipes-support/bridge-utils/bridge-utils/0001-libbridge-Modifying-the-AR-to-cross-toolchain.patch > > > > diff --git > > a/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-libbridge-Modifying-the-AR-to-cross-toolchain.patch > > > > b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-libbridge-Modifying-the-AR-to-cross-toolchain.patch > > new file mode 100644 > > index 000..e477f41 > > --- /dev/null > > +++ > > b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-libbridge-Modifying-the-AR-to-cross-toolchain.patch > > @@ -0,0 +1,34 @@ > > +From 689e24ef05bd1772b2149e4eb48b058ca8361cf4 Mon Sep 17 00:00:00 2001 > > +From: Li Zhou > > +Date: Thu, 19 Oct 2017 11:34:18 +0800 > > +Subject: [PATCH 2/2] libbridge: Modifying the AR to cross toolchain > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +The Makefile uses the host “ar” tool when it should be using the > > +ar from the target toolchain. > > + > > +Upstream-Status: Pending > > + > > +Signed-off-by: Li Zhou > > +--- > > + libbridge/Makefile.in | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in > > +index 11c0829..59d7355 100644 > > +--- a/libbridge/Makefile.in > > b/libbridge/Makefile.in > > +@@ -1,7 +1,7 @@ > > + > > + KERNEL_HEADERS=-I@KERNEL_HEADERS@ > > + > > +-AR=ar > > ++AR?=ar > > perhaps AR=@AR@ would be better Yeah, I agree. -J. > > > + RANLIB=@RANLIB@ > > + > > + CC=@CC@ > > +-- > > +1.9.1 > > + > > diff --git > > a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb > > b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb > > index 6032ab0..723ae5f 100644 > > --- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb > > +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb > > @@ -7,6 +7,7 @@ SRC_URI += "\ > > file://0003-bridge-fix-some-build-time-warnings-errno.h.patch \ > > file://0004-libbridge-add-missing-include-s-fix-build-against-mu.patch > > \ > > file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ > > +file://0001-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ > > " > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" > > -- > > 1.9.1 > > > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/1] mdns: move from meta-intel-iot-middleware
[Re: [oe] [meta-networking][PATCH 1/1] mdns: move from meta-intel-iot-middleware] On 17.10.17 (Tue 10:01) Khem Raj wrote: > On Tue, Oct 17, 2017 at 9:58 AM, Martin Jansa wrote: > > I agree with Khem, I've merged oprofile even when it fails with musl, > > because that was the main reason for moving it from oe-core to meta-oe, but > > we don't want to burden Khem with more new musl issues when they are > > detected soon enough (my world builds don't use musl, so I depend on Khem to > > provide feedback when he can) . > > > > On Tue, Oct 17, 2017 at 6:23 PM, Khem Raj wrote: > >> > >> On Mon, Oct 16, 2017 at 10:11 PM, Denys Dmytriyenko > >> wrote: > >> > On Mon, Oct 16, 2017 at 09:19:25PM -0700, Khem Raj wrote: > >> >> On Wed, Oct 4, 2017 at 1:20 PM, Paul Eggleton > >> >> wrote: > >> >> > The following improvements have been made over the recipe that was in > >> >> > meta-intel-iot-middleware (a layer which is no longer actively > >> >> > maintained): > >> >> > > >> >> > * Upgrade to latest upstream version (765.50.9) > >> >> > * Fix compilation failures by passing CC and LD > >> >> > * Fix "no GNU hash in the ELF binary" issue > >> >> > * Point S at the correct source subdirectory so that "make clean" > >> >> > works > >> >> > * Fix lack of soname on libdns_sd.so leading to missing RDEPENDS QA > >> >> > error > >> >> > * Add SUMMARY > >> >> > > >> >> > >> >> > >> >> This has been accepted into master but it fails to build with musl > >> > > >> > Is musl a requirement for meta-oe? > >> > >> We have fixed it to a point where we have around 10-12 recipes which > >> don't compile > >> with musl, and it would be better to keep this level as such and > >> especially when we > >> know its failing. its a requirement for oe-core > > I do world builds on master-next with musl on qemumips and rpi3 > continuously, with a known set of failures, if a new one shows up > I tend to report. I obviously haven't been building with musl either, but if it's not that difficult to add to my autobuilder configuration, I'd be happy to. Is https://github.com/kraj/meta-musl/blob/master/README.md the best source for how to get started with a musl build? -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Yocto security responses.
[Re: Yocto security responses.] On 17.10.16 (Mon 00:49) Martin Jansa wrote: > On Fri, Oct 13, 2017 at 4:57 AM, Joe MacDonald > wrote: > > Not to be brusque about it, but I've said all I intend to say on that > patch and I've regularly marked it rejected in patchwork, but it keeps > getting pulled back into the 'master-next' state, I assume by a script > of some sort, so dnsmasq continues to be something that warrants special > attention, because I know I manually have to tell my own automated > processes to ignore it. :-/ > > > Thanks for merge to master, the meta-networking patches are usually in > master-next until they are merged. > > I just do the rebase regularly and if they are still there after rebase I > sometimes don't dig in ML or patchwork status to find out if they are still in > review (and should stay in master-next) or already definitely refused and I > should drop them while rebasing. > > Currently there are 4 pending meta-networking changes: > pick 6302b49 dnsmasq: disable the service by default > pick 45559fa openconnect: fix parallel compilation failure > pick aac7e9d squid: upgrade to 3.5.27 > pick ff5e841 libmnl: Move to oe-core > (and my WIP spice changes which I haven't sent to ML yet). > > I'll drop the first now as discussed in this thread (even when https:// > patchwork.openembedded.org/patch/137644/ is still marked in patchwork as > "Master Next" not "Rejected"). > > I'll drop the 2nd as well based on the discussion in https://patchwork. > openembedded.org/patch/143205/ > > The 3rd one is for some reason marked as Changes Requested, but doesn't > include > any ML discussion in https://patchwork.openembedded.org/patch/143406/ Weird, I can't find my reply on the mailing list either. Attached here so maybe it'll get archived this time. Short version, I wanted confirmation on the behaviour with gcc7 and the patch that was being removed and if we were going to see a v2 on this, I'd rather not have the unnecessary whitespace reformatting in the next version. > and the last one should imho be merged, because in last batch you've > merged: b8210dd iproute2: Move tipc enablement to oe-core which > already depends on libmnl in oe-core. I plan to do that today, there's another issue that I thought needed quick turnaround on it, but it seems not. Since I'm here, though, I'll take care of b8210dd. -- -Joe MacDonald. :wq squid.mbox Description: application/mbox signature.asc Description: PGP signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v3] wireguard: add WireGuard kernel module and tools
t;${sysconfdir}" \
> >> +SYSTEMDUNITDIR="${systemd_unitdir}" \
> >> +WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES',
> >> 'systemd', 'yes', '', d)} \
> >> +WITH_BASHCOMPLETION=yes \
> >> +WITH_WGQUICK=yes \
> >> +install
> >> +}
> >> +
> >> +FILES_${PN} = " \
> >> +${sysconfdir} \
> >> +${systemd_unitdir} \
> >> +${bindir} \
> >> +"
> >> +
> >> +RDEPENDS_${PN} = "wireguard-module"
> >> diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> b/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> new file mode 100644
> >> index 000..46a9971
> >> --- /dev/null
> >> +++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> @@ -0,0 +1,18 @@
> >> +SUMMARY = "WireGuard is an extremely simple yet fast and modern VPN"
> >> +DESCRIPTION="WireGuard is a secure network tunnel, operating at layer 3, \
> >> +implemented as a kernel virtual network interface for Linux, which aims
> >> to \
> >> +replace both IPsec for most use cases, as well as popular user space
> >> and/or \
> >> +TLS-based solutions like OpenVPN, while being more secure, more
> >> performant, \
> >> +and easier to use."
> >> +SECTION = "networking"
> >> +HOMEPAGE = "https://www.wireguard.io/";
> >> +LICENSE = "GPLv2"
> >> +
> >> +LIC_FILES_CHKSUM =
> >> "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >> +
> >> +SRC_URI =
> >> "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz";
> >
> > This SRC_URI is gone, maybe it's just a temp location ?
>
> Hm, yeah Jason released a new snapshot, 0.0.20170517. He seems not to
> keep the old snapshots around, I guess he wants to avoid having stale
> versions floating around.
>
> Either we keep bumping the version everytime a new snapshot is available
> or we should just switch to git for OE, what do you think?
I think that given he's not just removing old tarballs from an FTP
server somewhere but removing tags from the git history, it'd be best to
go with a git recipe with a fixed SRCREV.
-J.
>
> --
> Stefan
>
> >
> > // Robert
> >
> >> +
> >> +SRC_URI[md5sum] = "8e559f4fd672b15c38a15eb4d88cc84d"
> >> +SRC_URI[sha256sum] =
> >> "03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b2675"
> >> +
> >> +S = "${WORKDIR}/WireGuard-${PV}/src/"
> >>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/3] freediameter: add new recipe
t; > : 0 );
> > > +-pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR
> > > "/extensions/");
> > > ++TRACE_DEBUG(INFO, "Loading from: '%s'", fullname);
> > > ++CHECK( 0, (dir = opendir (fullname)) == NULL ? 1 : 0 );
> > > +
> > > + while ((dp = readdir (dir)) != NULL) {
> > > + char * dot = strrchr(dp->d_name, '.');
> > > +diff -Nur freeDiameter-1.2.0.orig/tests/testmesg_stress.c freeDiameter-
> > 1.2.0/tests/testmesg_stress.c
> > > +--- freeDiameter-1.2.0.orig/tests/testmesg_stress.c 2014-02-19
> > 17:33:24.785405032 +0800
> > > freeDiameter-1.2.0/tests/testmesg_stress.c 2014-02-19
> > 20:08:03.928403924 +0800
> > > +@@ -67,15 +67,20 @@
> > > + {
> > > + DIR *dir;
> > > + struct dirent *dp;
> > > +-char fullname[512];
> > > ++char fullname[1024];
> > > + int pathlen;
> > > + struct fd_list all_extensions =
> > > FD_LIST_INITIALIZER(all_extensions);
> > > + struct fd_list ext_with_depends =
> > FD_LIST_INITIALIZER(ext_with_depends);
> > > +
> > > ++char *ext_dir = getenv("EXTENSIONS_DIR");
> > > ++if (ext_dir)
> > > ++pathlen = snprintf(fullname, sizeof(fullname), "%s",
> > > ext_dir);
> > > ++else
> > > ++pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR
> > "/extensions/");
> > > ++
> > > + /* Find all extensions which have been compiled along the test
> > > */
> > > +-LOG_D("Loading %s*.fdx from: '%s'", BUILD_DIR "/extensions",
> > > prefix ?:
> > "");
> > > +-CHECK( 0, (dir = opendir (BUILD_DIR "/extensions")) == NULL ? 1
> > > : 0 );
> > > +-pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR
> > > "/extensions/");
> > > ++TRACE_DEBUG(INFO, "Loading from: '%s'", fullname);
> > > ++CHECK( 0, (dir = opendir (fullname)) == NULL ? 1 : 0 );
> > > +
> > > + while ((dp = readdir (dir)) != NULL) {
> > > + char * dot = strrchr(dp->d_name, '.');
> > > diff --git
> > > a/meta-networking/recipes-protocols/freediameter/files/run-ptest
> > b/meta-networking/recipes-protocols/freediameter/files/run-ptest
> > > new file mode 100644
> > > index 0..d0ca8d962
> > > --- /dev/null
> > > +++ b/meta-networking/recipes-protocols/freediameter/files/run-ptest
> > > @@ -0,0 +1,11 @@
> > > +#!/bin/sh
> > > +
> > > +if ! lsmod | grep -q sctp && ! modprobe sctp 2>/dev/null; then
> > > +echo "Couldn't load kernel module sctp."
> > > +echo "Test cases testsctp and testcnx will fail."
> > > +echo
> > > +fi
> > > +
> > > +export EXTENSIONS_DIR=$EXTENSIONS_DIR
> > > +cmake -E cmake_echo_color --cyan "Running tests..."
> > > +ctest --force-new-ctest-process
> > > diff --git
> > > a/meta-networking/recipes-protocols/freediameter/freediameter.inc
> > b/meta-networking/recipes-protocols/freediameter/freediameter.inc
> > > new file mode 100644
> > > index 0..6880d26f2
> > > --- /dev/null
> > > +++ b/meta-networking/recipes-protocols/freediameter/freediameter.inc
> > > @@ -0,0 +1,98 @@
> > > +SUMMARY = "An open source implementation of the diameter protocol"
> > > +DESCRIPTION = "\
> > > +freeDiameter is an open source Diameter protocol implementation. It \
> > > +provides an extensible platform for deploying a Diameter network for \
> > > +your Authentication, Authorization and Accounting needs."
> > > +
> > > +HOMEPAGE = "http://www.freediameter.net";
> > > +
> > > +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools"
> > > +
> > > +pkgname = "freeDiameter"
> > > +
> > > +SRC_URI =
> > "http://www.freediameter.net/hg/${pkgname}/archive/${PV}.tar.gz;downloadfi
> > lename=${pkgname}-${PV}.tar.gz \
> > > +
> > > file://Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch \
> > > + file://freediameter.service \
> > > + file://freediameter.init \
> > > + \
> > > + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \
> > > + 'file://install_test.patch \
> > > +file://run-ptest \
> > > +file://pass-ptest-env.patch', '', d)} \
> > > + "
> > > +
> > > +S = "${WORKDIR}/${pkgname}-${PV}"
> > > +
> > > +PTEST_PATH = "${libdir}/${pkgname}/ptest"
> > > +
> > > +inherit cmake update-rc.d ptest systemd
> > > +
> > > +EXTRA_OECMAKE = " \
> > > +-DDEFAULT_CONF_PATH:PATH=${sysconfdir}/${pkgname} \
> > > +-DBUILD_DBG_MONITOR:BOOL=ON \
> > > +-DBUILD_TEST_APP:BOOL=ON \
> > > +-DBUILD_TESTING:BOOL=ON \
> > > +-DBUILD_APP_RADGW:BOOL=ON \
> > > +-DBUILD_APP_REDIRECT:BOOL=ON \
> > > +-DBUILD_TEST_ACCT:BOOL=ON \
> > > +-DBUILD_TEST_NETEMUL:BOOL=ON \
> > > +-DBUILD_TEST_RT_ANY:BOOL=ON \
> > > +-DINSTALL_LIBRARY_SUFFIX:PATH=${baselib} \
> > > +-DINSTALL_EXTENSIONS_SUFFIX:PATH=${baselib}/${pkgname} \
> > > +-DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \
> > > +-DCMAKE_SKIP_RPATH:BOOL=ON \
> > > +"
> > > +# INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX
> > > +# specify it on cmd line will fix the SET bug in CMakeList.txt
> > > +
> > > +# -DBUILD_APP_ACCT:BOOL=ON This needs POSTGRESQL support
> > > +
> > > +# -DBUILD_APP_DIAMEAP:BOOL=ON -DBUILD_APP_SIP:BOOL=ON -
> > DBUILD_TEST_SIP:BOOL=ON
> > > +# These need MySQL support
> > > +
> > > +# -DBUILD_DBG_INTERACTIVE:BOOL=ON This needs SWIG support
> > > +
> > > +# -DALL_EXTENSIONS=ON will enable all
> > > +
> > > +do_install_append() {
> > > +# install the sample configuration file
> > > +install -d -m 0755 ${D}${sysconfdir}/${pkgname}
> > > +for i in ${S}/doc/*.conf.sample; do
> > > +install -m 0644 $i ${D}${sysconfdir}/${pkgname}/
> > > +done
> > > +mv ${D}${sysconfdir}/${pkgname}/freediameter.conf.sample \
> > > + ${D}${sysconfdir}/${pkgname}/freeDiameter.conf.sample
> > > +
> > > +# install daemon init related files
> > > +install -d -m 0755 ${D}${sysconfdir}/default
> > > +install -d -m 0755 ${D}${sysconfdir}/init.d
> > > +install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \
> > > + ${D}${sysconfdir}/default/${BPN}
> > > +install -m 0755 ${WORKDIR}/freediameter.init
> > ${D}${sysconfdir}/init.d/${BPN}
> > > +
> > > +# install for systemd
> > > +install -d ${D}${systemd_system_unitdir}
> > > +install -m 0644 ${WORKDIR}/freediameter.service
> > ${D}${systemd_system_unitdir}
> > > +sed -i -e 's,@BINDIR@,${bindir},g'
> > ${D}${systemd_system_unitdir}/*.service
> > > +}
> > > +
> > > +do_install_ptest() {
> > > +sed -i "s#\(EXTENSIONS_DIR=\).*\$#\1${libdir}/${pkgname}/#"
> > ${D}${PTEST_PATH}/run-ptest
> > > +mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/
> > > +rmdir ${D}${PTEST_PATH}-tests
> > > +install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/
> > > +}
> > > +
> > > +FILES_${PN}-dbg += "${libdir}/${pkgname}/.debug/*"
> > > +
> > > +# include the extensions in main package
> > > +FILES_${PN} += "${libdir}/${pkgname}/*"
> > > +
> > > +RDEPENDS_${PN} = "glib-2.0 gnutls libidn"
> > > +RDEPENDS_${PN}-ptest = "cmake"
> > > +
> > > +INITSCRIPT_NAME = "${BPN}"
> > > +INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ."
> > > +
> > > +SYSTEMD_SERVICE_${PN} = "freediameter.service"
> > > +SYSTEMD_AUTO_ENABLE = "disable"
> > > diff --git a/meta-networking/recipes-
> > protocols/freediameter/freediameter_1.2.1.bb b/meta-networking/recipes-
> > protocols/freediameter/freediameter_1.2.1.bb
> > > new file mode 100644
> > > index 0..3fb929aa0
> > > --- /dev/null
> > > +++ b/meta-networking/recipes-
> > protocols/freediameter/freediameter_1.2.1.bb
> > > @@ -0,0 +1,7 @@
> > > +include freediameter.inc
> > > +
> > > +LICENSE = "BSD"
> > > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=892b2ed6ae815488a08416ff7ee74a35"
> > > +
> > > +SRC_URI[md5sum] = "61b1062aa144b5f12eed514611e6d697"
> > > +SRC_URI[sha256sum] =
> > "bd7f105542e9903e776aa006c6931c1f5d3d477cb59af33a9162422efa477097"
> > > --
> > > 2.11.0
> > >
> > > --
> > > ___
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/8] freeradius: add new recipe
Sorry to resurrect a v1 patch but I've lost the v2 and the list seems
to have eaten my original reply to that one. Here's my comments from it
(and the reason why the current patch has been marked rejected in
patchwork: https://patchwork.openembedded.org/patch/139452/)
[[oe] [meta-networking][PATCH 2/8 v2] freeradius: add new recipe] On 17.04.26
(Wed 16:22) jackie.hu...@windriver.com wrote:
> From: Jackie Huang
>
> FreeRADIUS is an Internet authentication daemon,
> which implements the RADIUS protocol, as defined
> in RFC 2865 (and others).
>
> Signed-off-by: Jackie Huang
> ---
> .../freeradius/files/freeradius| 110 ++
> .../freeradius-avoid-searching-host-dirs.patch | 194 +
> ...radius-configure.ac-add-option-for-libcap.patch | 70 ++
> ...dius-configure.ac-allow-cross-compilation.patch | 31 +++
> .../files/freeradius-enble-user-in-conf.patch | 28 +++
> ...eeradius-fix-error-for-expansion-of-macro.patch | 61 ++
> ...ius-fix-issues-related-to-m4-include-path.patch | 236
> +
> .../freeradius-fix-quoting-for-BUILT_WITH.patch| 55 +
> .../files/freeradius-libtool-detection.patch | 89
> .../freeradius-libtool-do-not-use-jlibtool.patch | 160 ++
> .../freeradius-rlm_python-add-PY_INC_DIR.patch | 33 +++
> .../freeradius/files/radiusd-volatiles.conf| 2 +
> .../freeradius/files/radiusd.service | 16 ++
> .../freeradius/files/volatiles.58_radiusd | 3 +
> .../freeradius/freeradius_3.0.12.bb| 223 +++
This is an old version of freeradius, as evinced by your SRC_URI:
> +SRC_URI =
> "ftp://ftp.freeradius.org/pub/freeradius/old/freeradius-server-${PV}.tar.bz2 \
Why not bring the current version (3.0.13) in since it's a new recipe
and save a later update?
> diff --git
> a/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
>
> b/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
> new file mode 100644
> index 0..8ab23d3ef
> --- /dev/null
> +++
> b/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
> @@ -0,0 +1,194 @@
> +From dc41591d5ceb18900ec85894f8f7b7bb44bb3bd9 Mon Sep 17 00:00:00 2001
> +From: Jackie Huang
> +Date: Mon, 4 Jan 2016 01:44:04 -0500
> +Subject: [PATCH] avoid searching host dirs
> +
> +Upstream-Status: Inappropriate [cross-compile specific]
I don't know if that's specifically a reason to be inappropriate for
upstream. :-)
Anyway, given that some of the patches were submitted upstream, as you
noted elsewhere, it may be that the current version won't need them at
all.
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] wireguard: module install cleanup
The module_install target shouldn't be used, just installing the module to
the sysroot directly seems more appropriate.
Signed-off-by: Joe MacDonald
---
.../wireguard/wireguard-module_0.0.20170421.bb | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git
a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb
b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb
index e3d4210..2c69c58 100644
--- a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb
+++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb
@@ -1,6 +1,6 @@
require wireguard.inc
-inherit module-base kernel-module-split
+inherit module kernel-module-split
DEPENDS = "virtual/kernel libmnl"
@@ -10,14 +10,22 @@ DEPENDS = "virtual/kernel libmnl"
EXTRA_OEMAKE_append = " \
KERNELDIR=${STAGING_KERNEL_DIR} \
-CC='${CC}' \
-KERNEL_CC='${KERNEL_CC}' \
"
-KERNEL_MODULES_META_PACKAGE = "${PN}"
MAKE_TARGETS = "module"
-MODULES_INSTALL_TARGET = "module-install"
RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
+MODULE_NAME = "wireguard"
-PNBLACKLIST[wireguard-module] ?= "BROKEN: Kernel configuration invalid
(http://errors.yoctoproject.org/Errors/Details/141421/) - the recipe will be
removed on 2017-07-01 unless the issue is fixed"
+# Kernel module packages MUST begin with 'kernel-module-', otherwise
+# multilib image generation can fail.
+#
+# The following line is only necessary if the recipe name does not begin
+# with kernel-module-.
+PKG_${PN} = "kernel-module-${MODULE_NAME}"
+
+module_do_install() {
+install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}
+install -m 0644 ${MODULE_NAME}.ko \
+${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko
+}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v3] wireguard: add WireGuard kernel module and tools
[Re: [oe] [meta-networking][PATCH v3] wireguard: add WireGuard kernel module and tools] On 17.05.01 (Mon 14:37) Stefan Agner wrote: > On 2017-05-01 08:18, Joe MacDonald wrote: > > [Re: [oe] [meta-networking][PATCH v3] wireguard: add WireGuard kernel > > module and tools] On 17.04.28 (Fri 18:18) Stefan Agner wrote: > > > >> > >> > >> Hm, I can not reproduce here. It looks like module has not been > >> included, the module make arguments are missing... > >> > >> Here it looks like this: > >> > >> NOTE: make -j 8 > >> KERNEL_SRC=skins/larry/build/ags/oe-core/build/tmp-glibc/work-shared/qemux86-64/kernel-source > >> KERNELDIR=/build/ags/oe-core/build/tmp-glibc/work-shared/qemux86-64/kernel-source > >> KERNEL_PATH=/build/ags/oe-core/build/tmp-glibc/work-shared/qemux86-64/kernel-source > >> KERNEL_VERSION=4.10.5-yocto-standard CC=x86_64-oe-linux-gcc > >> -fuse-ld=bfd LD=x86_64-oe-linux-ld.bfd AR=x86_64-oe-linux-ar > >> O=/build/ags/oe-core/build/tmp-glibc/work-shared/qemux86-64/kernel-build-artifacts > >> KBUILD_EXTRA_SYMBOLS= module > >> > >> Do you have an idea what is going on? > > > > I don't off hand, but since I merged it, I'll try to investigate it. > > It's been somewhat complicated by the fact that this configuration > > builds for me but fails for the world builds as Martin notes. But the > > configuration that last passed for the world builds failed to build for > > my ARM target builds during a do_install step because it was clearly > > trying to look at my host system. For now I've just blacklisted the > > recipe in master. > > Yeah it really seems that inherit module failed for some reason, which > avoids a whole bunch of make arguments to be missing. Quite likely that > in this case the build system starts to look at default paths. > > But this recipe inherits module the same way as others do. It seems to > me if this recipe fails, then others such as netmap-modules should fail > too... meta-networking/recipes-kernel/netmap/netmap-modules_git.bb:PNBLACKLIST[netmap-modules] ?= "BROKEN: not compatible with default kernel version 4.8 - the recipe will be removed on 2017-09-01 unless the issue is fixed" Heh. But for different reasons. And I'm going to have a look at that soon too. Anyway, I think I have a workable solution for wireguard I'm going to send out now. -J. > > -- > Stefan > > > > > > -J. > > > >> > >> On 2017-04-28 05:24, Martin Jansa wrote: > >> > >> > This latest version (which was merged to master yesterday) fails to > >> > build: > >> > > >> > http://errors.yoctoproject.org/Errors/Details/141421/ > >> > > >> > On Thu, Apr 27, 2017 at 7:30 AM, Stefan Agner wrote: > >> > > >> >> WireGuard is an extremely simple yet fast and modern VPN that utilizes > >> >> state-of-the-art cryptography. It aims to be faster, simpler, leaner, > >> >> and more useful than IPSec, while avoiding the massive headache. > >> >> > >> >> The recipes add the current experimental snapshot v0.0.20170421 > >> >> out-of-tree kernel module and tools. The kernel module has some kernel > >> >> configuration dependencies such as some configuration part of > >> >> features/netfilter/netfilter.scc, hence netfilter.scc should be part > >> >> of KERNEL_EXTRA_FEATURES (which is the case by default). > >> >> > >> >> Since wireguard-tools is TUNE_PKGARCH and depends on wireguard-module > >> >> which is MACHINE_ARCH (like all kernel modules) we need to add this > >> >> dependency to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS. > >> >> > >> >> Signed-off-by: Stefan Agner > >> >> --- > >> >> Changes since v2: > >> >> - Upgrade to v0.0.20170421 > >> >> - Add comment about Linux kernel requirement > >> >> > >> >> Changes since v1: > >> >> - Upgrade to v0.0.20170409 > >> >> - Add wireguard-tools -> wireguard-module dependency to > >> >> SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS. > >> >> > >> >> meta-networking/conf/layer.conf| 4 > >> >> .../wireguard/wireguard-module_0.0.20170421.bb [1] | 13 +++ > >> >> .../wireguard/wireguard-tools_0.0.20170421.bb [2] | 27 > >> >> ++ &
Re: [oe] [meta-networking][PATCH v3] wireguard: add WireGuard kernel module and tools
erit module
> >> +
> >> +# This module requires Linux 3.10 higher and several networking related
> >> +# configuration options. For exact kernel requirements visit:
> >> +# https://www.wireguard.io/install/#kernel-requirements [3]
> >> +
> >> +EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
> >> +MAKE_TARGETS = "module"
> >> +MODULES_INSTALL_TARGET = "module-install"
> >> +
> >> +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
> >> diff --git
> >> a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170421.bb
> >> [2]
> >> b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170421.bb
> >> [2]
> >> new file mode 100644
> >> index 000..79d420f
> >> --- /dev/null
> >> +++
> >> b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170421.bb
> >> [2]
> >>
> >> @@ -0,0 +1,27 @@
> >> +require wireguard.inc
> >> +
> >> +inherit bash-completion systemd pkgconfig
> >> +
> >> +DEPENDS = "wireguard-module libmnl"
> >> +
> >> +do_compile_prepend () {
> >> +cd ${S}/tools
> >> +}
> >> +
> >> +do_install () {
> >> +cd ${S}/tools
> >> +oe_runmake DESTDIR="${D}" PREFIX="${prefix}"
> >> SYSCONFDIR="${sysconfdir}" \
> >> +SYSTEMDUNITDIR="${systemd_unitdir}" \
> >> +WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES',
> >> 'systemd', 'yes', '', d)} \
> >> +WITH_BASHCOMPLETION=yes \
> >> +WITH_WGQUICK=yes \
> >> +install
> >> +}
> >> +
> >> +FILES_${PN} = " \
> >> +${sysconfdir} \
> >> +${systemd_unitdir} \
> >> +${bindir} \
> >> +"
> >> +
> >> +RDEPENDS_${PN} = "wireguard-module"
> >> diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> b/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> new file mode 100644 index 000..46a9971
> >> --- /dev/null
> >> +++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc
> >> @@ -0,0 +1,18 @@
> >> +SUMMARY = "WireGuard is an extremely simple yet fast and modern VPN"
> >> +DESCRIPTION="WireGuard is a secure network tunnel, operating at layer 3, \
> >> +implemented as a kernel virtual network interface for Linux, which aims
> >> to \
> >> +replace both IPsec for most use cases, as well as popular user space
> >> and/or \
> >> +TLS-based solutions like OpenVPN, while being more secure, more
> >> performant, \
> >> +and easier to use."
> >> +SECTION = "networking"
> >> +HOMEPAGE = "https://www.wireguard.io/";
> >> +LICENSE = "GPLv2"
> >> +
> >> +LIC_FILES_CHKSUM =
> >> "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >> +
> >> +SRC_URI =
> >> "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz [4]"
> >> +
> >> +SRC_URI[md5sum] = "8e559f4fd672b15c38a15eb4d88cc84d"
> >> +SRC_URI[sha256sum] =
> >> "03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b2675"
> >>
> >> +
> >> +S = "${WORKDIR}/WireGuard-${PV}/src/"
> >> --
> >> 2.7.4
>
>
>
> Links:
> --
> [1] http://wireguard-module_0.0.20170421.bb
> [2] http://wireguard-tools_0.0.20170421.bb
> [3] https://www.wireguard.io/install/#kernel-requirements
> [4] https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] strongswan: Split plugins
${PN}-staticdev += "${libdir}/ipsec/*.a ${libdir}/ipsec/plugins/*.a"
> > +FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}"
> > +FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug
> > ${libexecdir}/ipsec/.debug"
> > +FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV}
> > ${libdir}/ipsec/*.la"
> > +FILES_${PN}-staticdev += "${libdir}/ipsec/*.a"
> > +
> > +CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf
> > ${sysconfdir}/strongswan.d/*.conf"
> > +
> > +PACKAGES += "${PN}-plugins"
> > +ALLOW_EMPTY_${PN}-plugins = "1"
> > +
> > +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$"
> > +NOAUTOPACKAGEDEBUG = "1"
> > +
> > +python split_strongswan_plugins () {
> > +sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon')
> > +libdir = d.expand('${libdir}/ipsec/plugins')
> > +dbglibdir = os.path.join(libdir, '.debug')
> > +
> > +def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename):
> > +dvar = d.getVar('PKGD', True)
> > +oldfiles = d.getVar('CONFFILES_' + pkg, True)
> > +newfile = '/' + os.path.relpath(f, dvar)
> > +
> > +if not oldfiles:
> > +d.setVar('CONFFILES_' + pkg, newfile)
> > +else:
> > +d.setVar('CONFFILES_' + pkg, oldfiles + " " + newfile)
> > +
> > +split_packages = do_split_packages(d, libdir,
> > 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin',
> > prepend=True)
> > +do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s',
> > 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf)
> > +
> > +split_dbg_packages = do_split_packages(d, dbglibdir,
> > 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin -
> > Debugging files', prepend=True, extra_depends='${PN}-dbg')
> > +split_dev_packages = do_split_packages(d, libdir,
> > 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin -
> > Development files', prepend=True, extra_depends='${PN}-dev')
> > +split_staticdev_packages = do_split_packages(d, libdir,
> > 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin
> > - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-
> > staticdev')
> > +
> > +if split_packages:
> > +pn = d.getVar('PN', True)
> > +d.setVar('RRECOMMENDS_' + pn + '-plugins', '
> > '.join(split_packages))
> > +d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + '
> > '.join(split_dbg_packages))
> > +d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + '
> > '.join(split_dev_packages))
> > +d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + '
> > '.join(split_staticdev_packages))
> > +}
> > +
> > +PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins "
> > +
> > +# Install some default plugins based on default strongSwan ./configure
> > options
> > +# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist
> > +RDEPENDS_${PN} += "\
> > +${PN}-plugin-aes \
> > +${PN}-plugin-attr \
> > +${PN}-plugin-cmac \
> > +${PN}-plugin-constraints \
> > +${PN}-plugin-des \
> > +${PN}-plugin-dnskey \
> > +${PN}-plugin-hmac \
> > +${PN}-plugin-kernel-netlink \
> > +${PN}-plugin-md5 \
> > +${PN}-plugin-nonce \
> > +${PN}-plugin-pem \
> > +${PN}-plugin-pgp \
> > +${PN}-plugin-pkcs1 \
> > +${PN}-plugin-pkcs7 \
> > +${PN}-plugin-pkcs8 \
> > +${PN}-plugin-pkcs12 \
> > +${PN}-plugin-pubkey \
> > +${PN}-plugin-random \
> > +${PN}-plugin-rc2 \
> > +${PN}-plugin-resolve \
> > +${PN}-plugin-revocation \
> > +${PN}-plugin-sha1 \
> > +${PN}-plugin-sha2 \
> > +${PN}-plugin-socket-default \
> > +${PN}-plugin-sshkey \
> > +${PN}-plugin-updown \
> > +${PN}-plugin-vici \
> > +${PN}-plugin-x509 \
> > +${PN}-plugin-xauth-generic \
> > +${PN}-plugin-xcbc \
> > +"
> >
> > RPROVIDES_${PN} += "${PN}-systemd"
> > RREPLACES_${PN} += "${PN}-systemd"
> > --
> > 2.12.2
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/2] dnsmasq: disable the service by default
[Re: [oe] [meta-networking][PATCH 2/2] dnsmasq: disable the service by default]
On 17.02.28 (Tue 01:12) Huang, Jie (Jackie) wrote:
> It can be overridden to enable the service in the conf file of the
> distro with witch only dnsmasq is used in the images.
>
> We can also disable the service in the distro conf file instead of in
> the recipe if it makes more sense.
I've been thinking about this and I think it would make more sense for
dnsmasq to have a PROVIDE/CONFLICT option that would eliminate the risk,
though I guess I can see a scenario where you might want to use bind for
DNS services and use dnsmasq to provide just DHCP or something. It
would be a weird setup, though.
Seems to me that your patch is to cover a case where you want to have
both on the system, though, so can you explain why we wouldn't make
dnsmasq incompatible with bind?
In that scenario, why not check for a PACKAGECONFIG option or for the
presence of bind and only disable dnsmasq if you find bind as well?
-J.
>
> Thanks,
> Jackie
>
> From: Bruce Ashfield [mailto:bruce.ashfi...@gmail.com]
> Sent: Monday, February 27, 2017 10:39 PM
> To: Huang, Jie (Jackie)
> Cc: openembedded-devel
> Subject: Re: [oe] [meta-networking][PATCH 2/2] dnsmasq: disable the service
> by default
>
>
>
> On Mon, Feb 27, 2017 at 3:09 AM,
> mailto:jackie.hu...@windriver.com>> wrote:
> From: Jackie Huang
> mailto:jackie.hu...@windriver.com>>
>
> The service will fail to start/stop when dnsmasq and
> bind (provides named) are both installed since they
> are using the same port 53:
>
> | dnsmasq: failed to create listening socket for port 53: Address already in
> use
>
> So disable the service by default, if the user really
> want to use two dns servives, the config needs to be
> changed to use different interfaces or ports.
>
> But what if the user is only using dnsmasq ? (which is the case in the images
> I use).
> This would be a behaviour change that they add dnsmasq, but don't actually
> get the
> service started.
> IMHO if someone is installing two packages that provide the same service, they
> are more aware of what is going on and can disable one (or the other) ..
> versus
> someone that adds a single package that provides a service .. and then find
> out that
> it doesn't actually start.
> Bruce
>
>
> As reference, other distro like centos/fedora also
> disables the services by default on installation.
>
> Signed-off-by: Jackie Huang
> mailto:jackie.hu...@windriver.com>>
> ---
> meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> index 424a06b..9c2276f 100644
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> @@ -81,3 +81,4 @@ RPROVIDES_${PN} += "${PN}-systemd"
> RREPLACES_${PN} += "${PN}-systemd"
> RCONFLICTS_${PN} += "${PN}-systemd"
> SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
> +SYSTEMD_AUTO_ENABLE ?= "disable"
> --
> 2.8.3
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org<mailto:Openembedded-devel@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee at
> its end"
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent
[Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent] On 17.02.25 (Sat 09:20) Martin Jansa wrote: > > My builds without gvfs are still happy, but reverting the patch > > breaks all builds > > What gets broken? When I removed this change from master-next after > Andreas's report I haven't seen any new issue and the gvfs one was > indeed fixed after that. > > I'll include revert at least in master-next to see what it does with > next bitbake world. The failure wasn't specifically an error, it was a ton of QA warnings about missing providers for libtevent. After abandoning the previous build and starting fresh, as the autobuilder would, it seems okay with the revert, so we'll go with that approach. -J. > > On Sat, Feb 25, 2017 at 4:42 AM, Joe MacDonald > wrote: > > [Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent] On > 17.02.24 (Fri 22:33) MacDonald, Joe wrote: > > > Yeah. If you're near a keyboard, please go ahead and revert otherwise > > I'll get to in later on tonight. > > Bah. This isn't just the revert I'd been hoping for. Samba, as usual, > is a pain. My builds without gvfs are still happy, but reverting the > patch breaks all builds, AFAICT, so I'm going to leave this alone until > I sort out what the correct repair job looks like here. Unless someone > comes up with a solution before I get to it. The weekend is rather full > right now, I'm afraid. > > -J. > > > > > On Feb 24, 2017 5:01 PM, Martin Jansa wrote: > > Joe? > > > > On Fri, Feb 24, 2017 at 10:37 PM, Andreas Müller < > schnitzelt...@googlemail.com<mailto:schnitzelt...@googlemail.com>> wrote: > > On Mon, Feb 20, 2017 at 5:08 PM, Szombathelyi György <mailto:gyu...@freemail.hu>> wrote: > > > Hi, > > > > > > If there's no solution to resolve the conflict between the > internal > tevent and the external one, then maybe putting the libtevent-internal.h > from the external lib to the samba tree would be a way to go. > > > > > > Br, > > > György > > > Eredeti levél > > > Feladó: Andreas Müller <schnitzeltony@googlemail.com googlemail.com>> > > > Dátum: 2017 február 20 12:52:18 > > > Tárgy: Re: [oe] [meta-networking][PATCH v2] Samba: use built-in > libtevent > > > Címzett: openembedded-devel@lists.openembedded.org<http://lists. > openembedded.org> > <openembedded-devel@lists.openembedded.org lists.openembedded.org>> > > > > > > > In last build I've noticed only this new issue related to > samba: > > > > > > > > ctdb-2.5.6: ctdb rdepends on samba, but it isn't a build > dependency, missing samba in DEPENDS or PACKAGECONFIG? [build-deps] > > > > > > > > Maybe this dependency was created from samba being libldb > provider > in > > > > this build. > > > > > > > > gvfs and whole meta-gnome layers is still included in my world, > maybe it > > > > didn't fail because some gvfs dependency was already failing > or one of > > > > samba related changes in master-next is fixing this one. > > > > > > > Some background: During last weekend I prepared a series based on > > > master-next unblacklisting. First target is to build a xfce-image > > > again [1]. Last step yesterday evening should be rebasing against > > > latest master-next and run a test build. That failed for gvfs - so I > > > stopped sending stuff. Now I know why gvfs fails... > > > > > > How do we proceed with this patch? > > > > > > [1] https://github.com/schnitzeltony/meta-openembedded/tree/ > work-2017-02 > > > > > Just notices that this patch made it into master breaking at least gvfs. > Revert? > > > > Andreas > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org<mailto:Openem > bedded-de...@lists.openembedded.org> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > > > -- > -Joe MacDonald. > :wq > > -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent
[Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent] On 17.02.24 (Fri 22:33) MacDonald, Joe wrote: > Yeah. If you're near a keyboard, please go ahead and revert otherwise > I'll get to in later on tonight. Bah. This isn't just the revert I'd been hoping for. Samba, as usual, is a pain. My builds without gvfs are still happy, but reverting the patch breaks all builds, AFAICT, so I'm going to leave this alone until I sort out what the correct repair job looks like here. Unless someone comes up with a solution before I get to it. The weekend is rather full right now, I'm afraid. -J. > > On Feb 24, 2017 5:01 PM, Martin Jansa wrote: > Joe? > > On Fri, Feb 24, 2017 at 10:37 PM, Andreas Müller > mailto:schnitzelt...@googlemail.com>> wrote: > On Mon, Feb 20, 2017 at 5:08 PM, Szombathelyi György > mailto:gyu...@freemail.hu>> wrote: > > Hi, > > > > If there's no solution to resolve the conflict between the internal > > tevent and the external one, then maybe putting the libtevent-internal.h > > from the external lib to the samba tree would be a way to go. > > > > Br, > > György > > Eredeti levél > > Feladó: Andreas Müller > > <schnitzeltony@googlemail.com<http://googlemail.com>> > > Dátum: 2017 február 20 12:52:18 > > Tárgy: Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent > > Címzett: > > openembedded-devel@lists.openembedded.org<http://lists.openembedded.org> > > > > <openembedded-devel@lists.openembedded.org<http://lists.openembedded.org>> > > > > > In last build I've noticed only this new issue related to samba: > > > > > > ctdb-2.5.6: ctdb rdepends on samba, but it isn't a build > > dependency, missing samba in DEPENDS or PACKAGECONFIG? [build-deps] > > > > > > Maybe this dependency was created from samba being libldb provider in > > > this build. > > > > > > gvfs and whole meta-gnome layers is still included in my world, maybe > > it > > > didn't fail because some gvfs dependency was already failing or > > one of > > > samba related changes in master-next is fixing this one. > > > > > Some background: During last weekend I prepared a series based on > > master-next unblacklisting. First target is to build a xfce-image > > again [1]. Last step yesterday evening should be rebasing against > > latest master-next and run a test build. That failed for gvfs - so I > > stopped sending stuff. Now I know why gvfs fails... > > > > How do we proceed with this patch? > > > > [1] https://github.com/schnitzeltony/meta-openembedded/tree/work-2017-02 > > > Just notices that this patch made it into master breaking at least gvfs. > Revert? > > Andreas > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org<mailto:Openembedded-devel@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-networking] ddclient: new package
[[oe] [PATCH] [meta-networking] ddclient: new package] On 17.02.21 (Tue 17:13)
Ray Kinsella wrote:
> Adding the package ddclient. DDClient updates Dynamic DNS servers with an IP
> address.
> Recipe is based on the original OE recipe found here.
>
> http://cgit.openembedded.org/openembedded/tree/recipes/ddclient/ddclient_3.6.3.bb
>
> DDClient version has been updated to 3.8.3.
>
> Signed-off-by: Ray Kinsella
> ---
> .../recipes-daemons/ddclient/ddclient_3.8.3.bb | 45
> ++
> .../recipes-daemons/ddclient/files/ip-up | 4 ++
> 2 files changed, 49 insertions(+)
> create mode 100644 meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> create mode 100644 meta-networking/recipes-daemons/ddclient/files/ip-up
>
> diff --git a/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> new file mode 100644
> index 000..723eb67
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb
> @@ -0,0 +1,45 @@
> +SECTION = "net/misc"
> +DESCRIPTION = "Ddclient is a Perl client used to update dynamic DNS entries
> for accounts on Dynamic DNS Network Services"
> +HOMEPAGE = "http://ddclient.sourceforge.net/";
> +LICENSE = "GPLv2"
> +PR = "r4"
We don't need explicit PRs anymore.
> +SRC_URI = "\
> +${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
> +file://ip-up"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
> +
> +RDEPENDS_${PN} = "\
> +perl-module-getopt-long \
> +perl-module-sys-hostname \
> +perl-module-io-socket \
> +perl-module-vars \
> +perl-module-overload \
> +perl-module-overloading \
> +perl-module-config \
> +perl-module-integer \
> +perl-module-exporter-heavy \
> +perl-module-symbol \
> +perl-module-selectsaver \
> +bash \
> +perl \
> +libio-socket-ssl-perl"
I haven't looked at the download, but I did briefly read the SF documentation
and it seems like maybe these would be appropriate as well:
do_configure[noexec] = "1"
do_compile[noexec] = "1"
> +do_install() {
> +install -d ${D}${sbindir} ${D}${sysconfdir}/ddclient
> ${D}${sysconfdir}/init.d
> +install -d ${D}${sysconfdir}/ppp/ip-up.d/ install -d
> ${D}${docdir}/ddclient
> +install -m 755 ${S}/ddclient ${D}${sbindir}
> +install ${S}/sample-etc_ddclient.conf
> ${D}${sysconfdir}/ddclient/ddclient.conf
> +install -m 755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ip-up.d/ddclient
> +sed -e 's|/etc/ddclient.conf|/etc/ddclient/ddclient.conf|g'
> ${S}/sample-etc_rc.d_init.d_ddclient > ${S}/rc_init
> +install -m 755 ${S}/rc_init ${D}${sysconfdir}/init.d/ddclient
> +install ${S}/README* ${D}${docdir}/ddclient
> +install ${S}/COPY* ${D}${docdir}/ddclient
> +install ${S}/sample* ${D}${docdir}/ddclient
> +}
> +
> +CONFFILES_${PN} = "${sysconfdir}/ddclient/ddclient.conf"
> +
> +SRC_URI[md5sum] = "3b426ae52d509e463b42eeb08fb89e0b"
> +SRC_URI[sha256sum] =
> "d40e2f1fd3f4bff386d27bbdf4b8645199b1995d27605a886b8c71e44d819591"
> diff --git a/meta-networking/recipes-daemons/ddclient/files/ip-up
> b/meta-networking/recipes-daemons/ddclient/files/ip-up
> new file mode 100644
> index 000..52a44f8
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ddclient/files/ip-up
> @@ -0,0 +1,4 @@
> +#!/bin/sh
> +
> +logger -t ddclient $PPP_IFACE $PPP_LOCAL
> +ddclient -daemon=0 -syslog -use=if -if=$PPP_IFACE >/dev/null 2>&1
> \ No newline at end of file
That's odd. :-)
Anyway, I'll have a look at this in more detail when it loops through
master-next.
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Splitting meta-oe?
[Re: [oe] Splitting meta-oe?] On 17.02.19 (Sun 19:31) Richard Purdie wrote: > On Fri, 2017-02-17 at 14:45 -0500, Philip Balister wrote: > > And I'm with these gyus. Splitting the git repository doesn't solve > > any underlying problems. The real problem from my point of view is > > very few of use are actually paid to maintain the layers we maintain. > > > > Employers want to pay things they profit from, and that is not paying > > someone to maintain "core infrastructure". > > > > Layer maintainers interests change over time, and you burn out > > supporting people who get to do all the cool stuff with the layers > > you maintain. In the end, you get all the crap and non of the glory. > > Within this list, most people appreciate your work. Outside the > > community, people completely underestimate the amount of work > > required to keep the ecosystem running. > > > > Yeah, add my name to the list of cranky people. > > I do think this is a valid question that Ross asks and that whilst the > first quick reaction is "no", its worth thinking about the pros/cons. Absolutely, and that's why I brought up earlier that my initial proposal for meta-networking was that it be a separate tree from the rest of meta-oe. When I first looked at this and what my initial goals were for meta-networking, it made sense to me to be at arms' length. Still does, to be honest, but being several years into the project now I find myself with a different mindset on the costs/benefits. > The pros to me would be about better test time on patches and in > theory more specialist knowledge. This isn't to say Martin/Joe don't > do a bad job but the size of meta-oe does mean there are limits. This is the thing that I'd like to get more of your point of view on, because it doesn't seem clear to me. Today, a quick survey of meta-oe shows we have 14 top-level layers in meta-oe (yeah, does seem like a lot) and of those I maintain one (sharing ownership with Armin when it comes to anything netkit-related, as noted in the MAINTAINERS file) of the others only meta-gnome seems to have only Martin listed as a maintainer (though a few, for example gpe, multimedia and oe, have only Martin and Koen, so there's certainly a case to be made there for there being a larger burden on them). Maybe we're talking specifically about meta-openembedded/meta-oe, in which case I apologize for derailing the discussion. I certain tried to help that situation with creating meta-networking and moving some of the stuff in meta-oe out into the new layer when we created it, but meta-oe still is a really big layer (664 recipes if 'find' can be trusted), no question. > The cons are more around finding suitable layer maintainers, which as > we all know are hard to find. > > I'd probably suggest that: > > a) We need to encourage/empower more people to maintain layers Yes, without question. > b) Having better infrastructure, tools and processes that help a) would > therefore be desirable. The updated patchwork has seriously made my life a lot easier. And I don't want to go off too much on an tangent, but I'd really love to bring meta-selinux into that same fold. > c) We need to be willing to separate out pieces for people to maintain > in such layers. It might not always work out but we should be > willing to try. This is the part I'm still struggling with. For good or ill meta-networking got created, I've tried to maintain it reasonably carefully and along the way the only thing that stands out for me as an issue while remaining part of the overall meta-openembedded project was a brief hiccup following the hardware upgrade at the end of December where I lost the ability to push commits. But since Martin hadn't, I just asked him to merge the meta-networking queue I was trying to merge and that's all sorted out now. I certainly don't object to having another meta-something in the overall meta-openembedded project and I don't object to having additional hands to carry the workload, but I'm not clear how separate git repositories addresses the current challenge. > As for the comments about core changes, I really do try hard not to > make them in many ways. The ones we do make, I'd hope are for the right > reasons. > > No easy answers but don't shoot Ross for asking what I think is a > reasonable question. I really, honestly did not mean for anything I said to sound like that. It's good to have this kind of discussion from time to time. It's very easy to get stuck in the "this is the way it's always been done" rut, so I hope Ross didn't feel like anyone was shouting him down. Wish I was going to be around Wilsonville this week, I'd like to talk more about this with you all. -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Splitting meta-oe?
[Re: [oe] Splitting meta-oe?] On 17.02.17 (Fri 19:02) Martin Jansa wrote: > On Fri, Feb 17, 2017 at 06:24:09PM +0100, Andreas Müller wrote: > > On Fri, Feb 17, 2017 at 6:07 PM, Burton, Ross wrote: > > > The recent storm of breakage in meta-oe caused by recipe specific sysroots > > > was quite dramatic: > > > > > > ross@flashheart ~/Yocto/meta-oe ((044e518...)) > > > $ git grep PNBLACKLIST| wc -l > > > 320 > > > > > > Is it time to talk about splitting meta-oe into smaller real repositories > > > so they can be maintained at their own pace by more maintainers? > > > > > > Ross > > What exactly gets better by splitting? > > I agree with Andreas. And I agree with both of you. > 1) RSS is good thing. > > 2) The breakage wasn't caused by lack of maintainers (at least I don't >think that I or Joe were the bottleneck for integrating the fixes). My schedule is highly variable but I do try to be responsive to breakages and I do my best to watch and digest the state of the world messages, those are extremely valuable IMO. > 3) More maintainers doesn't mean more contributions from people actually >using now broken components, it's actually easier to just send a fix >than to be a maintainer of some layer just to be able to also merge >your fix yourself. > > 4) It doesn't look so dramatic if it turns out that 200 of those >blacklisted recipes weren't actually used by anyone still active in >OE ecosystem. Agreed. And if those blacklisted recipes are something that someone in the ecosystem cares about, they really should be sending fixes back upstream. Breaking meta-oe up into smaller parts doesn't seem likely to make them more likely to send patches, AFAICT. Probably won't make them less-so, either, but I don't see changing the structure to be a significant win. And do note that when we first created meta-networking I was proposing it be separate from meta-oe, I'm now completely on the other side of that argument, for what that's worth. > 5) If someone wants to replace me as meta-oe maintainer, go ahead, it >stopped being fun for me long time ago, now it's just slightly annoying >routine which takes my free time I would rather invest in something >cooler I frankly think that'd be a loss for everyone, but it's understandable. That's a big, largely thankless job you've taken on. Obviously I can't offer to take on more of the job than I already have with meta-networking or I would, but maybe someone else with a similarly "big picture" view will be able to share some of the workload. -J. > > Regards, > > > Splitting = Rotting to death due to unmanageable maintenance burden > > caused by oe? Don't misunderstand me recipe specific sysroot is > > basically a good thing. But I am tired of this game. As you can see in > > meta-qt5-extra: I am interested in having cool images not in a cool > > build system. Long live core-image-sato! > > > > Andreas > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking] [PATCH] dibbler: fix SRC_URI from ${P} to ${BP}
[[oe] [meta-networking] [PATCH] dibbler: fix SRC_URI from ${P} to ${BP}] On
17.01.19 (Thu 17:54) Robert Yang wrote:
> Otherwise it would fail when multilib.
>
> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20170120
Hi Robert,
Was this the version you intended to send to the list?
-J.
>
> Signed-off-by: Robert Yang
> ---
> meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb
> b/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb
> index a2d46db..1913d3a 100644
> --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb
> +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6";
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3"
>
> -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${P}.tar.gz \
> +SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \
> file://dibbler_fix_getSize_crash.patch \
> file://types.patch \
> "
> --
> 2.9.0
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] iscsitarget: Fix call trace of ahash API calling
sitarget-1.4.20.3
>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
> +tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC);
> ++hash = ahash_request_alloc(tfm, GFP_ATOMIC);
> +#else
> hash.tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
> hash.flags = 0;
> +#endif
>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
> -+if (!IS_ERR(tfm)) {
> ++if (tfm && !IS_ERR(tfm)) {
> +#else
> if (!IS_ERR(hash.tfm)) {
> +#endif
> struct scatterlist sg[2];
> unsigned int nbytes = 0;
>
> -@@ -102,11 +115,19 @@ static void gen_scsiid(struct iet_volume
> +@@ -102,11 +115,22 @@ static void gen_scsiid(struct iet_volume
> sg_set_buf(&sg[1], &volume->lun, sizeof(volume->lun));
> nbytes += sizeof(volume->lun);
>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
> -+crypto_ahash_init(hash);
> ++ahash_request_set_callback(hash, 0, NULL, NULL);
> + ahash_request_set_crypt(hash, sg, volume->scsi_id, nbytes);
> -+crypto_ahash_update(hash);
> +crypto_ahash_digest(hash);
> ++crypto_ahash_init(hash);
> ++crypto_ahash_update(hash);
> ++crypto_ahash_final(hash);
> ++ahash_request_free(hash);
> +crypto_free_ahash(tfm);
> +#else
> crypto_hash_init(&hash);
> --
> 2.9.3
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] lftp: update SRC_URI with new source
Hi Oleksandr,
[[oe] [meta-networking][PATCH] lftp: update SRC_URI with new source] On
17.01.07 (Sat 09:31) Oleksandr Kravchuk wrote:
> Use official web-site of lftp, which keeps tarballs with old versions.
In line with my response on the tcpdump, please just send a v2 of the
uprev patch with the SRC_URI updated, since the lftp update hasn't been
merged yet anyway.
Thank you.
-J.
>
> Signed-off-by: Oleksandr Kravchuk
> ---
> meta-networking/recipes-connectivity/lftp/lftp_4.7.4.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.7.4.bb
> b/meta-networking/recipes-connectivity/lftp/lftp_4.7.4.bb
> index b627963..0b44abc 100644
> --- a/meta-networking/recipes-connectivity/lftp/lftp_4.7.4.bb
> +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.7.4.bb
> @@ -6,7 +6,7 @@ SECTION = "console/network"
> LICENSE = "GPLv3"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
> -SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.bz2 \
> +SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \
> file://fix-gcc-6-conflicts-signbit.patch \
>"
> SRC_URI[md5sum] = "7b54407ab24c1e78b45fe445d83eb5fd"
> --
> 2.7.4
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] tcpdump: upgrade to 4.8.1
[Re: [oe] [meta-networking][PATCH] tcpdump: upgrade to 4.8.1] On 17.01.07 (Sat
10:12) Oleksandr Kravchuk wrote:
> Martin -
>
> Thank you for the comment. I will try to pay closer attention to
> warnings during testing in the future.
>
> I have sent a fix to the mailing list, "[meta-networking][PATCH]
> tcpdump: remove obsolete enable-ipv6 configure flag".
As far as I can tell, --disable-ipv6 is still a valid option for 4.7.4
and since your patch doing the update hasn't been merged yet, please
just send a v2 of the single patch. There's no need for two.
Thanks.
-J.
>
> On 5 January 2017 at 19:02, Martin Jansa wrote:
> > On Mon, Jan 02, 2017 at 09:28:18AM +0100, Oleksandr Kravchuk wrote:
> >> Signed-off-by: Oleksandr Kravchuk
> >
> > Causes:
> > ERROR: tcpdump-4.8.1-r0 do_configure: QA Issue: tcpdump: configure was
> > passed unrecognised options: --enable-ipv6 [unknown-configure-option]
> > ERROR: tcpdump-4.8.1-r0 do_configure: Fatal QA errors found, failing task.
> > ERROR: tcpdump-4.8.1-r0 do_configure: Function failed: do_qa_configure
> >
> >> ---
> >> .../recipes-support/tcpdump/{tcpdump_4.7.4.bb => tcpdump_4.8.1.bb}| 4
> >> ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >> rename meta-networking/recipes-support/tcpdump/{tcpdump_4.7.4.bb =>
> >> tcpdump_4.8.1.bb} (91%)
> >>
> >> diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
> >> b/meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb
> >> similarity index 91%
> >> rename from meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
> >> rename to meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb
> >> index e18228f..18efb9b 100644
> >> --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
> >> +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb
> >> @@ -12,8 +12,8 @@ SRC_URI = " \
> >> file://add-ptest.patch \
> >> file://run-ptest \
> >> "
> >> -SRC_URI[md5sum] = "58af728de36f499341918fc4b8e827c3"
> >> -SRC_URI[sha256sum] =
> >> "6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af"
> >> +SRC_URI[md5sum] = "32f57943649f276e09236ba66622bb0c"
> >> +SRC_URI[sha256sum] =
> >> "20e4341ec48fcf72abcae312ea913e6ba6b958617b2f3fb496d51f0ae88d831c"
> >> export LIBS=" -lpcap"
> >>
> >> inherit autotools-brokensep ptest
> >> --
> >> 2.7.4
> >>
> >> --
> >> ___
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
>
>
>
> --
> echo "EOF" >> /var/tmp/email
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking] [PATCH] opensaf: 5.0.0 -> 5.1.0
[Re: [oe] [meta-networking] [PATCH] opensaf: 5.0.0 -> 5.1.0] On 16.12.21 (Wed
21:53) Khem Raj wrote:
>
> > On Dec 21, 2016, at 12:42 AM, Huang Qiyu
> > wrote:
> >
> > 1)Upgrade opensaf from 5.0.0 to 5.1.0.
> > 2)Modify meta_oe_security_flags.inc to fix error:
> > /
> > | collect2: error: ld returned 1 exit status
> > | Makefile:542: recipe for target 'librda.la' failed
> > | make[6]: *** [librda.la] Error 1
> > \
> >
> > Signed-off-by: Huang Qiyu
> > ---
> > .../recipes-daemons/opensaf/{opensaf_5.0.0.bb => opensaf_5.1.0.bb}| 4
> > ++--
> > meta-oe/conf/distro/include/meta_oe_security_flags.inc| 1 +
> > 2 files changed, 3 insertions(+), 2 deletions(-)
> > rename meta-networking/recipes-daemons/opensaf/{opensaf_5.0.0.bb =>
> > opensaf_5.1.0.bb} (94%)
> >
> > diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
> > b/meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb
> > similarity index 94%
> > rename from meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
> > rename to meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb
> > index 6ceb225..be903a0 100644
> > --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
> > +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb
> > @@ -21,8 +21,8 @@ SRC_URI =
> > "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
> >file://0001-plmcd-error-fix.patch \
> >"
> >
> > -SRC_URI[md5sum] = "94cd1a4c0406e6a45bb04c003f8690e7"
> > -SRC_URI[sha256sum] =
> > "4b4188a0f3d0ed1ed0e3d77de27c45e2c96b437401de08e7df2ed9ecd54bb999"
> > +SRC_URI[md5sum] = "821391311c73bc2f2dc5a7d867f732e0"
> > +SRC_URI[sha256sum] =
> > "f687c883a0d50517c33cb445d9177a9e2b07f5bb077bcc0235ffc0fc99af5cb6"
> >
> > inherit autotools useradd systemd pkgconfig
> >
> > diff --git a/meta-oe/conf/distro/include/meta_oe_security_flags.inc
> > b/meta-oe/conf/distro/include/meta_oe_security_flags.inc
> > index 815fb16..01ee4d4 100644
> > --- a/meta-oe/conf/distro/include/meta_oe_security_flags.inc
> > +++ b/meta-oe/conf/distro/include/meta_oe_security_flags.inc
> > @@ -25,3 +25,4 @@ SECURITY_CFLAGS_pn-libvdpau = "${SECURITY_NO_PIE_CFLAGS}"
> > #| make[1]: *** [Makefile:675: libluajit.so] Error 1
> > SECURITY_CFLAGS_pn-luajit = "${SECURITY_NO_PIE_CFLAGS}"
> >
> > +SECURITY_CFLAGS_pn-opensaf = "${SECURITY_NO_PIE_CFLAGS}”
>
> I was wondering if it would make sense to move tweaking SECURITY_FLAGS
> in the recipe proper for all the exceptions that we manage in the conf
> metadata
Makes sense to me, having it over in meta_oe_security_flags.inc seems a
little confusing for someone who doesn't know to look there. If there's
no objection, I'll just tweak this patch appropriately during the merge.
-J.
>
> > --
> > 2.7.4
> >
> >
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 10/10] samba: simplify LSB handling
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 804a4d2..c2436af 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -38,8 +38,8 @@ DEPENDS_append_libc-musl = " libtirpc"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
LDFLAGS_append_libc-musl = " -ltirpc"
-SYSVINITTYPE_linuxstdbase = "lsb"
-SYSVINITTYPE = "sysv"
+LSB = ""
+LSB_linuxstdbase = "lsb"
INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
@@ -48,19 +48,16 @@ SYSTEMD_PACKAGES = "${PN}-base winbind"
SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
SYSTEMD_SERVICE_winbind = "winbind.service"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'zeroconf', '', d)} \
acl cups ldap \
"
-RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb',
'', d)}"
+RDEPENDS_${PN}-base += "${LSB}"
RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt"
PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
-PACKAGECONFIG[lsb] = ",,lsb"
-PACKAGECONFIG[sysv] = ",,sysvinit"
PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
PACKAGECONFIG[sasl] = ",,cyrus-sasl"
@@ -121,7 +118,7 @@ do_install_append() {
install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
echo "d ${localstatedir}/log/samba 0755 root root -" \
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
-if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
+if [ "${LSB}" = "lsb" ]; then
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
else
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 09/10] samba: start on boot with systemd
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 76f97cf..804a4d2 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -44,6 +44,10 @@ SYSVINITTYPE = "sysv"
INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
+SYSTEMD_PACKAGES = "${PN}-base winbind"
+SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
+SYSTEMD_SERVICE_winbind = "winbind.service"
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'zeroconf', '', d)} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 07/10] samba: add packages samba-dsdb-modules, samba-testsuite and registry-tools
From: Andreas Oberritter
Inspired by Debian.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 14 ++
1 file changed, 14 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index c4b6298..b8d7141 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -154,6 +154,7 @@ do_install_append() {
}
PACKAGES =+ "${PN}-python ${PN}-pidl \
+ ${PN}-dsdb-modules ${PN}-testsuite registry-tools \
winbind \
${PN}-common ${PN}-base ${PN}-ctdb-tests \
smbclient"
@@ -210,6 +211,19 @@ FILES_${PN} += "${libdir}/vfs/*.so \
${libdir}/auth/*.so \
"
+FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb"
+
+FILES_${PN}-testsuite = "${bindir}/gentest \
+ ${bindir}/locktest \
+ ${bindir}/masktest \
+ ${bindir}/ndrdump \
+ ${bindir}/smbtorture"
+
+FILES_registry-tools = "${bindir}/regdiff \
+${bindir}/regpatch \
+${bindir}/regshell \
+${bindir}/regtree"
+
FILES_winbind = "${sbindir}/winbindd \
${bindir}/wbinfo \
${bindir}/ntlm_auth \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 08/10] samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index b8d7141..76f97cf 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -109,7 +109,9 @@ do_install_append() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
-sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
+sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \
+-e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \
+-i ${D}${systemd_system_unitdir}/*.service
install -d ${D}${sysconfdir}/tmpfiles.d
install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -134,8 +136,8 @@ do_install_append() {
install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf
install -D -m 644 ${WORKDIR}/volatiles.03_samba
${D}${sysconfdir}/default/volatiles/03_samba
-install -d ${D}${sysconfdir}/sysconfig/
-install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/sysconfig/samba
+install -d ${D}${sysconfdir}/default
+install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/default/samba
# install ctdb config file and test cases
install -D -m 0644 ${S}/ctdb/tests/onnode/nodes
${D}${sysconfdir}/ctdb/nodes
@@ -203,6 +205,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
FILES_${BPN}-common = "${sysconfdir}/default \
${sysconfdir}/samba \
+ ${sysconfdir}/tmpfiles.d \
"
FILES_${PN} += "${libdir}/vfs/*.so \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 03/10] samba: add smbclient package
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index aabc043..1d9d75b 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -144,10 +144,10 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
-PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator"
-PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
- libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests"
-
+PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \
+ libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
+ libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests \
+ smbclient"
RDEPENDS_${PN} += "${PN}-base"
@@ -302,5 +302,16 @@ FILES_${PN}-python =
"${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
"
+FILES_smbclient = "${bindir}/cifsdd \
+ ${bindir}/rpcclient \
+ ${bindir}/smbcacls \
+ ${bindir}/smbclient \
+ ${bindir}/smbcquotas \
+ ${bindir}/smbget \
+ ${bindir}/smbspool \
+ ${bindir}/smbtar \
+ ${bindir}/smbtree \
+ ${libdir}/samba/smbspool_krb5_wrapper"
+
RDEPENDS_${PN}-pidl_append = " perl"
FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 04/10] samba: install manpages
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 +
1 file changed, 9 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 1d9d75b..27f605a 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -98,6 +98,15 @@ DISABLE_STATIC = ""
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
do_install_append() {
+for section in 1 5 7; do
+install -d ${D}${mandir}/man$section
+install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section
+done
+for section in 1 5 7 8; do
+install -d ${D}${mandir}/man$section
+install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section
+done
+
install -d ${D}${systemd_system_unitdir}
install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 06/10] samba: split libraries into their own packages
From: Andreas Oberritter
It's quite hard to track library dependencies manually between
releases. Splitting libraries into their own packages creates
some overhead but effectively uses less storage in minimal
installations.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 134 +
1 file changed, 30 insertions(+), 104 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index b17e0cf..c4b6298 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -153,11 +153,33 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
-PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \
- libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
- libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests \
+PACKAGES =+ "${PN}-python ${PN}-pidl \
+ winbind \
+ ${PN}-common ${PN}-base ${PN}-ctdb-tests \
smbclient"
+python samba_populate_packages() {
+def module_hook(file, pkg, pattern, format, basename):
+pn = d.getVar('PN', True)
+d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg)
+
+mlprefix = d.getVar('MLPREFIX', True) or ''
+pam_libdir = d.expand('${base_libdir}/security')
+pam_pkgname = mlprefix + 'pam-plugin%s'
+do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM
plugin for %s', extra_depends='', prepend=True)
+
+libdir = d.getVar('libdir', True)
+do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True, allow_links=True)
+pkglibdir = '%s/samba' % libdir
+do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True)
+moduledir = '%s/samba/auth' % libdir
+do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s
authentication backend', hook=module_hook, extra_depends='', prepend=True)
+moduledir = '%s/samba/pdb' % libdir
+do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s
password backend', hook=module_hook, extra_depends='', prepend=True)
+}
+
+PACKAGESPLITFUNCS_prepend = "samba_populate_packages "
+
RDEPENDS_${PN} += "${PN}-base"
FILES_${PN}-base = "${sbindir}/nmbd \
@@ -178,121 +200,25 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
/run/ctdb \
"
-# figured out by
-#
FILES="tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/smbd
tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/nmbd"
-#
-# while [ "${FILES}" != "${OLDFILES}" ]
-# do
-# OLDFILES="${FILES}"
-#
NEEDED=`tmp/sysroots/x86_64-linux/usr/libexec/arm-poky-linux-gnueabi.gcc-cross-initial-arm/gcc/arm-poky-linux-gnueabi/5.2.0/objdump
-x ${FILES} | grep NEEDED | egrep -E 'so(.[0-9]|$)' | sort -u | perl
-MData::Dumper -le 'while (<>) {chomp; push @lib, (split)[1]}; print "(",
join("|", @lib), ")"'`
-# NF=`find
tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib
-type f | egrep "${NEEDED}" | sort -u`
-#
-# FILES=`perl -le 'foreach (@ARGV) { $f{$_}++ }; print join(" ", sort keys
%f)' ${FILES} ${NF}`
-# done
-#
-# LIBS=`echo ${FILES} | sed -e
's,tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib,${libdir},g'
-e 's,.so.[0-9]+.*$,.so.*,g'`
-# for l in ${LIBS}
-# do
-# echo $l
-# done
-
-FILES_lib${BPN}-base = "\
-${sysconfdir}/default \
-${sysconfdir}/samba \
-${libdir}/libdcerpc-binding.so.* \
-${libdir}/libgensec.so.* \
-${libdir}/libndr-krb5pac.so.* \
-${libdir}/libndr-nbt.so.* \
-${libdir}/libndr-standard.so.* \
-${libdir}/libndr.so.* \
-${libdir}/libnetapi.so.* \
-${libdir}/libpdb.so.* \
-${libdir}/libsamba-credentials.so.* \
-${libdir}/libsamba-hostconfig.so.* \
-${libdir}/libsamba-util.so.* \
-${libdir}/libsamdb.so.* \
-
[oe] [meta-networking][PATCH 05/10] samba: simplify files list for samba-python
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 27f605a..b17e0cf 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -293,23 +293,7 @@ FILES_libwinbind = "${base_libdir}/security/pam_winbind.so
\
${systemd_system_unitdir}/winbind.service"
FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so
\
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/_ldb_text.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/external/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/kcc/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/netcmd/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/provision/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/subunit/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/tests/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/third_party/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
-"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
FILES_smbclient = "${bindir}/cifsdd \
${bindir}/rpcclient \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 02/10] samba: install systemd units and initscripts unconditionally
From: Andreas Oberritter
Fixes hybrid systemd/sysvinit setups.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 783a7cd..aabc043 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -98,19 +98,18 @@ DISABLE_STATIC = ""
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
do_install_append() {
-if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)};
then
-install -d ${D}${systemd_system_unitdir}
-install -m 0644 packaging/systemd/*.service
${D}${systemd_system_unitdir}
-sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
-
-install -d ${D}${sysconfdir}/tmpfiles.d
-install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
-echo "d ${localstatedir}/log/samba 0755 root root -" \
->> ${D}${sysconfdir}/tmpfiles.d/samba.conf
-elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)};
then
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
+sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
+
+install -d ${D}${sysconfdir}/tmpfiles.d
+install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
+echo "d ${localstatedir}/log/samba 0755 root root -" \
+>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
+if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
-elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)};
then
+else
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba
sed -e 's,/opt/samba/bin,${sbindir},g' \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 01/10] samba: rename initscript from 'samba.sh' to more common 'samba'
From: Andreas Oberritter
This gets masked automatically by samba.service if systemd is running.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 6d62481..783a7cd 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc"
SYSVINITTYPE_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv"
-INITSCRIPT_NAME = "samba.sh"
+INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
@@ -109,16 +109,16 @@ do_install_append() {
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)};
then
install -d ${D}${sysconfdir}/init.d
-install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d
+install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)};
then
install -d ${D}${sysconfdir}/init.d
-install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba.sh
+install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba
sed -e 's,/opt/samba/bin,${sbindir},g' \
-e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
-e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
--e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
+-e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \
-e 's,/usr/bin,${base_bindir},g' \
--i ${D}${sysconfdir}/init.d/samba.sh
+-i ${D}${sysconfdir}/init.d/samba
fi
install -d ${D}${sysconfdir}/samba
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 00/11][v2] samba: refresh pending patches
Rev two of the updated patch set, this time with potentially less multlib issues (thanks for catching that, Andreas) and formally dropping the DISABLE_STATIC patch. -- -Joe MacDonald. :wq -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 04/11] samba: add smbclient package
[Re: [meta-networking][PATCH 04/11] samba: add smbclient package] On 16.12.17
(Sat 14:33) Andreas Oberritter wrote:
> On 17.12.2016 03:15, Joe MacDonald wrote:
> > From: Andreas Oberritter
> >
> > Signed-off-by: Andreas Oberritter
> > Signed-off-by: Joe MacDonald
> > ---
> > .../recipes-connectivity/samba/samba_4.4.5.bb | 19
> > +++
> > 1 file changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> > b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> > index c9e0953..37dabb6 100644
> > --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> > +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> > @@ -143,10 +143,10 @@ do_install_append() {
> > rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
> > }
> >
> > -PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator"
> > -PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes
> > \
> > - libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests"
> > -
> > +PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \
> > + libwbclient libnss-winbind winbind libnetapi libsmbsharemodes
> > \
> > + libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests \
> ^
> This partially reverts commit 8f92aa970a34fa5af019c164d9e650de8fe511d3.
Correct, I missed that. Thanks.
-J.
>
> Regards,
> Andreas
>
> > + smbclient"
> >
> > RDEPENDS_${PN} += "${PN}-base"
> >
> > @@ -301,5 +301,16 @@ FILES_${PN}-python =
> > "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
> >
> > ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
> > "
> >
> > +FILES_smbclient = "${bindir}/cifsdd \
> > + ${bindir}/rpcclient \
> > + ${bindir}/smbcacls \
> > + ${bindir}/smbclient \
> > + ${bindir}/smbcquotas \
> > + ${bindir}/smbget \
> > + ${bindir}/smbspool \
> > + ${bindir}/smbtar \
> > + ${bindir}/smbtree \
> > + ${libdir}/samba/smbspool_krb5_wrapper"
> > +
> > RDEPENDS_${PN}-pidl_append = " perl"
> > FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
> >
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 00/11] samba: refresh pending patches
[Re: [meta-networking][PATCH 00/11] samba: refresh pending patches] On 16.12.17 (Sat 14:43) Andreas Oberritter wrote: > On 17.12.2016 03:15, Joe MacDonald wrote: > > As I mentioned earlier this week, I'm taking a stab at updating the samba > > patches from Andreas Oberritter that now have conflicts due to other > > changes queued up for samba. Quite a few of them actually applied cleanly > > after resolving earlier conflicts and the basic smoke tests seem to pass > > for me, but this definitely needs a bit of soak time in master-next and if > > you're around, Andreas, and can double-check my work on your patches, > > that'd be much appreciated. > > > > Joe, apart from my comment to patch 4, your rebase looks good to me. I > hope that patch 7 doesn't introduce a regression for multilib, but I > guess someone using multilib has to find out. That's a good point and I am setting up a multilib build here to try it out, but since I never use multilib and since patch 7 only hits the one package list that was using BPN, I'm thinking multilib builds were broken in a different way before any of this anyway. Thanks for the review, Andreas. -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
[Re: [oe] [meta-networking][PATCH 03/11] samba: remove unused variable
DISABLE_STATIC] On 16.12.17 (Sat 14:12) Andreas Oberritter wrote:
> On 17.12.2016 04:05, Joe MacDonald wrote:
> > Oh, I just realized this one sneaked back in despite my having thrown it
> > out at least twice now. I've already rejected it in patchwork, but if
> > anyone is picking this up off the mailing list, DISABLE_STATIC is very
> > much still needed AFAICT.
>
> Sorry, I didn't recognize it as a global variable.
No worries, honest mistake, it does look a little odd when you first
encounter it. :-)
-J.
>
> Regards,
> Andreas
>
> >
> > -J.
> >
> > [[oe] [meta-networking][PATCH 03/11] samba: remove unused variable
> > DISABLE_STATIC] On 16.12.16 (Fri 21:15) Joe MacDonald wrote:
> >
> >> From: Andreas Oberritter
> >>
> >> Signed-off-by: Andreas Oberritter
> >> Signed-off-by: Joe MacDonald
> >> ---
> >> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 -
> >> 1 file changed, 1 deletion(-)
> >>
> >> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> index aabc043..c9e0953 100644
> >> --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> @@ -93,7 +93,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)}"
> >>
> >> --
> >> 1.9.1
> >>
> >>
> >>
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
Oh, I just realized this one sneaked back in despite my having thrown it
out at least twice now. I've already rejected it in patchwork, but if
anyone is picking this up off the mailing list, DISABLE_STATIC is very
much still needed AFAICT.
-J.
[[oe] [meta-networking][PATCH 03/11] samba: remove unused variable
DISABLE_STATIC] On 16.12.16 (Fri 21:15) Joe MacDonald wrote:
> From: Andreas Oberritter
>
> Signed-off-by: Andreas Oberritter
> Signed-off-by: Joe MacDonald
> ---
> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> index aabc043..c9e0953 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> @@ -93,7 +93,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)}"
>
> --
> 1.9.1
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 11/11] samba: simplify LSB handling
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index eb3038d..a126ac9 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -38,8 +38,8 @@ DEPENDS_append_libc-musl = " libtirpc"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
LDFLAGS_append_libc-musl = " -ltirpc"
-SYSVINITTYPE_linuxstdbase = "lsb"
-SYSVINITTYPE = "sysv"
+LSB = ""
+LSB_linuxstdbase = "lsb"
INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
@@ -48,19 +48,16 @@ SYSTEMD_PACKAGES = "${PN}-base winbind"
SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
SYSTEMD_SERVICE_winbind = "winbind.service"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'zeroconf', '', d)} \
acl cups ldap \
"
-RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb',
'', d)}"
+RDEPENDS_${PN}-base += "${LSB}"
RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt"
PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
-PACKAGECONFIG[lsb] = ",,lsb"
-PACKAGECONFIG[sysv] = ",,sysvinit"
PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
PACKAGECONFIG[sasl] = ",,cyrus-sasl"
@@ -120,7 +117,7 @@ do_install_append() {
install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
echo "d ${localstatedir}/log/samba 0755 root root -" \
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
-if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
+if [ "${LSB}" = "lsb" ]; then
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
else
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 10/11] samba: start on boot with systemd
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 1caf8af..eb3038d 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -44,6 +44,10 @@ SYSVINITTYPE = "sysv"
INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
+SYSTEMD_PACKAGES = "${PN}-base winbind"
+SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
+SYSTEMD_SERVICE_winbind = "winbind.service"
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'zeroconf', '', d)} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 08/11] samba: add packages samba-dsdb-modules, samba-testsuite and registry-tools
From: Andreas Oberritter
Inspired by Debian.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 14 ++
1 file changed, 14 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index ac090c2..a678578 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -153,6 +153,7 @@ do_install_append() {
}
PACKAGES =+ "${PN}-python ${PN}-pidl \
+ ${PN}-dsdb-modules ${PN}-testsuite registry-tools \
winbind \
${PN}-common ${PN}-base ${PN}-ctdb-tests \
smbclient"
@@ -209,6 +210,19 @@ FILES_${PN} += "${libdir}/vfs/*.so \
${libdir}/auth/*.so \
"
+FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb"
+
+FILES_${PN}-testsuite = "${bindir}/gentest \
+ ${bindir}/locktest \
+ ${bindir}/masktest \
+ ${bindir}/ndrdump \
+ ${bindir}/smbtorture"
+
+FILES_registry-tools = "${bindir}/regdiff \
+${bindir}/regpatch \
+${bindir}/regshell \
+${bindir}/regtree"
+
FILES_winbind = "${sbindir}/winbindd \
${bindir}/wbinfo \
${bindir}/ntlm_auth \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 09/11] samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index a678578..1caf8af 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -108,7 +108,9 @@ do_install_append() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
-sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
+sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \
+-e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \
+-i ${D}${systemd_system_unitdir}/*.service
install -d ${D}${sysconfdir}/tmpfiles.d
install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -133,8 +135,8 @@ do_install_append() {
install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf
install -D -m 644 ${WORKDIR}/volatiles.03_samba
${D}${sysconfdir}/default/volatiles/03_samba
-install -d ${D}${sysconfdir}/sysconfig/
-install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/sysconfig/samba
+install -d ${D}${sysconfdir}/default
+install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/default/samba
# install ctdb config file and test cases
install -D -m 0644 ${S}/ctdb/tests/onnode/nodes
${D}${sysconfdir}/ctdb/nodes
@@ -202,6 +204,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
FILES_${BPN}-common = "${sysconfdir}/default \
${sysconfdir}/samba \
+ ${sysconfdir}/tmpfiles.d \
"
FILES_${PN} += "${libdir}/vfs/*.so \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 05/11] samba: install manpages
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 +
1 file changed, 9 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 37dabb6..c4b31df 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -97,6 +97,15 @@ EXTRA_OECONF += "--enable-fhs \
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
do_install_append() {
+for section in 1 5 7; do
+install -d ${D}${mandir}/man$section
+install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section
+done
+for section in 1 5 7 8; do
+install -d ${D}${mandir}/man$section
+install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section
+done
+
install -d ${D}${systemd_system_unitdir}
install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 07/11] samba: split libraries into their own packages
From: Andreas Oberritter
It's quite hard to track library dependencies manually between
releases. Splitting libraries into their own packages creates
some overhead but effectively uses less storage in minimal
installations.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 134 +
1 file changed, 30 insertions(+), 104 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 1b855c3..ac090c2 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -152,11 +152,33 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
-PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \
- libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
- libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests \
+PACKAGES =+ "${PN}-python ${PN}-pidl \
+ winbind \
+ ${PN}-common ${PN}-base ${PN}-ctdb-tests \
smbclient"
+python samba_populate_packages() {
+def module_hook(file, pkg, pattern, format, basename):
+pn = d.getVar('PN', True)
+d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg)
+
+mlprefix = d.getVar('MLPREFIX', True) or ''
+pam_libdir = d.expand('${base_libdir}/security')
+pam_pkgname = mlprefix + 'pam-plugin%s'
+do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM
plugin for %s', extra_depends='', prepend=True)
+
+libdir = d.getVar('libdir', True)
+do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True, allow_links=True)
+pkglibdir = '%s/samba' % libdir
+do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True)
+moduledir = '%s/samba/auth' % libdir
+do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s
authentication backend', hook=module_hook, extra_depends='', prepend=True)
+moduledir = '%s/samba/pdb' % libdir
+do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s
password backend', hook=module_hook, extra_depends='', prepend=True)
+}
+
+PACKAGESPLITFUNCS_prepend = "samba_populate_packages "
+
RDEPENDS_${PN} += "${PN}-base"
FILES_${PN}-base = "${sbindir}/nmbd \
@@ -177,121 +199,25 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
/run/ctdb \
"
-# figured out by
-#
FILES="tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/smbd
tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/nmbd"
-#
-# while [ "${FILES}" != "${OLDFILES}" ]
-# do
-# OLDFILES="${FILES}"
-#
NEEDED=`tmp/sysroots/x86_64-linux/usr/libexec/arm-poky-linux-gnueabi.gcc-cross-initial-arm/gcc/arm-poky-linux-gnueabi/5.2.0/objdump
-x ${FILES} | grep NEEDED | egrep -E 'so(.[0-9]|$)' | sort -u | perl
-MData::Dumper -le 'while (<>) {chomp; push @lib, (split)[1]}; print "(",
join("|", @lib), ")"'`
-# NF=`find
tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib
-type f | egrep "${NEEDED}" | sort -u`
-#
-# FILES=`perl -le 'foreach (@ARGV) { $f{$_}++ }; print join(" ", sort keys
%f)' ${FILES} ${NF}`
-# done
-#
-# LIBS=`echo ${FILES} | sed -e
's,tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib,${libdir},g'
-e 's,.so.[0-9]+.*$,.so.*,g'`
-# for l in ${LIBS}
-# do
-# echo $l
-# done
-
-FILES_lib${BPN}-base = "\
-${sysconfdir}/default \
-${sysconfdir}/samba \
-${libdir}/libdcerpc-binding.so.* \
-${libdir}/libgensec.so.* \
-${libdir}/libndr-krb5pac.so.* \
-${libdir}/libndr-nbt.so.* \
-${libdir}/libndr-standard.so.* \
-${libdir}/libndr.so.* \
-${libdir}/libnetapi.so.* \
-${libdir}/libpdb.so.* \
-${libdir}/libsamba-credentials.so.* \
-${libdir}/libsamba-hostconfig.so.* \
-${libdir}/libsamba-util.so.* \
-${libdir}/libsamdb.so.* \
-
[oe] [meta-networking][PATCH 06/11] samba: simplify files list for samba-python
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index c4b31df..1b855c3 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -292,23 +292,7 @@ FILES_libwinbind = "${base_libdir}/security/pam_winbind.so
\
${systemd_system_unitdir}/winbind.service"
FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so
\
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/_ldb_text.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/external/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/kcc/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/netcmd/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/provision/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.py \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.so \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/subunit/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/tests/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/third_party/* \
-
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
-"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
FILES_smbclient = "${bindir}/cifsdd \
${bindir}/rpcclient \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index aabc043..c9e0953 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -93,7 +93,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)}"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 04/11] samba: add smbclient package
From: Andreas Oberritter
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index c9e0953..37dabb6 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -143,10 +143,10 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
-PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator"
-PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
- libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests"
-
+PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \
+ libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
+ libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests \
+ smbclient"
RDEPENDS_${PN} += "${PN}-base"
@@ -301,5 +301,16 @@ FILES_${PN}-python =
"${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
"
+FILES_smbclient = "${bindir}/cifsdd \
+ ${bindir}/rpcclient \
+ ${bindir}/smbcacls \
+ ${bindir}/smbclient \
+ ${bindir}/smbcquotas \
+ ${bindir}/smbget \
+ ${bindir}/smbspool \
+ ${bindir}/smbtar \
+ ${bindir}/smbtree \
+ ${libdir}/samba/smbspool_krb5_wrapper"
+
RDEPENDS_${PN}-pidl_append = " perl"
FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 02/11] samba: install systemd units and initscripts unconditionally
From: Andreas Oberritter
Fixes hybrid systemd/sysvinit setups.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
.../recipes-connectivity/samba/samba_4.4.5.bb | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 783a7cd..aabc043 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -98,19 +98,18 @@ DISABLE_STATIC = ""
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES',
'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
do_install_append() {
-if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)};
then
-install -d ${D}${systemd_system_unitdir}
-install -m 0644 packaging/systemd/*.service
${D}${systemd_system_unitdir}
-sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
-
-install -d ${D}${sysconfdir}/tmpfiles.d
-install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
-echo "d ${localstatedir}/log/samba 0755 root root -" \
->> ${D}${sysconfdir}/tmpfiles.d/samba.conf
-elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)};
then
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
+sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
+
+install -d ${D}${sysconfdir}/tmpfiles.d
+install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
+echo "d ${localstatedir}/log/samba 0755 root root -" \
+>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
+if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
-elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)};
then
+else
install -d ${D}${sysconfdir}/init.d
install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba
sed -e 's,/opt/samba/bin,${sbindir},g' \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 01/11] samba: rename initscript from 'samba.sh' to more common 'samba'
From: Andreas Oberritter
This gets masked automatically by samba.service if systemd is running.
Signed-off-by: Andreas Oberritter
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 6d62481..783a7cd 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc"
SYSVINITTYPE_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv"
-INITSCRIPT_NAME = "samba.sh"
+INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'${SYSVINITTYPE}', '', d)} \
@@ -109,16 +109,16 @@ do_install_append() {
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)};
then
install -d ${D}${sysconfdir}/init.d
-install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d
+install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)};
then
install -d ${D}${sysconfdir}/init.d
-install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba.sh
+install -m 0755 packaging/sysv/samba.init
${D}${sysconfdir}/init.d/samba
sed -e 's,/opt/samba/bin,${sbindir},g' \
-e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
-e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
--e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
+-e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \
-e 's,/usr/bin,${base_bindir},g' \
--i ${D}${sysconfdir}/init.d/samba.sh
+-i ${D}${sysconfdir}/init.d/samba
fi
install -d ${D}${sysconfdir}/samba
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 00/11] samba: refresh pending patches
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated. -- -Joe MacDonald. :wq -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] iscsi-initiator-utils: Update to 2.0.874
The latest iscsi-initiator-utils has been available for a while now,
update our recipe. The new version no longer bundles its own ISNS server,
so this update brings in open-isns as a dependency.
As open-isns depends on systemd, add systemd to REQUIRED_DISTRO_FEATURES
Additionally, open-iscsi.org is defunct, the new home is at
open-iscsi.com, update the SRC_URI and homepage accordingly.
Signed-off-by: Martin Jansa
Signed-off-by: Joe MacDonald
---
...nitiator-utils-Do-not-clean-kernel-source.patch | 44
.../iscsi-initiator-utils-dont-use-static.patch| 21 --
...text-add-include-for-NI_MAXHOST-definiton.patch | 35 +++
.../iscsi-initiator-utils-use-var-for-config.patch | 240 -
...2.0-873.bb => iscsi-initiator-utils_2.0.874.bb} | 86
.../recipes-support/open-isns/open-isns_0.97.bb| 35 +++
6 files changed, 163 insertions(+), 298 deletions(-)
create mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
delete mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
create mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
delete mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-use-var-for-config.patch
rename
meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0-873.bb
=> iscsi-initiator-utils_2.0.874.bb} (61%)
create mode 100644 meta-networking/recipes-support/open-isns/open-isns_0.97.bb
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
new file mode 100644
index 000..2c46611
--- /dev/null
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
@@ -0,0 +1,44 @@
+From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Tue, 15 Nov 2016 11:11:30 -0500
+Subject: [PATCH] Do not clean kernel source
+
+The default behaviour should not be to attempt to clean the kernel source
+tree when building userspace. When not cross-compiling, however, this action
is
+harmless, but when attempting to build within the sysroot and since this
package
+is purely userspace, the clean step will fail.
+
+Removing the clean step eliminates an unnecessary dependency on the kernel
build
+infrastructure.
+
+Upstream-status: Inappropriate (embedded specific)
+
+Signed-off-by: Joe MacDonald
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c8cd00e..9576bba 100644
+--- a/Makefile
b/Makefile
+@@ -37,7 +37,7 @@ endif
+
+ all: user
+
+-user: iscsiuio/Makefile
++user:
+ $(MAKE) -C utils/sysdeps
+ $(MAKE) -C utils/fwparam_ibft
+ $(MAKE) -C usr
+@@ -75,7 +75,6 @@ clean:
+ $(MAKE) -C utils/fwparam_ibft clean
+ $(MAKE) -C utils clean
+ $(MAKE) -C usr clean
+- $(MAKE) -C kernel clean
+ [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean
+ [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean
+
+--
+1.9.1
+
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
deleted file mode 100644
index ce48e2b..000
---
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-iscsi-initiator-utils not to use static
-
-Upstream-status: Backport
-This patch is from fedora17.
-
-Signed-off-by: Yao Zhao
-Signed-off-by: Vu Tran
-
-diff --git a/usr/Makefile b/usr/Makefile
-index 673b7f1..fd14a10 100644
a/usr/Makefile
-+++ b/usr/Makefile
-@@ -61,7 +61,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o
session_mgmt.o
-
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) -static $^ -o $@
-+ $(CC) $(CFLAGS) $^ -o $@
- clean:
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
new file mode 100644
index 000..37d695f
--- /dev/null
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
@@ -0,0 +1,35 @@
Re: [oe] [meta-networking][PATCH] iscsi-initiator-utils: Update to 2.0.874
[Re: [oe] [meta-networking][PATCH] iscsi-initiator-utils: Update to 2.0.874] On
16.11.29 (Tue 21:00) Martin Jansa wrote:
> On Wed, Nov 23, 2016 at 10:08:29AM -0500, Joe MacDonald wrote:
> > The latest iscsi-initiator-utils has been available for a while now,
> > update our recipe. The new version no longer bundles its own ISNS server,
> > so this update brings in open-isns as a dependency.
> >
> > Additionally, open-iscsi.org is defunct, the new home is at
> > open-iscsi.com, update the SRC_URI and homepage accordingly.
> >
> > Signed-off-by: Joe MacDonald
[...]
> > diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
> > b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
> > new file mode 100644
> > index 000..fe41093
> > --- /dev/null
> > +++ b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
> > @@ -0,0 +1,33 @@
> > +# Copyright (C) 2016 Joe MacDonald
> > +# Released under the MIT license (see COPYING.MIT for the terms)
> > +
> > +SUMMARY = "iSNS daemon and utility programs"
> > +DESCRIPTION = "This is a partial implementation of RFC4171, the Internet \
> > +Storage Name Service (iSNS). The distribution includes the iSNS server, \
> > +supporting persisten storage of registrations, isnsadm, a command line \
> > +utility for managing nodes, and isnsdd, a corresponding discovery daemon."
> > +HOMEPAGE = "http://github.com/gonzoleeman/open-isns/";
> > +LICENSE = "GPLv2+ & LGPLv2+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785"
> > +SECTION = "net"
> > +
> > +DEPENDS = "openssl systemd"
> > +
> > +SRC_URI = " \
> > + git://github.com/open-iscsi/open-isns \
> > +"
> > +
> > +SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +inherit systemd autotools-brokensep
> > +
> > +EXTRA_OECONF = " --prefix=${prefix} --enable-shared"
> > +
> > +do_install_append () {
> > +oe_runmake -C ${B} INCDIR=${STAGING_INCDIR}/libisns/ install_hdrs
> > +oe_runmake -C ${B} LIBDIR=${D}${libdir} install_lib
>
> This seems to bypass sstate and install it directly to sysroot, why did you
> use STAGING_INCDIR?
I'm not sure, some brain-fart from before I added the brokensep
dependency, I think. I've pointed it at the appropriate place (and
dropped the unnecessary chdir) in v2, coming out now.
-J.
> ERROR: Following files are installed in sysroot, but not tracked by
> sstate:
> qemuarm/usr/include/guid.h
> qemuarm/usr/include/libisns
> qemuarm/usr/include/libisns/attrs.h
> qemuarm/usr/include/libisns/buffer.h
> qemuarm/usr/include/libisns/isns.h
> qemuarm/usr/include/libisns/isns-proto.h
> qemuarm/usr/include/libisns/message.h
> qemuarm/usr/include/libisns/paths.h
> qemuarm/usr/include/libisns/source.h
> qemuarm/usr/include/libisns/types.h
> qemuarm/usr/include/libisns/util.h
> qemuarm/usr/lib/libcrossguid.a
> INFO: Output written in:
> /home/jenkins/oe/world/shr-core/tmp-glibc/sysroot.cruft.1480448660
>
>
> > +}
> > +
> > +FILES_${PN} += "${libdir}"
> > --
> > 1.9.1
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] iscsi-initiator-utils: Update to 2.0.874
The latest iscsi-initiator-utils has been available for a while now,
update our recipe. The new version no longer bundles its own ISNS server,
so this update brings in open-isns as a dependency.
Additionally, open-iscsi.org is defunct, the new home is at
open-iscsi.com, update the SRC_URI and homepage accordingly.
Signed-off-by: Joe MacDonald
---
...nitiator-utils-Do-not-clean-kernel-source.patch | 44
.../iscsi-initiator-utils-dont-use-static.patch| 21 --
...text-add-include-for-NI_MAXHOST-definiton.patch | 35 +++
.../iscsi-initiator-utils-use-var-for-config.patch | 240 -
...2.0-873.bb => iscsi-initiator-utils_2.0.874.bb} | 68 +++---
.../recipes-support/open-isns/open-isns_0.97.bb| 33 +++
6 files changed, 151 insertions(+), 290 deletions(-)
create mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
delete mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
create mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
delete mode 100644
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-use-var-for-config.patch
rename
meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0-873.bb
=> iscsi-initiator-utils_2.0.874.bb} (65%)
create mode 100644 meta-networking/recipes-support/open-isns/open-isns_0.97.bb
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
new file mode 100644
index 000..2c46611
--- /dev/null
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
@@ -0,0 +1,44 @@
+From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Tue, 15 Nov 2016 11:11:30 -0500
+Subject: [PATCH] Do not clean kernel source
+
+The default behaviour should not be to attempt to clean the kernel source
+tree when building userspace. When not cross-compiling, however, this action
is
+harmless, but when attempting to build within the sysroot and since this
package
+is purely userspace, the clean step will fail.
+
+Removing the clean step eliminates an unnecessary dependency on the kernel
build
+infrastructure.
+
+Upstream-status: Inappropriate (embedded specific)
+
+Signed-off-by: Joe MacDonald
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c8cd00e..9576bba 100644
+--- a/Makefile
b/Makefile
+@@ -37,7 +37,7 @@ endif
+
+ all: user
+
+-user: iscsiuio/Makefile
++user:
+ $(MAKE) -C utils/sysdeps
+ $(MAKE) -C utils/fwparam_ibft
+ $(MAKE) -C usr
+@@ -75,7 +75,6 @@ clean:
+ $(MAKE) -C utils/fwparam_ibft clean
+ $(MAKE) -C utils clean
+ $(MAKE) -C usr clean
+- $(MAKE) -C kernel clean
+ [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean
+ [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean
+
+--
+1.9.1
+
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
deleted file mode 100644
index ce48e2b..000
---
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-dont-use-static.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-iscsi-initiator-utils not to use static
-
-Upstream-status: Backport
-This patch is from fedora17.
-
-Signed-off-by: Yao Zhao
-Signed-off-by: Vu Tran
-
-diff --git a/usr/Makefile b/usr/Makefile
-index 673b7f1..fd14a10 100644
a/usr/Makefile
-+++ b/usr/Makefile
-@@ -61,7 +61,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o
session_mgmt.o
-
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) -static $^ -o $@
-+ $(CC) $(CFLAGS) $^ -o $@
- clean:
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
new file mode 100644
index 000..37d695f
--- /dev/null
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
@@ -0,0 +1,35 @@
+From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001
+From: Joe MacDonald
+Date: Tue, 15 Nov 2016 12:36:45 -0500
+S
[oe] [meta-networking][PATCH] iscsi-initiator-utils: Update SRC_URI and homepage
open-iscsi.org is defunct, the new home is at open-iscsi.com, update the
SRC_URI and homepage accordingly.
Signed-off-by: Joe MacDonald
---
...utils_2.0-873.bb => iscsi-initiator-utils_2.0.873.bb} | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
rename
meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0-873.bb
=> iscsi-initiator-utils_2.0.873.bb} (90%)
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.873.bb
similarity index 90%
rename from
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
rename to
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.873.bb
index 4b13155..d540085 100644
---
a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.873.bb
@@ -4,16 +4,17 @@ independent, multi-platform implementation of RFC3720. The
iscsi package \
provides the server daemon for the iSCSI protocol, as well as the utility \
programs used to manage it. iSCSI is a protocol for distributed \
disk access using SCSI commands sent over Internet Protocol networks."
-HOMEPAGE = "http://www.open-iscsi.org/";
+HOMEPAGE = "http://www.open-iscsi.com/";
LICENSE = "GPLv2 & LGPLv2.1"
SECTION = "net"
DEPENDS = "openssl flex-native bison-native"
-LIC_FILES_CHKSUM = \
-"file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
- file://utils/open-isns/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+LIC_FILES_CHKSUM = "\
+file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+file://utils/open-isns/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
+"
-SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \
+SRC_URI = "https://github.com/open-iscsi/open-iscsi/archive/${PV}.tar.gz \
file://iscsi-initiator-utils-use-var-for-config.patch \
file://iscsi-initiator-utils-dont-use-static.patch \
file://initd.debian \
@@ -23,8 +24,9 @@ SRC_URI =
"http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \
file://iscsi-initiator-targets.service \
file://set_initiatorname \
"
-SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7"
-SRC_URI[sha256sum] =
"7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9"
+SRC_URI[md5sum] = "77ef4d5f5aceb4c7f0bef743fa7fc05c"
+SRC_URI[sha256sum] =
"c51f6fad45afb7c059f10776de721c6d5fd0336ff927daacea6a7e0a3ad02f18"
+
S = "${WORKDIR}/open-iscsi-${PV}"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] OE plans for morty
ead of now > > > > empty EXTRA_OECONF > > > > ? f882db6 ipmiutil: uncomment PARALLEL_MAKE > > > > > > > > ? 54c7e78 pcsc-lite: Seperate GPLV3 portions from BSD > > > > fded4cf opencv: fix packaging and install > > > > > > > > > > > > 1c072cb gvfs: fix fetch error > > > > ? 0cc3d06 leptonica: add PACKAGECONFIG for giflib > > > > ? 8eef5ab wireshark: update to 2.2.1 > > > > > > > > ? 812e940 ntp : Add openssl to default PACKAGECONFIG options > > > > ? 8760099 atftp: fixes musl libc build > > > > ? 5abe6ea arptables: add the directory for default > > > > /etc/sysconfig/arptables > > > > ? a0e2240 arptables: add arptables systemd service file > > > > 93b0d65 iscsitarget: resolve build error with linux kernel 4.8 > > > > 9e8d127 squid: fix ptest failure > > > > 6f54f29 squid: specify sysconfdir and logdir > > > > 307d1c9 libtdb: fixes for deterministic builds > > > > 5175c03 libldb: fixes for deterministic builds > > > > 5291715 libtevent: fixes for deterministic builds > > > > 778a2b6 libtalloc: fixes for deterministic builds > > > > fe652f8 libldb: fix for LIC_FILES_CHKSUM > > > > f25aa3d libtdb: fix for LIC_FILES_CHKSUM > > > > d4a36f6 libtevent: fix for LIC_FILES_CHKSUM > > > > 0014397 libtalloc: fix for LIC_FILES_CHKSUM > > > > > > > > a95726d samba: replace pam packageconfig by hard dependency > > > > 3fdfdd8 samba: un-blacklist > > > > > > > > > > > -- > > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com > > > -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] samba: un-blacklist
Commit b60c60806e57f69233db582ef88d113867c2ecd1 resolves the linking
issue, later commits (mainly 12a118989296d13e036d0daa9f9a3d45eee03ded)
resolve the packaging issue, so re-enable samba for everyone.
Signed-off-by: Joe MacDonald
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 5 -
1 file changed, 5 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 7d7fa02..3686faa 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -317,8 +317,3 @@ FILES_${PN}-python-dbg =
"${libdir}/python${PYTHON_BASEVERSION}/site-packages/.d
RDEPENDS_${PN}-pidl_append = " perl"
FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
-
-# http://errors.yoctoproject.org/Errors/Details/81004/
-# before this issue it was also failing in do_package and
-# autodetecting libpam dependency
-PNBLACKLIST[samba] ?= "BROKEN: fails to build with new binutils-2.27"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] 3 meta-networking patches
Hey Martin, [3 meta-networking patches] On 16.09.15 (Thu 10:39) Martin Jansa wrote: > Hi Joe, > > can you please confirm state of thes change: > https://patchwork.openembedded.org/patch/128859/ > it's Accepted on patchwork, but still applicable and included i > master-next. Curious. I'll scoop that up this morning. It looks pretty obvious. > I'll drop these 2 from master-next as they are marked as > Rejected/Changes-Requested now: > https://patchwork.openembedded.org/patch/122365/ > https://patchwork.openembedded.org/patch/125839/ Yep, the former had a lot of discussion around it and ultimately the rationale wasn't solid. The latter was resolved with patches to waf-samba as a generic solution rather than piecemeal, as this was doing. -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] lksctp-tools: 1.0.16 -> 1.0.17
[[oe] [meta-networking][PATCH] lksctp-tools: 1.0.16 -> 1.0.17] On 16.09.14 (Wed
00:59) Wang Xin wrote:
> Upgrade lksctp-tools from 1.0.16 to 1.0.17.
>
> Signed-off-by: Wang Xin
Is this any different than the one you sent out on Monday? It looks
like an accidental re-send, but I thought I'd ask in case you intended
to send something different.
-J.
> ---
> .../lksctp-tools/{lksctp-tools_1.0.16.bb => lksctp-tools_1.0.17.bb} | 4
> ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.16.bb
> => lksctp-tools_1.0.17.bb} (94%)
>
> diff --git
> a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
> b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> similarity index 94%
> rename from
> meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
> rename to meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> index e6a84cc..11c43ff 100644
> --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
> +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
> @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \
> file://v6test.sh \
> "
>
> -SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e"
> -SRC_URI[sha256sum] =
> "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26"
> +SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5"
> +SRC_URI[sha256sum] =
> "1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15"
>
> #| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc
> -march=armv5te -marm -mthumb-interwork
> --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared
> -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o
> .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o-march=armv5te -marm
> -mthumb-interwork
> --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2
> -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map
> -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1
> -o .libs/libsctp.so.1.0.16
> #|
> /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld:
> error: symbol sctp_connectx has undefined version
> --
> 2.7.4
>
>
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/2 v2] samba: restrict the blacklist to ARM only
[Re: [oe] [meta-networking][PATCH 2/2 v2] samba: restrict the blacklist to ARM
only] On 16.09.10 (Sat 00:03) Andreas Müller wrote:
> On Fri, Sep 9, 2016 at 10:44 PM, Joe MacDonald
> wrote:
> > [[oe] [meta-networking][PATCH 2/2 v2] samba: restrict the blacklist to ARM
> > only] On 16.09.09 (Fri 10:34) jackie.hu...@windriver.com wrote:
> >
> >> From: Jackie Huang
> >>
> >> It builds fine except for arm now, and the do_package
> >> and libpam issue is fixed by:
> >> "waf-samba.bbclass: Add PACKAGECONFIG_CONFARGS to CONFIGUREOPTS"
> >
> > Did you confirm that you're still seeing the failure for arm?
> >
> > -J.
> >
> >>
> >> Signed-off-by: Jackie Huang
> >> ---
> >> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 6 +++---
> >> 1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> index 042203e..c34adcb 100644
> >> --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> >> @@ -319,6 +319,6 @@ RDEPENDS_${PN}-pidl_append = " perl"
> >> FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
> >>
> >> # http://errors.yoctoproject.org/Errors/Details/81004/
> >> -# before this issue it was also failing in do_package and
> >> -# autodetecting libpam dependency
> >> -PNBLACKLIST[samba] ?= "BROKEN: fails to build with new binutils-2.27"
> >> +BLACKLIST_REASON ?= ""
> >> +BLACKLIST_REASON_arm = "BROKEN: fails to build with new binutils-2.27"
> >> +PNBLACKLIST[samba] ?= "${BLACKLIST_REASON}"
> >> --
> >> 2.8.3
> >>
> > --
> > -Joe MacDonald.
> > :wq
> >
> Did you see [1] - it fixes build for arm.
>
> [1]
> http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/108972.html
I didn't, actually, but I had picked it up in my tree anyway when I
scooped up the latest set of changes in master-next. The reason I was
asking was because I wasn't seeing a failure anymore in samba on arm and
was curious why Jackie was still seeing it if I wasn't and I hadn't seen
an explicit patch to resolve the issue. But there it is, mystery
solved. Thanks for the heads-up, Andreas.
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 2/2 v2] samba: restrict the blacklist to ARM only
[[oe] [meta-networking][PATCH 2/2 v2] samba: restrict the blacklist to ARM
only] On 16.09.09 (Fri 10:34) jackie.hu...@windriver.com wrote:
> From: Jackie Huang
>
> It builds fine except for arm now, and the do_package
> and libpam issue is fixed by:
> "waf-samba.bbclass: Add PACKAGECONFIG_CONFARGS to CONFIGUREOPTS"
Did you confirm that you're still seeing the failure for arm?
-J.
>
> Signed-off-by: Jackie Huang
> ---
> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> index 042203e..c34adcb 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> @@ -319,6 +319,6 @@ RDEPENDS_${PN}-pidl_append = " perl"
> FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
>
> # http://errors.yoctoproject.org/Errors/Details/81004/
> -# before this issue it was also failing in do_package and
> -# autodetecting libpam dependency
> -PNBLACKLIST[samba] ?= "BROKEN: fails to build with new binutils-2.27"
> +BLACKLIST_REASON ?= ""
> +BLACKLIST_REASON_arm = "BROKEN: fails to build with new binutils-2.27"
> +PNBLACKLIST[samba] ?= "${BLACKLIST_REASON}"
> --
> 2.8.3
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] tcpreplay: 3.4.4 -> 4.1.1
G_RESULT(no)
> - ])
> -
> -+ac_cv_have_bpf=no
> -+
> - have_bpf=no
> - dnl Check for BSD's BPF
> - AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf,
> diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb
> b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb
> similarity index 43%
> rename from meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb
> rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb
> index ccbab9f..389d61b 100644
> --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb
> +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb
> @@ -4,16 +4,12 @@ HOMEPAGE = "http://tcpreplay.synfin.net/";
> SECTION = "net"
>
> LICENSE = "GPLv3"
> -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=c33cccf72cc1603e8a72a84811ae3ac8"
> +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8"
>
> SRC_URI =
> "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \
> - file://tcpreplay-3.4.4-cross-compile.patch \
> - file://tcpreplay-3.4.4-no-bfp-support.patch \
> - file://tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch \
> - file://tcpreplay-3.4.4-improve-search-for-libpcap.patch \
> "
> -SRC_URI[md5sum] = "22725feb9b2590809f9350308ec65180"
> -SRC_URI[sha256sum] =
> "7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f"
> +SRC_URI[md5sum] = "80394c33fe697b53b69eac9bb0968ae9"
> +SRC_URI[sha256sum] =
> "61b916ef91049cad2a9ddc8de6f5e3e3cc5d9998dbb644dc91cf3a798497ffe4"
>
> DEPENDS = "libpcap"
>
> --
> 2.8.1
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/1] yp-tools: fix compile errors
forgot
> to take it out.
>
> V2 or leave it? This code does not look like it's going anywhere beyond here.
>
> Joe
>
>
> >
> > > + if (status == YPERR_SUCCESS)
> > > + /* We cast to ypresp_val although the pointer could also be of
> > > +type ypresp_key_val or ypresp_master or ypresp_order or
> > > +--- a/lib/internal.h
> > > b/lib/internal.h
> > > +@@ -17,8 +17,8 @@
> > > + #define _INTERNAL_H_
> > > +
> > > + extern int do_ypcall (const char *domain, u_long prog, xdrproc_t xargs,
> > > +- caddr_t req, xdrproc_t xres, caddr_t resp);
> > > ++ caddr_t req, xdrproc_t xres, void *resp);
> > > + extern int do_ypcall_tr (const char *domain, u_long prog, xdrproc_t
> > > xargs,
> > > +- caddr_t req, xdrproc_t xres, caddr_t resp);
> > > ++ caddr_t req, xdrproc_t xres, void *resp);
> > > + extern int yp_maplist (const char *, struct ypmaplist **);
> > > + #endif
> > > diff --git a/meta-networking/recipes-support/nis/yp-tools_3.3.bb b/meta-
> > networking/recipes-support/nis/yp-tools_3.3.bb
> > > index b89f0b8..69217fa 100644
> > > --- a/meta-networking/recipes-support/nis/yp-tools_3.3.bb
> > > +++ b/meta-networking/recipes-support/nis/yp-tools_3.3.bb
> > > @@ -11,11 +11,10 @@ ypwhich, yppasswd, domainname, nisdomainname \
> > > and ypdomainname. \
> > > "
> > >
> > > -PNBLACKLIST[yp-tools] ?= "BROKEN: fails to build for qemuarm."
> > > -
> > > SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \
> > >file://domainname.service \
> > >
> > > file://yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch
> > > \
> > > + file://alignment-cheat.patch \
> > > "
> > > SRC_URI[md5sum] = "acebeecc11a73fb8097503670344834c"
> > > SRC_URI[sha256sum] =
> > > "812be817df3d4c25813552be336c6c6ad5aedaf65611b81af3ad9f98fb3c2e50"
> > > --
> > > 1.7.9.5
> > >
> > > --
> > > ___
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] squid: fix configure host contamination
Hi Yi,
Please include a signed-off-by and upstream-status line for patches you
contribute.
http://openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations
This patch seems like it's probably suitable for submitting upstream,
but I'd be content to call it inappropriate-embedded specific, if you
don't want to send it upstream.
-J.
[[oe] [meta-networking][PATCH] squid: fix configure host contamination] On
16.08.08 (Mon 16:04) Yi Zhao wrote:
> From: Yue Tao
>
> When configuring squid with --enable-esi option,
> the following error was observed:
> [snip]
> checking libxml/parser.h usability... no
> checking libxml/parser.h presence... no
> checking for libxml/parser.h... no
> configure: Failed to find libxml2 header file libxml/parser.h
> [snip]
> ERROR: This autoconf log indicates errors, it looked at host include
> and/or library paths while determining system capabilities.
> [snip]
>
> It tried to search libxml header file in host path. Set the SYSROOT
> to avoid this host contamination.
>
> Signed-off-by: Yue Tao
> Signed-off-by: Yi Zhao
> ---
> .../squid/files/set_sysroot_patch.patch| 26
> ++
> .../recipes-daemons/squid/squid_3.5.20.bb | 6 +
> 2 files changed, 32 insertions(+)
> create mode 100644
> meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
>
> diff --git
> a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
> b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
> new file mode 100644
> index 000..68733f9
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
> @@ -0,0 +1,26 @@
> +diff --git a/configure.ac.old b/configure.ac
> +index 54eda73..874f48e 100644
> +--- a/configure.ac.old
> b/configure.ac
> +@@ -964,15 +964,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a
> "x$with_libxml2" != "xno" ; then
> + dnl Find the main header and include path...
> + AC_CACHE_CHECK([location of libxml2 include files],
> [ac_cv_libxml2_include], [
> + AC_CHECK_HEADERS([libxml/parser.h], [], [
> +- AC_MSG_NOTICE([Testing in /usr/include/libxml2])
> ++ AC_MSG_NOTICE([Testing in $SYSROOT/usr/include/libxml2])
> + SAVED_CPPFLAGS="$CPPFLAGS"
> +- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
> ++ CPPFLAGS="-I$SYSROOT/usr/include/libxml2 $CPPFLAGS"
> + unset ac_cv_header_libxml_parser_h
> +- AC_CHECK_HEADERS([libxml/parser.h],
> [ac_cv_libxml2_include="-I/usr/include/libxml2"], [
> +-AC_MSG_NOTICE([Testing in /usr/local/include/libxml2])
> +-CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS"
> ++ AC_CHECK_HEADERS([libxml/parser.h],
> [ac_cv_libxml2_include="-I$SYSROOT/usr/include/libxml2"], [
> ++AC_MSG_NOTICE([Testing in $SYSROOT/usr/local/include/libxml2])
> ++CPPFLAGS="-I$SYSROOT/usr/local/include/libxml2 $SAVED_CPPFLAGS"
> + unset ac_cv_header_libxml_parser_h
> +-AC_CHECK_HEADERS([libxml/parser.h],
> [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [
> ++AC_CHECK_HEADERS([libxml/parser.h],
> [ac_cv_libxml2_include="-I$SYSROOT/usr/local/include/libxml2"], [
> + AC_MSG_NOTICE([Failed to find libxml2 header file
> libxml/parser.h])
> + ])
> + ])
> diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb
> b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb
> index f26aebe..3ce195a 100644
> --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb
> +++ b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb
> @@ -19,6 +19,7 @@ SRC_URI =
> "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
> file://squid-use-serial-tests-config-needed-by-ptest.patch \
> file://run-ptest \
> file://volatiles.03_squid \
> + file://set_sysroot_patch.patch \
> "
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
> @@ -48,6 +49,11 @@ EXTRA_OECONF += "--with-default-user=squid
> --enable-auth-basic='${BASIC_AUTH}'"
> export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
>
> TESTDIR = "test-suite"
> +
> +do_configure_prepend() {
> +export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> +}
> +
> do_compile_ptest() {
> oe_runmake -C ${TESTDIR} buildtest-TESTS
> }
> --
> 2.7.4
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [recipes-extended][PATCH] pax: strip off file name's trailing slash
[Re: [oe] [recipes-extended][PATCH] pax: strip off file name's trailing slash]
On 16.07.12 (Tue 09:26) Gary Thomas wrote:
> On 2016-07-12 09:15, Zhang Xiao wrote:
> >When extracting packaes, the trailing slash of the file name
> >has no means but may cause some issue on system call lstat.
> >Remove it.
> >
> >Upstream-Status: Pending
> >
> >Signed-off-by: Zhang Xiao
> >---
> > .../pax-strip-off-file-name-s-trailing-slash.patch | 48
> > ++
> > meta/recipes-extended/pax/pax_3.4.bb | 4 +-
> > 2 files changed, 51 insertions(+), 1 deletion(-)
> > create mode 100644
> > meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
> >
> >diff --git
> >a/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
> >
> >b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
> >new file mode 100644
> >index 000..a602b30
> >--- /dev/null
> >+++
> >b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
> >@@ -0,0 +1,48 @@
> >+From aa8ba118869b75a2a9cd681b2f0362d9d8f1c7ec Mon Sep 17 00:00:00 2001
> >+From: Zhang Xiao
> >+Date: Tue, 12 Jul 2016 11:34:45 +0800
> >+Subject: [PATCH] pax: strip off file name's trailing slash
> >+
> >+When extracting packaes, the trailing slash of the file name
> >+has no means but may cause some issue on system call lstat.
> >+Remove it.
> >+
> >+Upstream-Status: Pending
> >+
> >+Signed-off-by: Zhang Xiao
> >+---
> >+ src/pat_rep.c | 11 ++-
> >+ 1 file changed, 10 insertions(+), 1 deletion(-)
> >+
> >+diff --git a/src/pat_rep.c b/src/pat_rep.c
> >+index b9a4636..4cbf6bf 100644
> >+--- a/src/pat_rep.c
> > b/src/pat_rep.c
> >+@@ -605,7 +605,7 @@ int
> >+ mod_name(ARCHD *arcn)
> >+ {
> >+int res = 0;
> >+-
> >++ char *pt;
> >+/*
> >+ * Strip off leading '/' if appropriate.
> >+ * Currently, this option is only set for the tar format.
> >+@@ -639,6 +639,15 @@ mod_name(ARCHD *arcn)
> >+}
> >+
> >+/*
> >++* strip off trailing slash.
> >++*/
> >++ pt = &(arcn->name[strlen(arcn->name) - 1]);
>
> This looks incorrect if the file name is only a single character. You
> should only attempt this if strlen(arcn->name) >= 2
Also, isn't this already covered:
pax-3.4/src/pat_rep.c:
363 /*
364* strip off any trailing /, this should really never happen
365*/
366 len = pt->plen - 1;
367 if (*(pt->pstr + len) == '/') {
368 *(pt->pstr + len) = '\0';
369 pt->plen = len;
370 }
371 pt->flgs = DIR_MTCH | MTCH;
372 arcn->pat = pt;
373 return(0);
At the very least, it's probably worth doing it in the same way as it is
elsewhere in the file.
-J.
>
> >++ if (*pt == '/') {
> >++*pt = '\0';
> >++ arcn->nlen = strlen(arcn->name);
> >++ }
> >++
> >++ /*
> >+ * IMPORTANT: We have a problem. what do we do with symlinks?
> >+ * Modifying a hard link name makes sense, as we know the file it
> >+ * points at should have been seen already in the archive (and if it
> >+--
> >+1.8.5.2.233.g932f7e4
> >+
> >diff --git a/meta/recipes-extended/pax/pax_3.4.bb
> >b/meta/recipes-extended/pax/pax_3.4.bb
> >index 9d1abfb..7ce43ce 100644
> >--- a/meta/recipes-extended/pax/pax_3.4.bb
> >+++ b/meta/recipes-extended/pax/pax_3.4.bb
> >@@ -16,7 +16,9 @@ DEPENDS_append_libc-musl = " fts "
> >
> > SRC_URI =
> > "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2
> > \
> > file://fix_for_compile_with_gcc-4.6.0.patch \
> >-file://pax-3.4_fix_for_x32.patch"
> >+file://pax-3.4_fix_for_x32.patch \
> >+file://pax-strip-off-file-name-s-trailing-slash.patch \
> >+"
> >
> > SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
> >
> > file://0001-use-strtoll-instead-of-strtoq.patch \
> >
>
>
> --
>
> Gary Thomas | Consulting for the
> MLB Associates |Embedded world
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] augeas: Move from oe-core
cipes-support/augeas/augeas/add-missing-argz-conditional.patch
>
> b/meta-networking/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
> new file mode 100644
> index 000..abbdbaa
> --- /dev/null
> +++
> b/meta-networking/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
> @@ -0,0 +1,20 @@
> +Add missing GL_GENERATE_ARGZ_H conditional
> +
> +- GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am
> +
> +Upstream-Status: Pending
> +Signed-off-by: Constantin Musca
> +
> +Index: augeas-1.0.0/configure.ac
> +===
> +--- augeas-1.0.0.orig/configure.ac
> augeas-1.0.0/configure.ac
> +@@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc],
> +
> + AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno])
> +
> ++AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"])
> ++
> + dnl --enable-debug=(yes|no)
> + AC_ARG_ENABLE([debug],
> + [AC_HELP_STRING([--enable-debug=no/yes],
> diff --git a/meta-networking/recipes-support/augeas/augeas/sepbuildfix.patch
> b/meta-networking/recipes-support/augeas/augeas/sepbuildfix.patch
> new file mode 100644
> index 000..b82a3ee
> --- /dev/null
> +++ b/meta-networking/recipes-support/augeas/augeas/sepbuildfix.patch
> @@ -0,0 +1,22 @@
> +Ensure that builds in separate builddirs (${B} != ${S}) correctly install
> the
> +lenses files.
> +
> +Upstream-Status: Pending
> +
> +RP 2013/4/17
> +
> +Index: augeas-1.0.0/Makefile.am
> +===
> +--- augeas-1.0.0.orig/Makefile.am2012-11-02 15:20:11.0 +
> augeas-1.0.0/Makefile.am 2013-04-17 10:36:24.033400125 +
> +@@ -5,8 +5,8 @@
> + lensdir=$(datadir)/augeas/lenses/dist
> + lenstestdir=$(datadir)/augeas/lenses/dist/tests
> +
> +-dist_lens_DATA=$(wildcard lenses/*.aug)
> +-dist_lenstest_DATA=$(wildcard lenses/tests/*.aug)
> ++dist_lens_DATA=$(wildcard $(top_srcdir)/lenses/*.aug)
> ++dist_lenstest_DATA=$(wildcard $(top_srcdir)lenses/tests/*.aug)
> +
> + EXTRA_DIST=augeas.spec build/aux/move-if-change Makefile.am HACKING
> +
> diff --git a/meta-networking/recipes-support/augeas/augeas_1.5.0.bb
> b/meta-networking/recipes-support/augeas/augeas_1.5.0.bb
> new file mode 100644
> index 000..c4f62e7
> --- /dev/null
> +++ b/meta-networking/recipes-support/augeas/augeas_1.5.0.bb
> @@ -0,0 +1,4 @@
> +require augeas.inc
> +
> +SRC_URI[md5sum] = "01190e455c513124a2dae29a1182c113"
> +SRC_URI[sha256sum] =
> "223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f"
> --
> 2.1.4
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] plymouth: remove virtual prefix for RPROVIDES
The 'virtual' namespace is only intended to be used for build-time
dependencies, not in the runtime package namespace.
Signed-off-by: Joe MacDonald
---
meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
index de23dcd..597d8cd 100644
--- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
+++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libcap libpng cairo dbus udev"
PROVIDES = "virtual/psplash"
-RPROVIDES_${PN} = "virtual/psplash virtual/psplash-support"
+RPROVIDES_${PN} += "psplash psplash-support"
SRC_URI =
"http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2";
SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] Samba: use only libsystemd
Hi Gyorgy,
[[oe] [meta-networking][PATCH] Samba: use only libsystemd] On 16.06.18 (Sat
21:06) Gyorgy Szombathelyi wrote:
> This patch was disappeared while moved to 4.4.2
I can't find this patch in the git history, but I'm happy to merge it if
you can provide a bit more detail on it. Is it always valid to assume
HAVE_LIBSYSTEMD will always mean HAVE_LIBSYSTEMD_JOURNAL and
HAVE_LIBSYSTEMD_DAEMON? Also, can you provide an upstream-status on
this?
Thanks.
-J.
>
> Signed-off-by: Gyorgy Szombathelyi
> ---
> .../samba/samba-4.4.2/10-use-only-libsystemd.patch | 81
> ++
> .../recipes-connectivity/samba/samba_4.4.2.bb | 1 +
> 2 files changed, 82 insertions(+)
> create mode 100644
> meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
>
> diff --git
> a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
>
> b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
> new file mode 100644
> index 000..81621ff
> --- /dev/null
> +++
> b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
> @@ -0,0 +1,81 @@
> +diff -ur samba-4.4.2/lib/util/become_daemon.c
> samba-4.4.2/lib/util/become_daemon.c
> +--- samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:33:24.0
> +0200
> samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:26:50.275177918
> +0200
> +@@ -24,7 +24,7 @@
> + #include "includes.h"
> + #include "system/filesys.h"
> + #include "system/locale.h"
> +-#if HAVE_LIBSYSTEMD_DAEMON
> ++#if HAVE_LIBSYSTEMD
> + #include
> + #endif
> + #include "lib/util/close_low_fd.h"
> +@@ -69,9 +69,9 @@
> + if (do_fork) {
> + newpid = fork();
> + if (newpid) {
> +-#if HAVE_LIBSYSTEMD_DAEMON
> ++#if HAVE_LIBSYSTEMD
> + sd_notifyf(0, "READY=0\nSTATUS=Starting
> process...\nMAINPID=%lu", (unsigned long) newpid);
> +-#endif /* HAVE_LIBSYSTEMD_DAEMON */
> ++#endif /* HAVE_LIBSYSTEMD */
> + _exit(0);
> + }
> + }
> +@@ -98,7 +98,7 @@
> +
> + _PUBLIC_ void exit_daemon(const char *msg, int error)
> + {
> +-#ifdef HAVE_LIBSYSTEMD_DAEMON
> ++#ifdef HAVE_LIBSYSTEMD
> + if (msg == NULL) {
> + msg = strerror(error);
> + }
> +@@ -117,7 +117,7 @@
> + if (name == NULL) {
> + name = "Samba";
> + }
> +-#ifdef HAVE_LIBSYSTEMD_DAEMON
> ++#ifdef HAVE_LIBSYSTEMD
> + sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...",
> name);
> + #endif
> + DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve "
> +@@ -129,7 +129,7 @@
> + if (name == NULL) {
> + name = "Samba";
> + }
> +-#ifdef HAVE_LIBSYSTEMD_DAEMON
> ++#ifdef HAVE_LIBSYSTEMD
> + sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
> + #endif
> + DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg));
> +diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c
> +--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.0 +0200
> samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200
> +@@ -102,7 +102,7 @@
> + .fd = 2 /* stderr by default */
> + };
> +
> +-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL)
> ++#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD)
> + static int debug_level_to_priority(int level)
> + {
> + /*
> +@@ -179,7 +179,7 @@
> + }
> + #endif /* WITH_SYSLOG */
> +
> +-#ifdef HAVE_LIBSYSTEMD_JOURNAL
> ++#ifdef HAVE_LIBSYSTEMD
> + #include
> + static void debug_systemd_log(int msg_level,
> + const char *msg, const char *msg_no_nl)
> +@@ -251,7 +251,7 @@
> + },
> + #endif
> +
> +-#ifdef HAVE_LIBSYSTEMD_JOURNAL
> ++#ifdef HAVE_LIBSYSTEMD
> + {
> + .name = "systemd",
> + .log = debug_systemd_log,
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
> b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
> index 50c100e..b7ee730 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
> @@ -13,6 +13,7 @@ ${SAMBA_MIRROR}
> http://www.mirrorservice.org/sites/ftp.samba.org \n \
>
> SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
> file://00-fix-typos-in-man-pages.patch \
> + file://10-use-only-libsystemd.patch \
> file://16-do-not-check-xsltproc-manpages.patch \
> file://20-do-not-import-target-module-while-cross-compile.patch \
> file://21-add-config-option-without-valgrind.patch \
> --
> 2.7.4
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] openconnect: add dependency to fix Makefile.am
[[oe] [meta-networking][PATCH] openconnect: add dependency to fix Makefile.am]
On 16.05.06 (Fri 17:02) Chen Qi wrote:
> main.c needs version.c which is generated at build time.
> Add this dependency to avoid the following error.
>
> ../git/main.c:78:21: fatal error: version.c: No such file or directory
>
> Signed-off-by: Chen Qi
> ---
> .../0001-Makefile.am-add-missing-dependency.patch | 28
> ++
> .../openconnect/openconnect_git.bb | 3 ++-
> 2 files changed, 30 insertions(+), 1 deletion(-)
> create mode 100644
> meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
>
> diff --git
> a/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
>
> b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
> new file mode 100644
> index 000..c465bf1
> --- /dev/null
> +++
> b/meta-networking/recipes-connectivity/openconnect/files/0001-Makefile.am-add-missing-dependency.patch
> @@ -0,0 +1,28 @@
> +Upstream-Status: Pending
I think you should run this by upstream first, actually.
> +
> +Subject: Makefile.am: add missing dependency
> +
> +Add missing dependency to avoid the following error.
> +
> + ../git/main.c:78:21: fatal error: version.c: No such file or directory
> +
> +Signed-off-by: Chen Qi
> +---
> + Makefile.am | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index d823e01..ea48ec1 100644
> +--- a/Makefile.am
> b/Makefile.am
> +@@ -112,6 +112,7 @@ EXTRA_DIST += $(shell cd "$(top_srcdir)" && \
> +
> + DISTCLEANFILES = $(pkgconfig_DATA)
> +
> ++main.c: version.c
main.c isn't a generated file so this dependency seems meaningless. The
target we want to build is main.o and the existing target clearly says
we need version.c to exist before main.o can be built. I don't know how
you'd get a scenario where make thinks all of the dependencies for
main.o have been satisfied but version.c doesn't exist.
-J.
> + main.o: version.c
> + version.c: $(library_srcs) $(lib_openssl_srcs) $(lib_gnutls_srcs) \
> +$(openconnect_SOURCES) Makefile.am configure.ac \
> +--
> +2.8.1
> +
> diff --git
> a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> index 6d3c252..d8fe439 100644
> --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> @@ -8,7 +8,8 @@ RDEPENDS_${PN} = "vpnc"
> PV = "7.06"
>
> SRCREV = "35542d52202672b8c12ecc63867432128244013a"
> -SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git"
> +SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git \
> + file://0001-Makefile.am-add-missing-dependency.patch"
>
> S = "${WORKDIR}/git"
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
