summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-04 19:13:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 09:37:28 +0000
commit4cb7c9a7ca3632c15414177e6e3ee399ad48ba08 (patch)
treeb69eaf83119f8b92cddd9ce8ad7a99d265668937 /meta
parent7c106a3bb8a427321db579b682adfb4a2bd1eddc (diff)
downloadpoky-4cb7c9a7ca3632c15414177e6e3ee399ad48ba08.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/layer.conf1
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright11
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init (renamed from meta/recipes-core/netbase/netbase-5.0/init)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot (renamed from meta/recipes-core/netbase/netbase-5.0/nfsroot)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces)0
-rw-r--r--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
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces (renamed from meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces)0
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb39
-rw-r--r--meta/recipes-core/netbase/netbase_5.0.bb32
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb3
17 files changed, 57 insertions, 29 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 3259e5c712..6e5cd0cf8d 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
22 shadow-securetty \ 22 shadow-securetty \
23 opkg-config-base \ 23 opkg-config-base \
24 netbase \ 24 netbase \
25 init-ifupdown \
25 connman-conf \ 26 connman-conf \
26 formfactor \ 27 formfactor \
27 xserver-xf86-config \ 28 xserver-xf86-config \
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 0000000000..2a8e0d1264
--- /dev/null
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
@@ -0,0 +1,11 @@
1This package was created by Peter Tobias tobias@et-inf.fho-emden.de on
2Wed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns
3<ajt@debian.org> until 2001.
4It is currently maintained by Marco d'Itri <md@linux.it>.
5
6Copyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri
7
8The programs in this package are distributed under the terms of the GNU
9General Public License, version 2 as distributed by the Free Software
10Foundation. On Debian systems, a copy of this license may be found in
11/usr/share/common-licenses/GPL-2.
diff --git a/meta/recipes-core/netbase/netbase-5.0/init b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
index bace9df991..bace9df991 100644
--- a/meta/recipes-core/netbase/netbase-5.0/init
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
diff --git a/meta/recipes-core/netbase/netbase-5.0/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
index 0acf4cf441..0acf4cf441 100644
--- a/meta/recipes-core/netbase/netbase-5.0/interfaces
+++ b/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
index 750c0a98f9..750c0a98f9 100644
--- a/meta/recipes-core/netbase/netbase-5.0/nfsroot
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
index 16967763e5..16967763e5 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
index 16967763e5..16967763e5 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemuarmv6/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
index 16967763e5..16967763e5 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemuarmv7/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemumips/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemumips64/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemuppc/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemush4/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
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
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemux86-64/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
index f62b9a897d..f62b9a897d 100644
--- a/meta/recipes-core/netbase/netbase-5.0/qemux86/interfaces
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
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 0000000000..7bc7058a0a
--- /dev/null
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -0,0 +1,39 @@
1SUMMARY = "Basic TCP/IP networking init scripts and configuration files"
2DESCRIPTION = "This package provides high level tools to configure network interfaces"
3HOMEPAGE = "http://packages.debian.org/ifupdown"
4SECTION = "base"
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
7PR = "r0"
8
9inherit update-rc.d
10
11INITSCRIPT_NAME = "networking"
12INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
13
14SRC_URI = "file://copyright \
15 file://init \
16 file://interfaces \
17 file://nfsroot"
18
19do_install () {
20 install -d ${D}${sysconfdir}/init.d \
21 ${D}${sysconfdir}/network/if-pre-up.d \
22 ${D}${sysconfdir}/network/if-up.d \
23 ${D}${sysconfdir}/network/if-down.d \
24 ${D}${sysconfdir}/network/if-post-down.d
25 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
26 install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
27 install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d
28}
29
30do_install_append_qemuall () {
31 # Disable network manager on machines that commonly do NFS booting
32 touch ${D}${sysconfdir}/network/nm-disabled-eth0
33}
34
35PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
36RDEPENDS_${PN} = "netbase"
37RCONFLICTS_${PN} = "netbase (< 1:5.0)"
38
39CONFFILES_${PN} = "${sysconfdir}/network/interfaces"
diff --git a/meta/recipes-core/netbase/netbase_5.0.bb b/meta/recipes-core/netbase/netbase_5.0.bb
index 3aea87412d..03fdc38a67 100644
--- a/meta/recipes-core/netbase/netbase_5.0.bb
+++ b/meta/recipes-core/netbase/netbase_5.0.bb
@@ -5,44 +5,20 @@ SECTION = "base"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" 6LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
7PR = "r0" 7PR = "r0"
8 8PE = "1"
9inherit update-rc.d
10
11INITSCRIPT_NAME = "networking"
12INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
13 9
14SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ 10SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
15 file://init \ 11 file://hosts"
16 file://hosts \
17 file://interfaces \
18 file://nfsroot"
19 12
20SRC_URI[md5sum] = "a379d9199d44d817543eddc211a29b70" 13SRC_URI[md5sum] = "a379d9199d44d817543eddc211a29b70"
21SRC_URI[sha256sum] = "ac9424d3cb2bd3c07b6c5bc5875c434d3bc687a73cd7c54b7dc7122308afa9dc" 14SRC_URI[sha256sum] = "ac9424d3cb2bd3c07b6c5bc5875c434d3bc687a73cd7c54b7dc7122308afa9dc"
22 15
23do_install () { 16do_install () {
24 install -d ${D}${sysconfdir}/init.d \ 17 install -d ${D}/${mandir}/man8 ${D}${sysconfdir}
25 ${D}${mandir}/man8 \
26 ${D}${sysconfdir}/network/if-pre-up.d \
27 ${D}${sysconfdir}/network/if-up.d \
28 ${D}${sysconfdir}/network/if-down.d \
29 ${D}${sysconfdir}/network/if-post-down.d
30 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
31 install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts 18 install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
32 install -m 0644 etc-rpc ${D}${sysconfdir}/rpc 19 install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
33 install -m 0644 etc-protocols ${D}${sysconfdir}/protocols 20 install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
34 install -m 0644 etc-services ${D}${sysconfdir}/services 21 install -m 0644 etc-services ${D}${sysconfdir}/services
35 install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
36 install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d
37
38 # Disable network manager on machines that commonly do NFS booting
39 case "${MACHINE}" in
40 "qemuarm*" | "qemux86" | "qemux86-64" | "qemumips*" | "qemuppc" | "qemush*")
41 touch ${D}${sysconfdir}/network/nm-disabled-eth0
42 ;;
43 *)
44 ;;
45 esac
46} 22}
47 23
48CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" 24CONFFILES_${PN} = "${sysconfdir}/hosts"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index edb9e7452d..b9183a8709 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -6,7 +6,7 @@ SUMMARY = "Minimal boot requirements"
6DESCRIPTION = "The minimal set of packages required to boot the system" 6DESCRIPTION = "The minimal set of packages required to boot the system"
7LICENSE = "MIT" 7LICENSE = "MIT"
8DEPENDS = "virtual/kernel" 8DEPENDS = "virtual/kernel"
9PR = "r10" 9PR = "r11"
10 10
11inherit packagegroup 11inherit packagegroup
12 12
@@ -38,6 +38,7 @@ RDEPENDS_${PN} = "\
38 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ 38 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
39 modutils-initscripts \ 39 modutils-initscripts \
40 netbase \ 40 netbase \
41 init-ifupdown \
41 ${VIRTUAL-RUNTIME_login_manager} \ 42 ${VIRTUAL-RUNTIME_login_manager} \
42 ${VIRTUAL-RUNTIME_init_manager} \ 43 ${VIRTUAL-RUNTIME_init_manager} \
43 ${VIRTUAL-RUNTIME_initscripts} \ 44 ${VIRTUAL-RUNTIME_initscripts} \