netbase: split up in netbase and init-ifupdown
PATCH v4 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]
Signed-off-by Constantin Musca <[email protected]>
---
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 | 42 ++++++++++++++++++++
meta/recipes-core/netbase/netbase_5.0.bb | 33 ++-------------
.../packagegroups/packagegroup-core-boot.bb | 3 +-
17 files changed, 60 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 +42 -0
42 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
Quoted 4 lines · Constantin Musca
- 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)
what's new in v4? I don't see solution to
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029837.html
Quoted 246 lines
[YOCTO #2486]
Signed-off-by Constantin Musca <[email protected]>--- 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 | 42 ++++++++++++++++++++ meta/recipes-core/netbase/netbase_5.0.bb | 33 ++------------- .../packagegroups/packagegroup-core-boot.bb | 3 +- 17 files changed, 60 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
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot renamed from meta/recipes-core/netbase/netbase-5.0/nfsroot +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemux86-64/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces renamed from meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces +0
-0meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb new file +42
-0@@ -0,0 +1,42 @@ +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" +PR = "r0" + +inherit update-rc.d + +INITSCRIPT_NAME = "networking" +INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." + +SRC_URI = "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/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 +} + +RDEPENDS_${PN} = "netbase" +RCONFLICTS_${PN} = "netbase (< 5.0-r1)" + +CONFFILES_${PN} = "${sysconfdir}/network/interfaces"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 · 7 lines
1.7.9.5 _______________________________________________ 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]