From c3e8dd99251f1207443bff6a0d85dd9c55006bc9 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 15 Aug 2005 08:12:04 +0000 Subject: altboot: Do not use a fixed time to wait for WLAN on NFS boot. Ping the NFS host and continue once the network is up. --- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 42 ++++++++++++++++++---- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index feedfc769b..33e869bbe1 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -29,7 +29,7 @@ run_module() { /etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!" # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm to lazy to investigate ;) + # For the time beeing I'm too lazy to investigate ;) /etc/init.d/networking start || die "/etc/init.d/networking start failed!" sleep 2 @@ -37,14 +37,44 @@ run_module() { # After the PCMCIA service is started, an inserted WLAN card should automatically # activate itself. /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - # Give WLAN time to login into the network - echo "Waiting for WLAN..." - sleep 8 - + + nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" + + # WLAN with DHCP needs some time to get a lease, set up the routing, etc. + echo -n "Waiting for WLAN" + cnt=0 + while true + do + if (ping -c 1 $nfs_host) >/dev/null 2>&1 + then + echo " found" + break + else + if test "$cnt" = 30 -o "$cnt" = 60 + then + echo "" + echo "WARNING: WLAN didn't activate in $cnt seconds!" + + if test "$cnt" = 30 + then + echo "Restarting udhcpc" + killall udhcpc + udhcpc -i wlan0 -H `cat /etc/hostname` + else + die "Failed to activate WLAN!" + break + fi + else + echo -n "." + let cnt=$cnt+1 + fi + fi + sleep 1 + done + if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 then echo -e "Please select your NFS root:\n" -- cgit v1.2.3 From fcc3aea517654e7635ba159e444bf0fd11baa721 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 15 Aug 2005 09:03:53 +0000 Subject: entrance: s/Sessions/Session/ as used by config.db --- packages/e17/entrance/Session/.mtn2git_empty | 0 packages/e17/entrance/Session/Enlightenment | 4 ++++ packages/e17/entrance/Sessions/.mtn2git_empty | 0 packages/e17/entrance/Sessions/Enlightenment | 4 ---- packages/e17/entrance_20050810.bb | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 packages/e17/entrance/Session/.mtn2git_empty create mode 100644 packages/e17/entrance/Session/Enlightenment delete mode 100644 packages/e17/entrance/Sessions/.mtn2git_empty delete mode 100644 packages/e17/entrance/Sessions/Enlightenment diff --git a/packages/e17/entrance/Session/.mtn2git_empty b/packages/e17/entrance/Session/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e17/entrance/Session/Enlightenment b/packages/e17/entrance/Session/Enlightenment new file mode 100644 index 0000000000..4d33bbb2e9 --- /dev/null +++ b/packages/e17/entrance/Session/Enlightenment @@ -0,0 +1,4 @@ +#!/bin/sh + +enlightenment + diff --git a/packages/e17/entrance/Sessions/.mtn2git_empty b/packages/e17/entrance/Sessions/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment deleted file mode 100644 index 4d33bbb2e9..0000000000 --- a/packages/e17/entrance/Sessions/Enlightenment +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -enlightenment - diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 574f6ea445..2714354856 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/ file://config-db.patch;patch=1 \ file://allow-missing-xsession.patch;patch=1 \ file://Xinit.d \ - file://Sessions" + file://Session" S = "${WORKDIR}/entrance" @@ -29,9 +29,9 @@ FILES += "${datadir}" do_install_append() { install -d ${D}/etc/X11/Xinit.d install -d ${D}/etc/X11/Xsession.d - install -d ${D}/etc/X11/Sessions + install -d ${D}/etc/X11/Session install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d - install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions + install -m 755 ${WORKDIR}/Session/* ${D}/etc/X11/Session } -- cgit v1.2.3 From 3dda05f241663a16fc47c21b5b86ce09f199d6ff Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Aug 2005 11:42:13 +0000 Subject: Really install into /sbin, fix packaging, bump PR and add RRECOMMENDS for the needed kernel-modules --- packages/iptables/iptables_1.3.3.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb index a67df35806..ab9fecc85c 100644 --- a/packages/iptables/iptables_1.3.3.bb +++ b/packages/iptables/iptables_1.3.3.bb @@ -2,10 +2,13 @@ DESCRIPTION = "iptables network filtering tools" HOMEPAGE = "http://www.netfilter.org/" SECTION = "console/utils" LICENSE = "GPL" -PR = "r1" +RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter" +PR = "r3" + + PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore" +FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" @@ -22,7 +25,7 @@ do_compile () { } do_install () { - oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 } FILES_${PN}-doc += "${mandir}" -- cgit v1.2.3 From 9b93c3fb1203e3474b0ad23c56476f494d8da402 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Aug 2005 14:22:34 +0000 Subject: Add libcroco, a css parsing an manipulation library --- packages/libcroco/.mtn2git_empty | 0 packages/libcroco/libcroco_0.6.0.bb | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 packages/libcroco/.mtn2git_empty create mode 100644 packages/libcroco/libcroco_0.6.0.bb diff --git a/packages/libcroco/.mtn2git_empty b/packages/libcroco/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb new file mode 100644 index 0000000000..378b2ad523 --- /dev/null +++ b/packages/libcroco/libcroco_0.6.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" +SECTION = "x11/utils" +MAINTAINER = "Koen Kooi " +DEPENDS = "glib-2.0 libxml2" +LICENSE = "LGPL" +PR = "r0" + +inherit autotools pkgconfig gnome + + -- cgit v1.2.3 From 5ad7c1179d60da9d92c9deb3488ba4833d9b3a83 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 16:36:20 +0000 Subject: Add a bunch of iptables/bridging-related modules --- packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +- packages/linux/openslug-kernel-2.6.12.2/defconfig | 85 ++++++++++++++++++++++- 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index ae20210282..f15fc998a3 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r10" +PR = "r11" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 9c4a61abda..15f2fecdb1 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -401,11 +401,13 @@ CONFIG_SCSI_QLA2XXX=y # # CONFIG_I2O is not set + # # Networking support # CONFIG_NET=y + # # Networking options # @@ -427,6 +429,11 @@ CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m CONFIG_IP_TCPDIAG_IPV6=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set CONFIG_INET6_AH=m @@ -435,10 +442,83 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +CONFIG_IP_NF_MATCH_HELPER=m +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_REALM=m +# CONFIG_IP_NF_MATCH_SCTP is not set +CONFIG_IP_NF_MATCH_COMMENT=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_CLASSIFY=m +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set # # SCTP Configuration (EXPERIMENTAL) @@ -489,6 +569,7 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_BT_HIDP is not set + # # Bluetooth device drivers # -- cgit v1.2.3 From b1f16033bfb047128c1501de62cedc8c506726c0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 16:41:00 +0000 Subject: Bump PR --- packages/ixp425-eth/ixp425-eth_1.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_1.4.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index f10d7173f0..1843f21301 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r7" +PR = "r8" S = "${WORKDIR}" diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb index 0526374e96..91856a855a 100644 --- a/packages/ixp4xx/ixp4xx-csr_1.4.bb +++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb @@ -7,7 +7,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip file://badpaths.patch;patch=1 \ file://build-timing-annoyance.patch;patch=1" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r3" +PR = "r4" COMPATIBLE_HOST = "^armeb-linux.*" -- cgit v1.2.3 From 2b48a44ccb6909d15f37a4be9dbb0448ca9e1845 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Mon, 15 Aug 2005 18:10:06 +0000 Subject: Removed bogus copy and paste INITSCRIPT definition. --- packages/nail/nail_11.21.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb index 7da09d2715..3162fb50b3 100644 --- a/packages/nail/nail_11.21.bb +++ b/packages/nail/nail_11.21.bb @@ -13,9 +13,6 @@ S = "${WORKDIR}/nail-11.21/" inherit autotools -# INITSCRIPT_NAME = "mt-daapd" -# INITSCRIPT_PARAMS = "defaults 84" - # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes" do_install() { -- cgit v1.2.3 From 4eddaed4476f9768827c89933ca3581612bbc1a9 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Mon, 15 Aug 2005 18:59:01 +0000 Subject: Add support for /etc/sysctl.conf . --- packages/initscripts/initscripts-1.0/bootmisc.sh | 14 ++++++++++++++ packages/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index ed46b222d2..814dba676c 100755 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -22,6 +22,20 @@ then chown root:tty /dev/tty[p-za-e][0-9a-f] fi +# +# Apply /proc settings if defined +# +SYSCTL_CONF="/etc/sysctl.conf" +if [ -f "${SYSCTL_CONF}" ] +then + if [ -x "/sbin/sysctl" ] + then + /sbin/sysctl -p "${SYSCTL_CONF}" + else + echo "To have ${SYSCTL_CONF} applied during boot, install package ." + fi +fi + # # Update /etc/motd. # diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 99b2a7dfbd..d2160c0e29 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r54" +PR = "r55" SRC_URI = "file://halt \ file://ramdisk \ -- cgit v1.2.3