diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 42 | ||||
| -rw-r--r-- | packages/e17/entrance/Session/.mtn2git_empty (renamed from packages/e17/entrance/Sessions/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/e17/entrance/Session/Enlightenment (renamed from packages/e17/entrance/Sessions/Enlightenment) | 0 | ||||
| -rw-r--r-- | packages/e17/entrance_20050810.bb | 6 | ||||
| -rw-r--r-- | packages/iptables/iptables_1.3.3.bb | 9 | ||||
| -rw-r--r-- | packages/libcroco/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libcroco/libcroco_0.6.0.bb | 10 |
7 files changed, 55 insertions, 12 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" diff --git a/packages/e17/entrance/Sessions/.mtn2git_empty b/packages/e17/entrance/Session/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/e17/entrance/Sessions/.mtn2git_empty +++ b/packages/e17/entrance/Session/.mtn2git_empty diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Session/Enlightenment index 4d33bbb2e9..4d33bbb2e9 100644 --- a/packages/e17/entrance/Sessions/Enlightenment +++ b/packages/e17/entrance/Session/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 } 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}" diff --git a/packages/libcroco/.mtn2git_empty b/packages/libcroco/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libcroco/.mtn2git_empty 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 <koen@handhelds.org>" +DEPENDS = "glib-2.0 libxml2" +LICENSE = "LGPL" +PR = "r0" + +inherit autotools pkgconfig gnome + + |