On Fri, Aug 17, 2018 at 7:21 AM Stefan BOSAK <[email protected]> wrote: > > > > On Fri, Aug 17, 2018 at 3:39 PM Joe MacDonald <[email protected]> > wrote: >> >> [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. > > We could hold importing of Bird version 2.0.2 for now, > because this is not release with official support/maintainence from project > owners, > even I do not know about any distribution which has integrated it.
it seems we should only keep 1.6.x for now. if 2.0.2 is being tested actively then we can keep that too with D_P set to be -1 >> >> >> > On Fri, Aug 17, 2018 at 3:31 AM Joe MacDonald <[email protected]> >> > 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. > > Would be sufficient to import only Bird version 1.6.x for now, as starting > threshold/checkpoint. >> >> >> > 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 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? >> > >> > Dedicated binaries for both protocols (IPv4 & IPv6) are required/needed to >> > cover dual-stack mode (as I wrote there are implementation reasons for >> > this). >> > Potentially we can have a look (get inspirations) on how debian is >> > approaching/ >> > covering this packaging (https://salsa.debian.org/debian/bird), could help >> > us >> > more and seems to be sufficient, or contact project maintainers to clearly >> > clarify this. >> >> Well, a quick look at >> https://salsa.debian.org/debian/bird/blob/master/debian/rules seems to >> provide the answer for, at least, the 1.6.4 case: >> >> 36 override_dh_auto_configure: >> 37 CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" dh_auto_configure >> -Bbuild-ipv4 -- $(COMMON_FLAGS) --disable-ipv6 --with-protocols=all >> 38 CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" dh_auto_configure >> -Bbuild-ipv6 -- $(COMMON_FLAGS) --enable-ipv6 --with-protocols=all >> 39 >> 40 override_dh_auto_build: >> 41 dh_auto_build -Bbuild-ipv4 >> 42 dh_auto_build -Bbuild-ipv6 >> >> Looks to me like there are two specific configurations and builds done >> for the v4 and v6 options. So that'll inform my approach on the 1.6.4 >> recipe. The 2.0.2 spec from below shows something very similar: >> >> 22 %build >> 23 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var >> --enable-ipv6 >> 24 make >> 25 mv bird bird6 >> 26 make clean >> 27 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var >> 28 make >> >> except, as I'd noted earlier, --enable-ipv6 isn't a valid configure >> option for 2.0.2, so I'll take a quick look deeper into this and decide >> on what do to with it. I would be inclined to keep the 2.0.2 recipe >> even if it is ipv4 only, but if you think v6 support is essential and it >> isn't possible to make it functional in the current upstream source, I >> suggest we keep only the 1.6.4 recipe. What do you think? > > Exactly, as we already discussed there are changes between Bird versions > 1.6.x vs 2.0.x > espetially in the term of dual-stack mode support during > configuration/compilation phases, > newer one is not supporting external configuration option anymore. > My suggestion (friendly wish) would be to import Bird version 1.6.x > (it is important to support dual-stack mode by default in final package) > into official networking layer. >> >> >> -J. >> >> > Based on my understanding of how Yocto recipes works, there are two >> > possibilities to achieve the same results/goal: >> > 1) more advanced approach using only one recipe >> > Only one recipe for both cases will be needed, but i assume that two >> > separated >> > iterations has to be performed within configuration/compilation recipe >> > phase >> > and one packaging/installation has to be proceeded. This means additional >> > complexity within given recipe, but only one package has to be installed by >> > user. >> > 2) simpler approach using two recipes >> > Two recipes will be needed to cover related scope for simplification of >> > configuration/compilation phases within recipe workflows, >> > but every time when needed user has to take care about installing of two >> > packages. >> > >> > See these files for details (there are no major differences between >> > versions): >> > https://gitlab.labs.nic.cz/labs/bird/blob/v2.0.2/misc/bird.spec >> > https://gitlab.labs.nic.cz/labs/bird/blob/v1.6.4/misc/bird.spec >> > >> > Let me know what could i do to help you if needed, I would try to do my >> > best. >> > I belive that at the end we would be able to add really useful recipe into >> > Yocto ecosystem which help the community to build/prepare >> > optimized, highly available solutions using one of the well configurable, >> > reasonable reliable and high performance BGP tool available worldwide. >> > >> > Thank you for your support including all effort behind. >> > >> > Have a nice day. >> > >> > >> > >> > 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 [email protected] >> > > >> > > >> > > On Thu, Aug 16, 2018 at 9:45 PM Joe MacDonald >> > <[email protected]> >> > 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 <[email protected]> >> > > 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 [email protected] >> > > > >> > > > >> > > > On Thu, Aug 16, 2018 at 6:19 PM Joe MacDonald < >> > [email protected]> >> > > 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 [email protected] >> > > > > >> > > > > >> > > > > On Thu, Aug 16, 2018 at 4:42 AM Joe MacDonald < >> > > [email protected]> >> > > > wrote: >> > > > > >> > > > > Initial integration of the two stable BIRD releases, >> > 1.6.4 and >> > > 2.0.2. >> > > > > >> > > > > Signed-off-by: Joe MacDonald >> > <[email protected]> >> > > > > --- >> > > > > >> > > > > 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 000000000..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 000000000..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 000000000..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 000000000..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 <[email protected]> >> > > > > +Date: Thu, 16 Aug 2018 01:56:05 +0000 >> > > > > +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 >> > <[email protected]> >> > > > > +--- >> > > > > + 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 program is distributed in the hope that it >> > will >> > be >> > > useful, >> > > > but >> > > > > +@@ -17,26 +15,22 @@ timestamp='2009-04-27' >> > > > > + # General Public License for more details. >> > > > > + # >> > > > > + # You should have received a copy of the GNU >> > General >> > Public >> > > License >> > > > > +-# along with this program; if not, write to the >> > Free >> > Software >> > > > > +-# Foundation, Inc., 51 Franklin Street - Fifth >> > Floor, >> > Boston, >> > > MA >> > > > > +-# 02110-1301, USA. >> > > > > ++# along with this program; if not, see <https:// >> > www.gnu.org/ >> > > > licenses/>. >> > > > > + # >> > > > > + # As a special exception to the GNU General Public >> > License, >> > > if you >> > > > > + # distribute this file as part of a program that >> > contains a >> > > > > + # configuration script generated by Autoconf, you >> > may >> > include >> > > it >> > > > under >> > > > > +-# the same distribution terms that you use for the >> > rest >> > of >> > > that >> > > > program. >> > > > > +- >> > > > > +- >> > > > > +-# Originally written by Per Bothner >> > <[email protected]>. >> > > > > +-# Please send patches to <[email protected]>. >> > Submit a >> > > > context >> > > > > +-# diff and a properly formatted ChangeLog entry. >> > > > > ++# the same distribution terms that you use for the >> > rest >> > of >> > > that >> > > > > ++# program. This Exception is an additional >> > permission >> > under >> > > > section 7 >> > > > > ++# of the GNU General Public License, version 3 >> > ("GPLv3"). >> > > > > + # >> > > > > +-# This script attempts to guess a canonical system >> > name >> > > similar to >> > > > > +-# config.sub. If it succeeds, it prints the system >> > name on >> > > stdout, >> > > > and >> > > > > +-# exits with 0. Otherwise, it exits with 1. >> > > > > ++# Originally written by Per Bothner; maintained >> > since >> > 2000 by >> > > Ben >> > > > > Elliston. >> > > > > + # >> > > > > +-# The plan is that this can be called by configure >> > scripts if >> > > you >> > > > > +-# don't specify an explicit build system type. >> > > > > ++# You can get the latest version of this script >> > from: >> > > > > ++# >> > https://git.savannah.gnu.org/gitweb/?p=config.git;a= >> > > blob_plain;f= >> > > > > config.guess >> > > > > ++# >> > > > > ++# Please send patches to <[email protected]>. >> > > > > ++ >> > > > > + >> > > > > + me=`echo "$0" | sed -e 's,.*/,,'` >> > > > > + >> > > > > +@@ -45,7 +39,7 @@ Usage: $0 [OPTION] >> > > > > + >> > > > > + Output the configuration name of the system \`$me' >> > is >> > run on. >> > > > > + >> > > > > +-Operation modes: >> > > > > ++Options: >> > > > > + -h, --help print this help, then exit >> > > > > + -t, --time-stamp print date of last >> > modification, >> > then >> > > exit >> > > > > + -v, --version print version number, then >> > exit >> > > > > +@@ -56,8 +50,7 @@ version="\ >> > > > > + GNU config.guess ($timestamp) >> > > > > + >> > > > > + Originally written by Per Bothner. >> > > > > +-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. >> > > > > + >> > > > > + This is free software; see the source for copying >> > conditions. >> > > > There is >> > > > > NO >> > > > > + warranty; not even for MERCHANTABILITY or FITNESS >> > FOR A >> > > PARTICULAR >> > > > > PURPOSE." >> > > > > +@@ -113,10 +106,10 @@ trap "rm -f \$tmpfiles 2>/dev/ >> > null; >> > > rmdir \ >> > > > $tmp 2>/ >> > > > > dev/null; exit 1" 1 2 13 15 ; >> > > > > + { echo "$me: cannot create a temporary directory >> > in >> > $TMPDIR" >> > > >&2 ; >> > > > exit >> > > > > 1 ; } ; >> > > > > + dummy=$tmp/dummy ; >> > > > > + tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; >> > > > > +-case $CC_FOR_BUILD,$HOST_CC,$CC in >> > > > > +- ,,) echo "int x;" > $dummy.c ; >> > > > > ++case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in >> > > > > ++ ,,) echo "int x;" > "$dummy.c" ; >> > > > > + for c in cc gcc c89 c99 ; do >> > > > > +- if ($c -c -o $dummy.o $dummy.c) >/dev/null >> > 2>&1 >> > ; >> > > then >> > > > > ++ if ($c -c -o "$dummy.o" "$dummy.c") >> > >/dev/null >> > 2>&1 ; >> > > then >> > > > > + CC_FOR_BUILD="$c"; break ; >> > > > > + fi ; >> > > > > + done ; >> > > > > +@@ -139,12 +132,40 @@ UNAME_RELEASE=`(uname -r) >> > 2>/dev/ >> > null` | >> > > | >> > > > > UNAME_RELEASE=unknown >> > > > > + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || >> > UNAME_SYSTEM= >> > > unknown >> > > > > + UNAME_VERSION=`(uname -v) 2>/dev/null` || >> > UNAME_VERSION >> > = >> > > unknown >> > > > > + >> > > > > ++case "$UNAME_SYSTEM" in >> > > > > ++Linux|GNU|GNU/*) >> > > > > ++ # If the system lacks a compiler, then just >> > pick >> > glibc. >> > > > > ++ # We could probably try harder. >> > > > > ++ LIBC=gnu >> > > > > ++ >> > > > > ++ eval "$set_cc_for_build" >> > > > > ++ cat <<-EOF > "$dummy.c" >> > > > > ++ #include <features.h> >> > > > > ++ #if defined(__UCLIBC__) >> > > > > ++ LIBC=uclibc >> > > > > ++ #elif defined(__dietlibc__) >> > > > > ++ LIBC=dietlibc >> > > > > ++ #else >> > > > > ++ LIBC=gnu >> > > > > ++ #endif >> > > > > ++ EOF >> > > > > ++ eval "`$CC_FOR_BUILD -E "$dummy.c" >> > 2>/dev/null | >> > grep ' >> > > ^LIBC' >> > > > | sed >> > > > > 's, ,,g'`" >> > > > > ++ >> > > > > ++ # If ldd exists, use it to detect musl libc. >> > > > > ++ if command -v ldd >/dev/null && \ >> > > > > ++ ldd --version 2>&1 | grep -q ^musl >> > > > > ++ then >> > > > > ++ LIBC=musl >> > > > > ++ fi >> > > > > ++ ;; >> > > > > ++esac >> > > > > ++ >> > > > > + # Note: order is significant - the case branches >> > are >> > not >> > > exclusive. >> > > > > + >> > > > > +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ >> > {UNAME_RELEASE}:$ >> > > > {UNAME_VERSION}" >> > > > > in >> > > > > ++case >> > > "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" >> > > > in >> > > > > + *:NetBSD:*:*) >> > > > > + # NetBSD (nbsd) targets should (where >> > applicable) >> > match >> > > one >> > > > or >> > > > > +- # more of the tupples: *-*-netbsdelf*, >> > *-*-netbsdaout*, >> > > > > ++ # more of the tuples: *-*-netbsdelf*, >> > *-*-netbsdaout*, >> > > > > + # *-*-netbsdecoff* and *-*-netbsd*. For >> > targets >> > that >> > > > recently >> > > > > + # switched to ELF, *-*-netbsd* would select >> > the >> > old >> > > > > + # object file format. This provides both >> > forward >> > > > > +@@ -154,23 +175,33 @@ case "${UNAME_MACHINE}:$ >> > {UNAME_SYSTEM}:$ >> > > > > {UNAME_RELEASE}:${UNAME_VERSION}" in >> > > > > + # Note: NetBSD doesn't particularly care >> > about >> > the >> > > vendor >> > > > > + # portion of the name. We always set it to >> > "unknown". >> > > > > + sysctl="sysctl -n hw.machine_arch" >> > > > > +- UNAME_MACHINE_ARCH=`(/sbin/$sysctl >> > 2>/dev/null || >> > \ >> > > > > +- /usr/sbin/$sysctl 2>/dev/null || echo >> > unknown)` >> > > > > +- case "${UNAME_MACHINE_ARCH}" in >> > > > > ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || >> > \ >> > > > > ++ "/sbin/$sysctl" 2>/dev/null || \ >> > > > > ++ "/usr/sbin/$sysctl" 2>/dev/null || \ >> > > > > ++ echo unknown)` >> > > > > ++ case "$UNAME_MACHINE_ARCH" in >> > > > > + armeb) machine=armeb-unknown ;; >> > > > > + arm*) machine=arm-unknown ;; >> > > > > + sh3el) machine=shl-unknown ;; >> > > > > + sh3eb) machine=sh-unknown ;; >> > > > > + sh5el) machine=sh5le-unknown ;; >> > > > > +- *) machine=${UNAME_MACHINE_ARCH}-unknown >> > ;; >> > > > > ++ earmv*) >> > > > > ++ arch=`echo "$UNAME_MACHINE_ARCH" | >> > sed -e >> > 's,^e >> > > \(armv >> > > > [0-9] >> > > > > \).*$,\1,'` >> > > > > ++ endian=`echo "$UNAME_MACHINE_ARCH" | >> > sed >> > -ne >> > > 's,^.*\ >> > > > (eb\)$, >> > > > > \1,p'` >> > > > > ++ machine="${arch}${endian}"-unknown >> > > > > ++ ;; >> > > > > ++ *) machine="$UNAME_MACHINE_ARCH"-unknown >> > ;; >> > > > > + esac >> > > > > + # The Operating System including object >> > format, >> > if it >> > > has >> > > > switched >> > > > > +- # to ELF recently, or will in the future. >> > > > > +- case "${UNAME_MACHINE_ARCH}" in >> > > > > ++ # to ELF recently (or will in the future) and >> > ABI. >> > > > > ++ case "$UNAME_MACHINE_ARCH" in >> > > > > ++ earm*) >> > > > > ++ os=netbsdelf >> > > > > ++ ;; >> > > > > + arm*|i386|m68k|ns32k|sh3*|sparc|vax) >> > > > > +- eval $set_cc_for_build >> > > > > ++ eval "$set_cc_for_build" >> > > > > + if echo __ELF__ | $CC_FOR_BUILD -E - >> > 2>/ >> > dev/ >> > > null \ >> > > > > +- | grep __ELF__ >/dev/null >> > > > > ++ | grep -q __ELF__ >> > > > > + then >> > > > > + # Once all utilities can be ECOFF >> > > (netbsdecoff) >> > > > or >> > > > > a.out (netbsdaout). >> > > > > + # Return netbsd for either. FIX? >> > > > > +@@ -180,7 +211,14 @@ case "${UNAME_MACHINE}:$ >> > {UNAME_SYSTEM}:$ >> > > > > {UNAME_RELEASE}:${UNAME_VERSION}" in >> > > > > + fi >> > > > > + ;; >> > > > > + *) >> > > > > +- os=netbsd >> > > > > ++ os=netbsd >> > > > > ++ ;; >> > > > > ++ esac >> > > > > ++ # Determine ABI tags. >> > > > > ++ case "$UNAME_MACHINE_ARCH" in >> > > > > ++ earm*) >> > > > > ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' >> > > > > ++ abi=`echo "$UNAME_MACHINE_ARCH" | >> > sed -e >> > > "$expr"` >> > > > > + ;; >> > > > > + esac >> > > > > + # The OS release >> > > > > +@@ -188,42 +226,62 @@ case "${UNAME_MACHINE}:$ >> > {UNAME_SYSTEM}:$ >> > > > > {UNAME_RELEASE}:${UNAME_VERSION}" in >> > > > > + # thus, need a distinct triplet. However, >> > they do >> > not >> > > need >> > > > > + # kernel version information, so it can be >> > replaced >> > > with a >> > > > > + # suitable tag, in the style of linux-gnu. >> > > > > +- case "${UNAME_VERSION}" in >> > > > > ++ case "$UNAME_VERSION" in >> > > > > + Debian*) >> > > > > + release='-gnu' >> > > > > + ;; >> > > > > + *) >> > > > > +- release=`echo ${UNAME_RELEASE}|sed >> > -e 's/ >> > [-_].* >> > > /\./'` >> > > > > ++ release=`echo "$UNAME_RELEASE" | sed >> > -e >> > 's/ >> > > [-_].*//' >> > > > | cut >> > > > > -d. -f1,2` >> > > > > + ;; >> > > > > + esac >> > > > > + # Since >> > CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: >> > > > > + # contains redundant information, the shorter >> > form: >> > > > > + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is >> > used. >> > > > > +- echo "${machine}-${os}${release}" >> > > > > ++ echo "$machine-${os}${release}${abi-}" >> > > > > ++ exit ;; >> > > > > ++ *:Bitrig:*:*) >> > > > > ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` >> > > > > ++ echo >> > > "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > + *:OpenBSD:*:*) >> > > > > + UNAME_MACHINE_ARCH=`arch | sed >> > 's/OpenBSD.//'` >> > > > > +- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd$ >> > > {UNAME_RELEASE} >> > > > > ++ echo >> > > "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" >> > > > > ++ exit ;; >> > > > > ++ *:LibertyBSD:*:*) >> > > > > ++ UNAME_MACHINE_ARCH=`arch | sed >> > 's/^.*BSD\.//'` >> > > > > ++ echo >> > > "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" >> > > > > ++ exit ;; >> > > > > ++ *:MidnightBSD:*:*) >> > > > > ++ echo >> > > "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > + *:ekkoBSD:*:*) >> > > > > +- echo ${UNAME_MACHINE}-unknown-ekkobsd$ >> > {UNAME_RELEASE} >> > > > > ++ echo >> > "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > + *:SolidBSD:*:*) >> > > > > +- echo ${UNAME_MACHINE}-unknown-solidbsd$ >> > {UNAME_RELEASE} >> > > > > ++ echo >> > "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > + macppc:MirBSD:*:*) >> > > > > +- echo powerpc-unknown-mirbsd${UNAME_RELEASE} >> > > > > ++ echo powerpc-unknown-mirbsd"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > + *:MirBSD:*:*) >> > > > > +- echo ${UNAME_MACHINE}-unknown-mirbsd$ >> > {UNAME_RELEASE} >> > > > > ++ echo >> > "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" >> > > > > + exit ;; >> > > > > ++ *:Sortix:*:*) >> > > > > ++ echo "$UNAME_MACHINE"-unknown-sortix >> > > > > ++ exit ;; >> > > > > ++ *:Redox:*:*) >> > > > > ++ echo "$UNAME_MACHINE"-unknown-redox >> > > > > ++ exit ;; >> > > > > ++ mips:OSF1:*.*) >> > > > > ++ echo mips-dec-osf1 >> > > > > ++ exit ;; >> > > > > + alpha:OSF1:*:*) >> > > > > + case $UNAME_RELEASE in >> > > > > + *4.0) >> > > > > + UNAME_RELEASE=`/usr/sbin/sizer -v | >> > awk ' >> > {print >> > > $3}'` >> > > > > + ;; >> > > > > + *5.*) >> > > > > +- UNAME_RELEASE=`/usr/sbin/sizer -v | >> > awk ' >> > {print >> > > $4}'` >> > > > > ++ UNAME_RELEASE=`/usr/sbin/sizer -v | >> > awk ' >> > {print >> > > $4}'` >> > > > > + ;; >> > > > > + esac >> > > > > + # According to Compaq, /usr/sbin/psrinfo has >> > been >> > > available >> > > > on >> > > > > +@@ -233,60 +291,54 @@ case "${UNAME_MACHINE}:$ >> > {UNAME_SYSTEM}:$ >> > > > > {UNAME_RELEASE}:${UNAME_VERSION}" in >> > > > > + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed >> > -n -e >> > 's/^ >> > > The >> > > > alpha \ >> > > > > (.*\) processor.*$/\1/p' | head -n 1` >> > > > > + case "$ALPHA_CPU_TYPE" in >> > > > > + "EV4 (21064)") >> > > > > +- UNAME_MACHINE="alpha" ;; >> > > > > ++ UNAME_MACHINE=alpha ;; >> > > > > + "EV4.5 (21064)") >> > > > > +- UNAME_MACHINE="alpha" ;; >> > > > > ++ UNAME_MACHINE=alpha ;; >> > > > > + "LCA4 (21066/21068)") >> > > > > +- UNAME_MACHINE="alpha" ;; >> > > > > ++ UNAME_MACHINE=alpha ;; >> > > > > + "EV5 (21164)") >> > > > > +- UNAME_MACHINE="alphaev5" ;; >> > > > > ++ UNAME_MACHINE=alphaev5 ;; >> > > > > + "EV5.6 (21164A)") >> > > > > +- UNAME_MACHINE="alphaev56" ;; >> > > > > ++ UNAME_MACHINE=alphaev56 ;; >> > > > > + "EV5.6 (21164PC)") >> > > > > +- UNAME_MACHINE="alphapca56" ;; >> > > > > ++ UNAME_MACHINE=alphapca56 ;; >> > > > > + "EV5.7 (21164PC)") >> > > > > +- UNAME_MACHINE="alphapca57" ;; >> > > > > ++ UNAME_MACHINE=alphapca57 ;; >> > > > > + "EV6 (21264)") >> > > > > +- UNAME_MACHINE="alphaev6" ;; >> > > > > ++ UNAME_MACHINE=alphaev6 ;; >> > > > > + "EV6.7 (21264A)") >> > > > > +- UNAME_MACHINE="alphaev67" ;; >> > > > > ++ UNAME_MACHINE=alphaev67 ;; >> > > > > + "EV6.8CB (21264C)") >> > > > > +- UNAME_MACHINE="alphaev68" ;; >> > > > > ++ UNAME_MACHINE=alphaev68 ;; >> > > > > + "EV6.8AL (21264B)") >> > > > > +- UNAME_MACHINE="alphaev68" ;; >> > > > > ++ UNAME_MACHINE=alphaev68 ;; >> > > > > + "EV6.8CX (21264D)") >> > > > > +- UNAME_MACHINE="alphaev68" ;; >> > > > > ++ UNAME_MACHINE=alphaev68 ;; >> > > > > + "EV6.9A (21264/EV69A)") >> > > > > +- UNAME_MACHINE="alphaev69" ;; >> > > > > ++ UNAME_MACHINE=alphaev69 ;; >> > > > > + "EV7 (21364)") >> > > > > +- UNAME_MACHINE="alphaev7" ;; >> > > > > ++ UNAME_MACHINE=alphaev7 ;; >> > > > > + "EV7.9 (21364A)") >> > > > -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
