From 330e32da127715341f49780b1f88120a31411739 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Mon, 5 Jul 2010 12:38:41 +0800 Subject: netbase: upgrade to 4.41 The upgrade is smooth with only one tweaks on update-inetd, which has been moved out of netbase (since 4.27) to be a standalone package. So remove related lines from netbase recipe. Signed-off-by: Kevin Tian --- meta/packages/netbase/netbase/busybox.patch | 13 ------- meta/packages/netbase/netbase_4.21.bb | 55 ----------------------------- meta/packages/netbase/netbase_4.41.bb | 53 +++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 68 deletions(-) delete mode 100644 meta/packages/netbase/netbase/busybox.patch delete mode 100644 meta/packages/netbase/netbase_4.21.bb create mode 100644 meta/packages/netbase/netbase_4.41.bb (limited to 'meta') diff --git a/meta/packages/netbase/netbase/busybox.patch b/meta/packages/netbase/netbase/busybox.patch deleted file mode 100644 index 845bb421e..000000000 --- a/meta/packages/netbase/netbase/busybox.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- netbase-3.18.orig/debian/networking.init.d~busybox -+++ netbase-3.18.orig/debian/networking.init.d -@@ -15,8 +15,8 @@ - # spoof protection on all current and future interfaces. - - if [ -e /proc/sys/net/ipv4/conf/all/rp_filter ]; then -- for f in /proc/sys/net/ipv4/conf/*/rp_filter; do -- echo 1 > $f -+ for f in /proc/sys/net/ipv4/conf/*; do -+ echo 1 > $f/rp_filter - done - return 0 - else diff --git a/meta/packages/netbase/netbase_4.21.bb b/meta/packages/netbase/netbase_4.21.bb deleted file mode 100644 index bed35adfc..000000000 --- a/meta/packages/netbase/netbase_4.21.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "This package provides the necessary infrastructure for basic TCP/IP based networking" -HOMEPAGE = "http://packages.debian.org/netbase" -SECTION = "base" -LICENSE = "GPLv2" -PR = "r23" - -inherit update-rc.d - -INITSCRIPT_NAME = "networking" -INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." -# On MNCI etc, start very late so that our own apps come up faster -INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ." -# On SlugOS (NSLU2) delay the stop until after network apps have exited -# Do not stop in single user - there's no way to sulogin! -INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ." - -SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ - file://init \ - file://hosts \ - file://interfaces" - -do_install () { - install -d ${D}${sysconfdir}/init.d \ - ${D}${sbindir} \ - ${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 -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 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 - case "${MACHINE}" in - "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" ) - touch ${D}${sysconfdir}/network/nm-disabled-eth0 - ;; - *) - ;; - esac -} - -CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" - -PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" -PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" -PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}" -PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}" -PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" diff --git a/meta/packages/netbase/netbase_4.41.bb b/meta/packages/netbase/netbase_4.41.bb new file mode 100644 index 000000000..a3e2e8742 --- /dev/null +++ b/meta/packages/netbase/netbase_4.41.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "This package provides the necessary infrastructure for basic TCP/IP based networking" +HOMEPAGE = "http://packages.debian.org/netbase" +SECTION = "base" +LICENSE = "GPLv2" +PR = "r0" + +inherit update-rc.d + +INITSCRIPT_NAME = "networking" +INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." +# On MNCI etc, start very late so that our own apps come up faster +INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ." +# On SlugOS (NSLU2) delay the stop until after network apps have exited +# Do not stop in single user - there's no way to sulogin! +INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ." + +SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ + file://init \ + file://hosts \ + file://interfaces" + +do_install () { + install -d ${D}${sysconfdir}/init.d \ + ${D}${sbindir} \ + ${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 -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 + + # Disable network manager on machines that commonly do NFS booting + case "${MACHINE}" in + "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" ) + touch ${D}${sysconfdir}/network/nm-disabled-eth0 + ;; + *) + ;; + esac +} + +CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" + +PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" +PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" +PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}" +PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}" +PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" -- cgit v1.2.3