Received: from mail-wg0-f43.google.com ([74.125.82.43]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TDv5Q-0006Ud-Ns for openembedded-core@lists.openembedded.org; Tue, 18 Sep 2012 12:31:24 +0200 Received: by wgbdq11 with SMTP id dq11so3030055wgb.24 for ; Tue, 18 Sep 2012 03:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=plXgGwAPJW2NwvAKaTLZYbIiaSbef1kpxPiiAfKIiqs=; b=ktWDqhU4MxnoX3Y2RUBgUkUzlPEptJUDBzZxUxOFbIljxJB7qjiKQJDFQzwgE1PT0h 3Q1576TW63+SPoKHD/+nTjEeq16slg9QWNIXje72cF81qH6lrZ+LdrMU8s0VSZ+byhAy SRO8Jyiuhc27K81IjGkonqZ5nFFo13WdEnFKIyfhski0gBr06ywZGfSP9aYk0ekl+pJS urKrtoTH7uxOlaWJ3cYbHilijyCcSo/mcMFtUOF07i1JeWh5w+EUk9J+OgcpytzdYvhE 35lYp0tFzCYoQILh0z88gbjr2CDX3+jaJ1GIdUp8KanJG2uO5Nk0PtGi2mucaCK+mxh/ na/A== Received: by 10.180.86.133 with SMTP id p5mr22278414wiz.17.1347963524951; Tue, 18 Sep 2012 03:18:44 -0700 (PDT) Received: from localhost ([94.230.152.246]) by mx.google.com with ESMTPS id b7sm31139420wiz.9.2012.09.18.03.18.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Sep 2012 03:18:44 -0700 (PDT) Date: Tue, 18 Sep 2012 12:18:37 +0200 From: Martin Jansa To: Constantin Musca Message-ID: <20120918101837.GC3498@jama.jama.net> References: <1347950839-19779-1-git-send-email-constantinx.musca@intel.com> MIME-Version: 1.0 In-Reply-To: <1347950839-19779-1-git-send-email-constantinx.musca@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH v2] netbase: split up in netbase and init-ifupdown X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2012 10:31:24 -0000 X-Groupsio-MsgNum: 29433 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1SQmhf2mF2YjsYvc" Content-Disposition: inline --1SQmhf2mF2YjsYvc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 18, 2012 at 09:47:19AM +0300, Constantin Musca wrote: > - netbase should only include etc-rpc, etc-protocols, etc-services > and the hosts file > - the init script/configuration files should be in another package > (init-ifupdown) >=20 > [YOCTO #2486] >=20 > Signed-off-by: Constantin Musca > --- > meta/conf/layer.conf | 1 + > .../init-ifupdown/init-ifupdown-1.0/copyright | 11 ++++++ > .../init-ifupdown-1.0}/init | 0 > .../init-ifupdown-1.0}/interfaces | 0 > .../init-ifupdown-1.0}/nfsroot | 0 > .../init-ifupdown-1.0}/qemuarm/interfaces | 0 > .../init-ifupdown-1.0}/qemuarmv6/interfaces | 0 > .../init-ifupdown-1.0}/qemuarmv7/interfaces | 0 > .../init-ifupdown-1.0}/qemumips/interfaces | 0 > .../init-ifupdown-1.0}/qemumips64/interfaces | 0 > .../init-ifupdown-1.0}/qemuppc/interfaces | 0 > .../init-ifupdown-1.0}/qemush4/interfaces | 0 > .../init-ifupdown-1.0}/qemux86-64/interfaces | 0 > .../init-ifupdown-1.0}/qemux86/interfaces | 0 > .../init-ifupdown/init-ifupdown_1.0.bb | 41 ++++++++++++++= ++++++ > meta/recipes-core/netbase/netbase_5.0.bb | 33 ++------------= -- > .../packagegroups/packagegroup-core-boot.bb | 1 + > 17 files changed, 58 insertions(+), 29 deletions(-) > create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/cop= yright > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/init (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/nfsroot (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemuarm/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemuarmv6/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemuarmv7/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemumips/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemumips64/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemuppc/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemush4/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemux86-64/interfaces (100%) > rename meta/recipes-core/{netbase/netbase-5.0 =3D> init-ifupdown/init-if= updown-1.0}/qemux86/interfaces (100%) > create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb >=20 > diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf > index ed50f1c..1308077 100644 > --- a/meta/conf/layer.conf > +++ b/meta/conf/layer.conf > @@ -18,6 +18,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE +=3D " \ > shadow-securetty \ > opkg-config-base \ > netbase \ > + init-ifupdown \ > formfactor \ > xserver-xf86-config \ > pointercal \ > diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright = b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright > new file mode 100644 > index 0000000..2a8e0d1 > --- /dev/null > +++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright > @@ -0,0 +1,11 @@ > +This package was created by Peter Tobias tobias@et-inf.fho-emden.de on > +Wed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns > + until 2001. > +It is currently maintained by Marco d'Itri . > + > +Copyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri > + > +The programs in this package are distributed under the terms of the GNU > +General Public License, version 2 as distributed by the Free Software > +Foundation. On Debian systems, a copy of this license may be found in > +/usr/share/common-licenses/GPL-2. > diff --git a/meta/recipes-core/netbase/netbase-5.0/init b/meta/recipes-co= re/init-ifupdown/init-ifupdown-1.0/init > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/init > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init > diff --git a/meta/recipes-core/netbase/netbase-5.0/interfaces b/meta/reci= pes-core/init-ifupdown/init-ifupdown-1.0/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/nfsroot b/meta/recipes= -core/init-ifupdown/init-ifupdown-1.0/nfsroot > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/nfsroot > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces b/m= eta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/inter= faces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces b= /meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/int= erfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces b= /meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/int= erfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces b/= meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/inte= rfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces = b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/in= terfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces b/m= eta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/inter= faces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces b/m= eta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/inter= faces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemux86-64/interfaces = b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemux86-64/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/in= terfaces > diff --git a/meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces b/m= eta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces > similarity index 100% > rename from meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces > rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/inter= faces > diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/= recipes-core/init-ifupdown/init-ifupdown_1.0.bb > new file mode 100644 > index 0000000..80d0a02 > --- /dev/null > +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb > @@ -0,0 +1,41 @@ > +SUMMARY =3D "Basic TCP/IP networking init scripts and configuration file= s" > +DESCRIPTION =3D "This package provides high level tools to configure net= work interfaces" > +HOMEPAGE =3D "http://packages.debian.org/ifupdown" > +SECTION =3D "base" > +LICENSE =3D "GPLv2" > +LIC_FILES_CHKSUM =3D "file://${WORKDIR}/copyright;md5=3D3dd6192d306f582d= ee7687da3d8748ab" > +RDEPENDS_${PN} =3D "netbase" > +RCONFLICTS_${PN} =3D "netbase (< 5.0-r1)" > +PR =3D "r0" > + > +inherit update-rc.d > + > +INITSCRIPT_NAME =3D "networking" > +INITSCRIPT_PARAMS =3D "start 40 S . stop 40 0 6 1 ." > + > +SRC_URI =3D "file://copyright \ > + file://init \ > + file://interfaces \ > + file://nfsroot" > + > +do_install () { > + install -d ${D}${sysconfdir}/init.d \ > + ${D}${sysconfdir}/network/if-pre-up.d \ > + ${D}${sysconfdir}/network/if-up.d \ > + ${D}${sysconfdir}/network/if-down.d \ > + ${D}${sysconfdir}/network/if-post-down.d > + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking > + install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfa= ces > + install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d > + > + # Disable network manager on machines that commonly do NFS booting > + case "${MACHINE}" in > + "qemuarm*" | "qemux86" | "qemux86-64" | "qemumips*" | "qemuppc" | "qem= ush*") > + touch ${D}${sysconfdir}/network/nm-disabled-eth0 > + ;; > + *) > + ;; > + esac > +} > + > +CONFFILES_${PN} =3D "${sysconfdir}/network/interfaces" > diff --git a/meta/recipes-core/netbase/netbase_5.0.bb b/meta/recipes-core= /netbase/netbase_5.0.bb > index 3aea874..3c683b0 100644 > --- a/meta/recipes-core/netbase/netbase_5.0.bb > +++ b/meta/recipes-core/netbase/netbase_5.0.bb > @@ -4,45 +4,20 @@ HOMEPAGE =3D "http://packages.debian.org/netbase" > SECTION =3D "base" > LICENSE =3D "GPLv2" > LIC_FILES_CHKSUM =3D "file://debian/copyright;md5=3D3dd6192d306f582dee76= 87da3d8748ab" > -PR =3D "r0" > - > -inherit update-rc.d > - > -INITSCRIPT_NAME =3D "networking" > -INITSCRIPT_PARAMS =3D "start 40 S . stop 40 0 6 1 ." > +PR =3D "r1" > =20 > SRC_URI =3D "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ > - file://init \ > - file://hosts \ > - file://interfaces \ > - file://nfsroot" > + file://hosts" > =20 > SRC_URI[md5sum] =3D "a379d9199d44d817543eddc211a29b70" > SRC_URI[sha256sum] =3D "ac9424d3cb2bd3c07b6c5bc5875c434d3bc687a73cd7c54b= 7dc7122308afa9dc" > =20 > do_install () { > - install -d ${D}${sysconfdir}/init.d \ > - ${D}${mandir}/man8 \ > - ${D}${sysconfdir}/network/if-pre-up.d \ > - ${D}${sysconfdir}/network/if-up.d \ > - ${D}${sysconfdir}/network/if-down.d \ > - ${D}${sysconfdir}/network/if-post-down.d > - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking > + install -d ${D}/${mandir}/man8 ${D}${sysconfdir} > install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts > install -m 0644 etc-rpc ${D}${sysconfdir}/rpc > install -m 0644 etc-protocols ${D}${sysconfdir}/protocols > install -m 0644 etc-services ${D}${sysconfdir}/services > - install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfa= ces > - install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d > - > - # Disable network manager on machines that commonly do NFS booting > - case "${MACHINE}" in > - "qemuarm*" | "qemux86" | "qemux86-64" | "qemumips*" | "qemuppc" | "qem= ush*") > - touch ${D}${sysconfdir}/network/nm-disabled-eth0 > - ;; > - *) > - ;; > - esac > } > =20 > -CONFFILES_${PN} =3D "${sysconfdir}/hosts ${sysconfdir}/network/interface= s" > +CONFFILES_${PN} =3D "${sysconfdir}/hosts" > diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/= meta/recipes-core/packagegroups/packagegroup-core-boot.bb > index 16ad4e3..c4ee7de 100644 > --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > @@ -39,6 +39,7 @@ RDEPENDS_${PN} =3D "\ > ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_= keymaps}", "", d)} \ > modutils-initscripts \ > netbase \ > + init-ifupdown \ > ${VIRTUAL-RUNTIME_login_manager} \ > ${VIRTUAL-RUNTIME_init_manager} \ > ${VIRTUAL-RUNTIME_dev_manager} \ Missing PR bump in this one. > --=20 > 1.7.9.5 >=20 >=20 > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --1SQmhf2mF2YjsYvc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEARECAAYFAlBYSn0ACgkQN1Ujt2V2gByf8QCeP29YBUfEaudSl8VuVCxKafY7 ENsAn1nKE5l9tPz+f/AOd5PH+xFxmLpG =6dKi -----END PGP SIGNATURE----- --1SQmhf2mF2YjsYvc--