diff options
author | Richard Purdie <richard@openedhand.com> | 2008-07-18 10:01:03 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-07-18 10:01:03 +0000 |
commit | 2d39cfb103123bc20fe78c5f3bb0d434d4a4bed4 (patch) | |
tree | ad46b87593fcc8ab495a917d8a45915166278ebc /meta/packages | |
parent | ba2831f50b02d08f9b0c13a498b975fa1611d4b4 (diff) | |
download | poky-2d39cfb103123bc20fe78c5f3bb0d434d4a4bed4.tar.gz |
netbase: Disable networkmanager control of eth0 on omap sdp/ldp boards
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4872 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/netbase/netbase_4.21.bb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/meta/packages/netbase/netbase_4.21.bb b/meta/packages/netbase/netbase_4.21.bb index c629da1d74..72a4d937df 100644 --- a/meta/packages/netbase/netbase_4.21.bb +++ b/meta/packages/netbase/netbase_4.21.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ | |||
2 | infrastructure for basic TCP/IP based networking." | 2 | infrastructure for basic TCP/IP based networking." |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | LICENSE = "GPL" | 4 | LICENSE = "GPL" |
5 | PR = "r18" | 5 | PR = "r20" |
6 | 6 | ||
7 | inherit update-rc.d | 7 | inherit update-rc.d |
8 | 8 | ||
@@ -37,13 +37,19 @@ do_install () { | |||
37 | install -m 0755 update-inetd ${D}${sbindir}/ | 37 | install -m 0755 update-inetd ${D}${sbindir}/ |
38 | install -m 0644 update-inetd.8 ${D}${mandir}/man8/ | 38 | install -m 0644 update-inetd.8 ${D}${mandir}/man8/ |
39 | install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces | 39 | install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces |
40 | 40 | ||
41 | # Disable network manager on machines that commonly do NFS booting | 41 | # Disable network manager on machines that commonly do NFS booting |
42 | if [ "${MACHINE}" = "omap-3430ldp" ]; then | 42 | case "${MACHINE}" in |
43 | touch ${D}${sysconfdir}/network/nm-disabled-eth0 | 43 | "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp") |
44 | fi | 44 | touch ${D}${sysconfdir}/network/nm-disabled-eth0 |
45 | ;; | ||
46 | *) | ||
47 | ;; | ||
48 | esac | ||
45 | } | 49 | } |
46 | 50 | ||
47 | CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" | 51 | CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" |
48 | 52 | ||
53 | PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" | ||
49 | PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" | 54 | PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" |
55 | PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}" | ||