merge of '27f7ed93a4f4b9c492e78c7a165a6d1f6437ce91'

     and '90d9d534dc75e6fab6d87e7a5fc118ee99fad8af'

10 files changed, 58 insertions, 208 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 9322bb97d8..ab5f3b8f72 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -127,10 +127,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
-
-
-
-
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
@@ -147,6 +143,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 PREFERRED_VERSION_gtk+ = "2.10.10"
 PREFERRED_VERSION_libgnomeui = "2.16.1"
 
+PREFERRED_VERSION_prismstumbler = "0.7.3"
+
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
 
diff --git a/packages/gpe-aerial/gpe-aerial_0.3.0.bb b/packages/gpe-aerial/gpe-aerial_0.3.0.bb
new file mode 100644
index 0000000000..9158305a80
--- /dev/null
+++ b/packages/gpe-aerial/gpe-aerial_0.3.0.bb
@@ -0,0 +1,11 @@
+inherit gpe autotools
+
+PR = "r0"
+DESCRIPTION = "GPE wireless LAN communication applet"
+DEPENDS  = "gtk+ libgpewidget prismstumbler"
+RDEPENDS = "prismstumbler"
+SECTION  = "gpe"
+PRIORITY = "optional"
+LICENSE  = "GPL"
+
+GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 1f48fe0052..ffd314d2e8 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -6,7 +6,8 @@ DEPENDS = "dbus-glib ncurses"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
-                --enable-dbus"
+                --enable-dbus \
+		--disable-python  "
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd"
diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/interpreter-ready.patch
index cc6b9c6e2b..cc6b9c6e2b 100644
--- a/packages/gsm/files/magician/interpreter-ready.patch
+++ b/packages/gsm/files/interpreter-ready.patch
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 0b3a29e931..2019185b33 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -11,6 +11,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://default"
 S = "${WORKDIR}/gsm"
 
+SRC_URI_append_htcuniversal = " file://interpreter-ready.patch;patch=1"
 SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \
                             file://interpreter-ready.patch;patch=1 \
                             file://ldisc.patch;patch=1"
