From 2d39cfb103123bc20fe78c5f3bb0d434d4a4bed4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Jul 2008 10:01:03 +0000 Subject: 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 --- meta/packages/netbase/netbase_4.21.bb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/meta/packages/netbase/netbase_4.21.bb b/meta/packages/netbase/netbase_4.21.bb index c629da1d7..72a4d937d 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 \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r18" +PR = "r20" inherit update-rc.d @@ -37,13 +37,19 @@ do_install () { install -m 0755 update-inetd ${D}${sbindir}/ install -m 0644 update-inetd.8 ${D}${mandir}/man8/ install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces - + # Disable network manager on machines that commonly do NFS booting - if [ "${MACHINE}" = "omap-3430ldp" ]; then - touch ${D}${sysconfdir}/network/nm-disabled-eth0 - fi + case "${MACHINE}" in + "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp") + touch ${D}${sysconfdir}/network/nm-disabled-eth0 + ;; + *) + ;; + esac } CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" +PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" +PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}" -- cgit v1.2.3