netbase: split up in netbase and init-ifupdown
PATCH v3 1/1 netbase: split up in netbase and init-ifupdown
- 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)
[YOCTO #2486]
---
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 | 3 +-
17 files changed, 59 insertions(+), 30 deletions(-)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/init (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/nfsroot (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemuarm/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemuarmv6/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemuarmv7/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemumips/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemumips64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemuppc/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemush4/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemux86-64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 => init-ifupdown/init-ifupdown-1.0}/qemux86/interfaces (100%)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bbmeta/conf/layer.conf +1 -0
@@ -18,6 +18,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ shadow-securetty \ opkg-config-base \ netbase \ + init-ifupdown \ formfactor \ xserver-xf86-config \ pointercal \
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright new file +11 -0
@@ -0,0 +1,11 @@ +This package was created by Peter Tobias [email protected] on +Wed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns +<[email protected]> until 2001. +It is currently maintained by Marco d'Itri <[email protected]>. + +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.
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init renamed from meta/recipes-core/netbase/netbase-5.0/init +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot renamed from meta/recipes-core/netbase/netbase-5.0/nfsroot +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemux86-64/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces +0 -0
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb new file +41 -0
41 lines not on this page · raw message
meta/recipes-core/netbase/netbase_5.0.bb +4 -29
@@ -4,45 +4,20 @@ HOMEPAGE = "http://packages.debian.org/netbase" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" -PR = "r0" - -inherit update-rc.d - -INITSCRIPT_NAME = "networking" -INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ - file://init \ - file://hosts \ - file://interfaces \ - file://nfsroot" + file://hosts" SRC_URI[md5sum] = "a379d9199d44d817543eddc211a29b70" SRC_URI[sha256sum] = "ac9424d3cb2bd3c07b6c5bc5875c434d3bc687a73cd7c54b7dc7122308afa9dc" 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/interfaces - 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" | "qemush*") - touch ${D}${sysconfdir}/network/nm-disabled-eth0 - ;; - *) - ;; - esac } -CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" +CONFFILES_${PN} = "${sysconfdir}/hosts"
meta/recipes-core/packagegroups/packagegroup-core-boot.bb +2 -1
@@ -6,7 +6,7 @@ SUMMARY = "Minimal boot requirements" DESCRIPTION = "The minimal set of packages required to boot the system" LICENSE = "MIT" DEPENDS = "virtual/kernel" -PR = "r10" +PR = "r11" inherit packagegroup
@@ -39,6 +39,7 @@ RDEPENDS_${PN} = "\ ${@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} \
Signature · 1 line
1.7.9.5
Op 18 sep. 2012, om 12:01 heeft Constantin Musca <[email protected]> het volgende geschreven:
Quoted 12 lines
- 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)[YOCTO #2486]
Signed-off-by Constantin Musca <[email protected]>
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb line 8
Quoted 8 lines
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb new file +8
-0@@ -0,0 +1,41 @@ +SUMMARY = "Basic TCP/IP networking init scripts and configuration files" +DESCRIPTION = "This package provides high level tools to configure network interfaces" +HOMEPAGE = "http://packages.debian.org/ifupdown" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" +RDEPENDS_${PN} = "netbase" +RCONFLICTS_${PN} = "netbase (< 5.0-r1)"
Since R* is for packaging they should live below do_install to mimic the order of task execution in the recipe
Quoted 12 lines · Koen Kooi
Op 18 sep. 2012, om 12:01 heeft Constantin Musca <[email protected]> het volgende geschreven:
Quoted 9 lines
- 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)[YOCTO #2486]
Signed-off-by Constantin Musca <[email protected]>
Quoted 13 lines
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb line 8
Quoted 11 lines
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb new file +8
-0@@ -0,0 +1,41 @@ +SUMMARY = "Basic TCP/IP networking init scripts and configuration files" +DESCRIPTION = "This package provides high level tools to configure network interfaces" +HOMEPAGE = "http://packages.debian.org/ifupdown" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" +RDEPENDS_${PN} = "netbase" +RCONFLICTS_${PN} = "netbase (< 5.0-r1)"Since R* is for packaging they should live below
do_installto mimic the order of task execution in the recipe
And I guess that layers changing machine specific parts of netbase did that with PRINC so e.g. for me, I've
SHR root@gjama ~ $ opkg info netbase
Package: netbase
Version: 5.0-r8
So I guess I'll have to change this RCONFLICTS too in such layer, but problem is that in BSP you don't know how many other layers someone is using so PR of netbase (before this patch) is just lucky guess in this one.
Cheers,
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 30 lines · Martin Jansa
Quoted 12 lines · Koen Kooi
Op 18 sep. 2012, om 12:01 heeft Constantin Musca <[email protected]> het volgende geschreven:
Quoted 9 lines
- 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)[YOCTO #2486]
Signed-off-by Constantin Musca <[email protected]>Quoted 13 lines
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb line 8
Quoted 11 lines
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb new file +8
-0@@ -0,0 +1,41 @@ +SUMMARY = "Basic TCP/IP networking init scripts and configuration files" +DESCRIPTION = "This package provides high level tools to configure network interfaces" +HOMEPAGE = "http://packages.debian.org/ifupdown" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" +RDEPENDS_${PN} = "netbase" +RCONFLICTS_${PN} = "netbase (< 5.0-r1)"Since R* is for packaging they should live below
do_installto mimic the order of task execution in the recipeAnd I guess that layers changing machine specific parts of netbase did that with PRINC so e.g. for me, I've
Quoted 7 lines
SHR root@gjama ~ $ opkg info netbase
Package: netbase
Version: 5.0-r8So I guess I'll have to change this RCONFLICTS too in such layer, but problem is that in BSP you don't know how many other layers someone is using so PR of netbase (before this patch) is just lucky guess in this one.
It seems netbase needs to bump it's version so the RCONFLICTS can be like:
RCONFLICTS_${PN} = "netbase (< 5.0.1)
Regards
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 3 lines · Otavio Salvador
It seems netbase needs to bump it's version so the RCONFLICTS can be like:
RCONFLICTS_${PN} = "netbase (< 5.0.1)
But we're not upstream for netbase -- it's downloaded from Debian.
Of course it's so simple that forking it is an option.
Ross
Quoted 8 lines · Ross
Quoted 3 lines · Otavio Salvador
It seems netbase needs to bump it's version so the RCONFLICTS can be like:
RCONFLICTS_${PN} = "netbase (< 5.0.1)
But we're not upstream for netbase -- it's downloaded from Debian.
Of course it's so simple that forking it is an option.
You don't need to fork it but you can append something in the version just for this.
You could use 5.0+yocto for example. Another option is to change epoch and be done with it.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br