diff --git a/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty b/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty
+++ /dev/null
diff --git a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh b/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh
deleted file mode 100755
index e5fc6ed8b5..0000000000
--- a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#
-# checkroot.sh	Check to root filesystem.
-#
-# Version:	@(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
-#
-
-. /etc/default/rcS
-
-#
-# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
-# from this script *before anything else* with a timeout, like SCO does.
-#
-test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
-
-#
-# Ensure that bdflush (update) is running before any major I/O is
-# performed (the following fsck is a good example of such activity :).
-#
-test -x /sbin/update && update
-
-#
-# Read /etc/fstab.
-#
-exec 9>&0 </etc/fstab
-rootmode=rw
-rootopts=rw
-test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
-swap_on_md=no
-devfs=
-while read fs mnt type opts dump pass junk
-do
-	case "$fs" in
-		""|\#*)
-			continue;
-			;;
-		/dev/md*)
-			# Swap on md device.
-			test "$type" = swap && swap_on_md=yes
-			;;
-		/dev/*)
-			;;
-		*)
-			# Might be a swapfile.
-			test "$type" = swap && swap_on_md=yes
-			;;
-	esac
-	
-	test "$type" = devfs && devfs="$fs"
-
-	# Currently we do not care about the other entries
-	if test "$mnt" = "/"
-	then
-		#echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
-
-		rootopts="$opts"		
-		roottype="$type"
-
-		#The "spinner" is broken on busybox sh	
-		TERM=dumb
-			
-		test "$pass" = 0 -o "$pass" = "" && rootcheck=no
-		
-		# Enable fsck for ext2 and ext3 rootfs, disable for everything else				
-		case "$type" in
-		ext2|ext3)	rootcheck=yes;;
-		*)		rootcheck=no;;
-		esac
-		
-		if test "$rootcheck" = yes
-		then
-			if ! test -x "/sbin/fsck.${roottype}"
-			then
-				echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n"
-				rootcheck=no
-			fi
-		fi
-		
-		case "$opts" in
-			ro|ro,*|*,ro|*,ro,*)
-				rootmode=ro
-				;;
-		esac
-	fi
-done
-exec 0>&9 9>&-
-
-#
-# Activate the swap device(s) in /etc/fstab. This needs to be done
-# before fsck, since fsck can be quite memory-hungry.
-#
-doswap=no
-test -d /proc/1 || mount -n /proc
-case "`uname -r`" in
-	2.[0123].*)
-		if test $swap_on_md = yes && grep -qs resync /proc/mdstat
-		then
-			test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
-		else
-			doswap=yes
-		fi
-		;;
-	*)
-		doswap=yes
-		;;
-esac
-if test $doswap = yes
-then
-	test "$VERBOSE" != no && echo "Activating swap"
-	swapon -a 2> /dev/null
-fi
-
-#
-# Check the root filesystem.
-#
-if test -f /fastboot || test $rootcheck = no
-then
-  test $rootcheck = yes && echo "Fast boot, no filesystem check"
-else
-  #
-  # Ensure that root is quiescent and read-only before fsck'ing.
-  #
-  mount -n -o remount,ro /
-  if test $? = 0
-  then
-    if test -f /forcefsck
-    then
-	force="-f"
-    else
-	force=""
-    fi
-    if test "$FSCKFIX" = yes
-    then
-	fix="-y"
-    else
-	fix="-a"
-    fi
-    spinner="-C"
-    case "$TERM" in
-        dumb|network|unknown|"") spinner="" ;;
-    esac
-    test `uname -m` = s390 && spinner="" # This should go away
-    test "$VERBOSE" != no && echo "Checking root filesystem..."
-    fsck $spinner $force $fix /
-    #
-    # If there was a failure, drop into single-user mode.
-    #
-    # NOTE: "failure" is defined as exiting with a return code of
-    # 2 or larger.  A return code of 1 indicates that filesystem
-    # errors were corrected but that the boot may proceed.
-    #
-    if test "$?" -gt 1
-    then
-      # Surprise! Re-directing from a HERE document (as in
-      # "cat << EOF") won't work, because the root is read-only.
-      echo
-      echo "fsck failed.  Please repair manually and reboot.  Please note"
-      echo "that the root filesystem is currently mounted read-only.  To"
-      echo "remount it read-write:"
-      echo
-      echo "   # mount -n -o remount,rw /"
-      echo
-      echo "CONTROL-D will exit from this shell and REBOOT the system."
-      echo
-      # Start a single user shell on the console
-      /sbin/sulogin $CONSOLE
-      reboot -f
-    fi
-  else
-    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
-    echo
-  fi
-fi
-
-#
-#	If the root filesystem was not marked as read-only in /etc/fstab,
-#	remount the rootfs rw but do not try to change mtab because it
-#	is on a ro fs until the remount succeeded. Then clean up old mtabs
-#	and finally write the new mtab.
-#	This part is only needed if the rootfs was mounted ro.
-#
-
-if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then
-        exit 0
-fi
-
-
-echo "Remounting root file system..."
-mount -n -o remount,$rootmode /
-if test "$rootmode" = rw
-then
-	if test ! -L /etc/mtab
-	then
-		rm -f /etc/mtab~ /etc/nologin
-		: > /etc/mtab
-	fi
-	mount -f -o remount /
-	mount -f /proc
-	test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
-fi
-
-: exit 0
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index 8a02aa7b58..f3b8a0cd45 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -193,7 +193,7 @@ ROOTFSDEV="/dev/root"
 if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then
   ROOTFSDEV="rootfs"
 fi
-if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then
+if [ x$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = "xrw" ]; then
 	echo "Root filesystem already read-write, not remounting"
 	exit 0
 fi
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 33cbf9ca03..83c753d3da 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r87"
+PR = "r88"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
new file mode 100644
index 0000000000..44401df7dd
--- /dev/null
+++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -0,0 +1,40 @@
+SECTION = "x11/network"
+PR = "r0"
+
+PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc"
+DESCRIPTION = "Prismstumbler wireless LAN scanner"
+DESCRIPTION_prismstumbler-frontend = "Prismstumbler wireless LAN scanner GTK frontend"
+LICENSE = "GPL"
+DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd"
+RDEPENDS = "wireless-tools"
+RRECOMMENDS = "gpsd"
+
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz"
+
+S = "${WORKDIR}/${PN}-0.7.4pre1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+		--x-libraries=${STAGING_LIBDIR} \
+		--with-libgps=${STAGING_DIR}/${HOST_SYS} \
+		--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+		--with-sqlite-includes=${STAGING_INCDIR} \
+		--with-sqlite-libs=${STAGING_LIBDIR} \
+		--without-athena --enable-dbus"
+
+CFLAGS =+ "-I${S}/include"
+LDFLAGS += "-lz"
+
+FILES_${PN} = "${bindir}/prismstumbler"
+
+FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
+	                       ${datadir}/applications \
+	                       ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \
+                               ${sysconfdir}"
+RDEPENDS_prismstumbler-frontend = "${PN}"
+
+
+do_install_append() {
+  chmod a+s ${D}${bindir}/prismstumbler
+}