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] (From OE-Core rev: 5ce5c3d1226d4a8a4997c63acc1b1b125770d005) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7c106a3bb8
commit
4cb7c9a7ca
|
@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
|
|||
shadow-securetty \
|
||||
opkg-config-base \
|
||||
netbase \
|
||||
init-ifupdown \
|
||||
connman-conf \
|
||||
formfactor \
|
||||
xserver-xf86-config \
|
||||
|
|
|
@ -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
|
||||
<ajt@debian.org> until 2001.
|
||||
It is currently maintained by Marco d'Itri <md@linux.it>.
|
||||
|
||||
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.
|
|
@ -0,0 +1,39 @@
|
|||
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
|
||||
}
|
||||
|
||||
do_install_append_qemuall () {
|
||||
# Disable network manager on machines that commonly do NFS booting
|
||||
touch ${D}${sysconfdir}/network/nm-disabled-eth0
|
||||
}
|
||||
|
||||
PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
|
||||
RDEPENDS_${PN} = "netbase"
|
||||
RCONFLICTS_${PN} = "netbase (< 1:5.0)"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/network/interfaces"
|
|
@ -5,44 +5,20 @@ 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 ."
|
||||
PE = "1"
|
||||
|
||||
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"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
@ -38,6 +38,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_initscripts} \
|
||||
|
|
Loading…
Reference in New Issue