merge of '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'

     and 'bbaee78aa2be4934e6fb2377a1ef53589b7e3b7c'

52 files changed, 41 insertions, 1426 deletions

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index f7daa9f46c..bbc9f187ec 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -18,20 +18,14 @@ def get_src_tree(d):
 		bb.error("S not defined, unable to find source tree.")
 		return
 
-	try:
-		s_tree_raw = s.split('/')[1]
-	except IndexError:
-		return
-
+	s_tree_raw = s.split('/')[1]
 	s_tree = bb.data.expand(s_tree_raw, d)
 
 	src_tree_path = os.path.join(workdir, s_tree)
 	try:
 		os.listdir(src_tree_path)
 	except OSError:
-		bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
-		return
-
+		bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
 	bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
 	return s_tree
@@ -45,14 +39,11 @@ sourcepkg_do_create_orig_tgz(){
 	done
 
 	src_tree=${@get_src_tree(d)}
-	if test x${src_tree} = x; then
-		oenote "Skipping empty source tree"
-		return
-	fi
-
+	
+	echo $src_tree
 	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
 	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
-	cp -av $src_tree $src_tree.orig
+	cp -pPR $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
@@ -83,14 +74,7 @@ python sourcepkg_do_dumpdata() {
 	bb.note("Dumping metadata into '%s'" % dumpfile)
 	f = open(dumpfile, "w")
 	# emit variables and shell functions
-
-	# FIXME: if we emit all, bitbake will get error while
-	# evaluating AUTOREV since we have AUTOREV =
-	# "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
-	# without a valid SRC_URI will cause problem.
-
-	bb.data.emit_env(f, d, True)
-
+        bb.data.emit_env(f, d, True)
 	# emit the metadata which isnt valid shell
 	for e in d.keys():
 		if bb.data.getVarFlag(e, 'python', d):
@@ -105,11 +89,8 @@ sourcepkg_do_create_diff_gz(){
 		echo $i >> temp/exclude-from-file
 	done
 
+
 	src_tree=${@get_src_tree(d)}
-	if test x${src_tree} = x; then
-		oenote "Skipping empty source tree"
-		return
-	fi
 
 	for i in `find . -maxdepth 1 -type f`; do
 		mkdir -p $src_tree/${DISTRO}/files
@@ -121,10 +102,10 @@ sourcepkg_do_create_diff_gz(){
 	rm -rf $src_tree.orig
 }
 
-#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
-addtask archive_bb after do_patch before do_configure
-#addtask dumpdata after do_archive_bb before do_configure
-addtask create_diff_gz after do_archive_bb before do_configure
+addtask archive_bb after do_patch before do_dumpdata
+addtask dumpdata after do_archive_bb before do_create_diff_gz
+addtask create_diff_gz after do_dump_data before do_configure
+
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
deleted file mode 100644
index f2d816cd9e..0000000000
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PREFERRED_VERSION_asterisk = "1.4.17"
-PREFERRED_VERSION_busybox = "1.9.1"
-PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_glib-2.0 = "2.16.1"
-PREFERRED_VERSION_gnash = "0.8.2"
-PREFERRED_VERSION_gpsdrive = "2.10pre4"
-PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_intltool = "0.35.5"
-PREFERRED_VERSION_intltool-native = "0.35.5"
-PREFERRED_VERSION_libtool = "1.5.24"
-PREFERRED_VERSION_midori = "0.0.17"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.9"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9028630653..381a6127aa 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -152,7 +152,6 @@ SRCREV_pn-opkg-sdk ?= "4247"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-py-odeviced ?= "190"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
@@ -163,10 +162,7 @@ SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-python-pyrtc = "152"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "2006"
-SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
-SRCREV_pn-settings-daemon ?= "1755"
-SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
deleted file mode 100644
index 878cb1dba9..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
---- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
-@@ -35,6 +35,7 @@
- modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
- modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
- modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
-+modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
- Version svn-$Version
- ";
- 
-@@ -176,6 +177,25 @@
-       15812 => 3 ,
-       7906  => 2,
-       3953 => 1
-+    },
-+    openstreetmap_tah => {
-+      256*576000 =>  1,
-+      128*576000 =>  2,
-+       64*576000 =>  3,
-+       32*576000 =>  4,
-+       16*576000 =>  5,
-+        8*576000 =>  6,
-+        4*576000 =>  7,
-+        2*576000 =>  8,
-+          576000 =>  9,
-+          288000 => 10,
-+          144000 => 11,
-+           72000 => 12,
-+           36000 => 13,
-+           18000 => 14,
-+           9000  => 15,
-+            4500 => 16,
-+            2250 => 17
-     }
- };
- 
-@@ -331,7 +351,6 @@
-     exit();
- }
- 
--
- # Verify that we have the options that we need 
- pod2usage(1) if (&error_check);
- 
-@@ -417,6 +436,13 @@
-     print "+-----------------------------------------------------------+\n";
-     print "| Landsat Maps are Copyright, .....   |\n";
-     print "| They are free for non commercial use.                     |\n";
-+}elsif ( $mapserver eq 'openstreetmap_tah' ){
-+    print "+-----------------------------------------------------------+\n";
-+    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
-+    print "| project.                                                  |\n";
-+    print "| They are free for use under the terms of the              |\n";
-+    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
-+    print "| license. See http://www.openstreetmap.org for details.    |\n";
- } elsif ( ! $force) {
-     print "You are violating the map servers copyright!\n";
-     print "Are you sure you want to continue? [y|n] ";
-@@ -700,6 +726,11 @@
-     {
- 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
-     } 
-+    elsif ( $mapserver eq 'openstreetmap_tah') 
-+    {	
-+	$filename=~s/\.gif/.png/;
-+	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
-+    } 
-     else 
-     {
- 	print "Unknown map sever :", $mapserver, "\n"; 
-@@ -935,6 +966,37 @@
-     return ($url,$mapscale);
- }
- 
-+#############################################################################
-+sub openstreetmap_tah_url($$$){
-+    my $lati = shift;
-+    my $long = shift;
-+    my $scale = shift;
-+
-+    my $mapscale = $scale;
-+    my $zoom = undef;
-+    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
-+	next unless $s == $scale;
-+	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
-+	$mapscale = $s;
-+	last;
-+    }
-+
-+    unless ( $zoom ) {
-+	print "Error calculating Zoomlevel for Scale: $scale\n";
-+	return (undef,undef);
-+    }
-+
-+    if ($debug) {
-+	print "\n";
-+	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
-+	print "lat: $lati\n";
-+	print "lon: $long\n";
-+    }
-+
-+    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
-+#   print "$url\n";
-+    return ($url,$mapscale);
-+}
- 
- #############################################################################
- sub eniro_url($$$){
-@@ -2284,7 +2346,7 @@
- =item B<--mapserver <MAPSERVER>>
- 
- Mapserver to download from. Default: 'expedia'.
--Currently can use: landsat or expedia.
-+Currently usable: landsat, expedia or openstreetmap_tah.
- 
- geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
- but they are !!!NOT!!!! in the right scale.
-@@ -2294,6 +2356,9 @@
- 
- landsat covers the whole world with satelite Photos
- 
-+openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see 
-+		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
-+
- gov_au is for Australia
- 
- incrementp for japanese Maps
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
deleted file mode 100644
index c51c80931c..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/map_handler.c
-===================================================================
---- aa/src/map_handler.c	(Revision 1699)
-+++ aa/src/map_handler.c	(Revision 1700)
-@@ -660,9 +660,12 @@
-   if (maploaded)
-     gdk_pixbuf_unref (image);
- 
-+#ifdef MAPNIK
-   if ( !strcmp (filename,"mapnik") ) {
- 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
--  } else {
-+  } else 
-+#endif
-+  {
- 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
- 	  if (limage == NULL)
- 	    {
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
deleted file mode 100644
index c8c0fe9c6a..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
---- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
-@@ -14,14 +14,14 @@
- 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
- 	-DLIBDIR=\"${libdir}\" \
- 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
--	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
--	-I/usr/include/ \
--	-I/usr/local/include \
--	-I/opt/boost_1_35/include/boost-1_35 \
--	-I/usr/local/include/freetype2 \
--	-I/usr/include/freetype2 \
-+	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
-+#	-I/usr/include/ \
-+#	-I/usr/local/include \
-+#	-I/opt/boost_1_35/include/boost-1_35 \
-+#	-I/usr/local/include/freetype2 \
-+#	-I/usr/include/freetype2 \
- 	-I. \
--	-L/usr/local/lib
-+#	-L/usr/local/lib
- 
- #	-I/usr/include/dbus-1.0/ 
- 
-diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
---- gpsdrive-2.10pre4.orig/configure	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/configure	2008-01-06 14:49:11.000000000 +0100
-@@ -35950,10 +35950,13 @@
- #  Yep, its ebil, but I does not know better...
- #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
- # default on debian should be: /usr/share/perl5/
--PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
-+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
- #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
--PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
- 
-+# hard code path for OpenEmbedded environment as I don't know a way
-+# to detect it automatically
-+PERL_PACKAGE_DIR="/usr/share/perl5"
- 
- ac_perl_modules="File::Basename "
- # Make sure we have perl
-@@ -37840,11 +37843,11 @@
- #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
- #fi
- 
--if test -f /usr/include/mysql/mysql.h; then
-- CFLAGS="$CFLAGS -I/usr/include/mysql"
--else
-- CFLAGS="$CFLAGS -Imysql"
--fi
-+#if test -f /usr/include/mysql/mysql.h; then
-+# CFLAGS="$CFLAGS -I/usr/include/mysql"
-+#else
-+# CFLAGS="$CFLAGS -Imysql"
-+#fi
- 
- CFLAGS="$CFLAGS $OPT_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
-diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
---- gpsdrive-2.10pre4.orig/configure.ac	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/configure.ac	2008-01-06 14:48:50.000000000 +0100
-@@ -662,9 +662,12 @@
- #  Yep, its ebil, but I does not know better...
- #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
- # default on debian should be: /usr/share/perl5/
--PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
-+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
- #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
--PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+# hard code path for OpenEmbedded environment as I don't know a way
-+# to detect it automatically
-+PERL_PACKAGE_DIR="/usr/share/perl5"
- AC_SUBST(PERL_PACKAGE_DIR)
- 
- AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))
-@@ -719,11 +722,11 @@
- #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') 
- #fi
- 
--if test -f /usr/include/mysql/mysql.h; then
-- CFLAGS="$CFLAGS -I/usr/include/mysql"
--else
-- CFLAGS="$CFLAGS -Imysql"
--fi
-+#if test -f /usr/include/mysql/mysql.h; then
-+# CFLAGS="$CFLAGS -I/usr/include/mysql"
-+#else
-+# CFLAGS="$CFLAGS -Imysql"
-+#fi
- 
- CFLAGS="$CFLAGS $OPT_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
deleted file mode 100644
index 96e8155861..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GPSDrive
-Comment=GPS map software
-Exec=gpsdrive -M pda -1
-Icon=gpsicon
-Terminal=false
-Type=Application
-Categories=Graphics;Network;Geography;Application;Other
-StartupNotify=true
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
deleted file mode 100644
index 102a917c1f..0000000000
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require gpsdrive.inc
-
-DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
-RDEPENDS_${PN} += "libwww-perl"
-
-PR = "r2"
-
-SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
-           file://gpsdrive_2.10pre4.desktop \
-           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
-           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
-           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
-	mkdir -p ${D}${datadir}/pixmaps
-	cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
-        # remove stuff we don't want to package
-        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
-        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
-        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
-}
-
-PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
-
-FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
-FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
-FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"
-FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
-FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
-FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
-FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
+++ b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
index 9534199e78..43b275c67b 100644
--- a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
+++ b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
@@ -1,7 +1,13 @@
-diff -urN hostapd.orig/Makefile hostapd/Makefile
---- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
-+++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
-@@ -6,6 +6,8 @@
+diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile
+--- hostapd-0.5.10.orig/Makefile	2008-02-20 01:08:54.000000000 +0100
++++ hostapd-0.5.10/Makefile	2008-04-28 17:01:36.000000000 +0200
+@@ -1,10 +1,14 @@
++ifndef CC
+ CC=gcc
++endif
+ DIR_WPA_SUPPLICANT=.
+ 
+ ifndef CFLAGS
  CFLAGS = -MMD -O2 -Wall -g
  endif
  
@@ -10,7 +16,7 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile
  # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
  # a file (undefine it, if you want to save in binary size)
  CFLAGS += -DHOSTAPD_DUMP_STATE
-@@ -361,10 +363,10 @@
+@@ -333,10 +337,10 @@
  	fi
  
  install: all
@@ -21,5 +27,5 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile
 -	$(CC) -o hostapd $(OBJS) $(LIBS)
 +	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
  
- OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
- hostapd_cli: $(OBJS_c)
+ driver_conf.c: Makefile .config
+ 	rm -f driver_conf.c
diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init
deleted file mode 100644
index 79f74b681e..0000000000
--- a/packages/hostap/hostap-daemon-0.6.3/init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -x $DAEMON -- $ARGS
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
-	echo "$NAME."
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    reload)
-	echo -n "Reloading $DESC: "
-	killall -HUP $(basename ${DAEMON})
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/packages/hostap/hostap-daemon/init b/packages/hostap/hostap-daemon/init
index ed4c9de1a9..79f74b681e 100644
--- a/packages/hostap/hostap-daemon/init
+++ b/packages/hostap/hostap-daemon/init
@@ -2,7 +2,7 @@
 DAEMON=/usr/sbin/hostapd
 NAME=hostapd
 DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf"
+ARGS="/etc/hostapd.conf -B"
 
 test -f $DAEMON || exit 0
 
@@ -10,25 +10,23 @@ set -e
 
 case "$1" in
     start)
-        echo -n "starting $DESC: $NAME... "
-	start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
-	echo "done."
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
 	;;
     stop)
-        echo -n "stopping $DESC: $NAME... "
-	start-stop-daemon -K -n $NAME
-	echo "done."
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
 	;;
     restart)
-        echo "restarting $DESC: $NAME... "
- 	$0 stop
+	$0 stop
 	$0 start
-	echo "done."
 	;;
     reload)
-    	echo -n "reloading $DESC: $NAME... "
-    	killall -HUP $(basename ${DAEMON})
-	echo "done."
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
 	;;
     *)
 	echo "Usage: $0 {start|stop|restart|reload}"
diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb
deleted file mode 100644
index de3abdbea5..0000000000
--- a/packages/hostap/hostap-daemon_0.5.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require hostap-daemon.inc
-
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.5.10.bb
index 37b710db19..f75efc4a34 100644
--- a/packages/hostap/hostap-daemon_0.6.3.bb
+++ b/packages/hostap/hostap-daemon_0.5.10.bb
@@ -5,14 +5,16 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
 
-DEFAULT_PREFERENCE = "-1"
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
 	file://makefile-cross.diff;patch=1 \
 	file://defconfig \
 	file://init"
 
-S = "${WORKDIR}/hostapd-${PV}/hostapd"
+S = "${WORKDIR}/hostapd-${PV}"
 
 export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
 
@@ -28,7 +30,7 @@ do_configure() {
 }
 
 do_compile() {
-	CFLAGS='${CFLAGS}' CC='${CC}' make
+	make
 }
 
 do_install() {
diff --git a/packages/images/openmoko-qtopia-image.bb b/packages/images/openmoko-qtopia-image.bb
deleted file mode 100644
index 351e17e1d8..0000000000
--- a/packages/images/openmoko-qtopia-image.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-#------------------------------------------------------
-# OpenMoko Qtopia Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-export IMAGE_BASENAME = "${PN}"
-
-IMAGE_INSTALL += "\
-  alsa-state \
-  bluez-hcidump \
-  bluez-utils \
-  task-openmoko-qtopia \
-"
-
-DEPENDS += "\
-  task-openmoko-qtopia \
-"
-
-RDEPENDS = "${PACKAGE_INSTALL}"
-
-LICENSE = MIT
diff --git a/packages/images/openmoko-qtopia-x11-image.bb b/packages/images/openmoko-qtopia-x11-image.bb
deleted file mode 100644
index 3291c53369..0000000000
--- a/packages/images/openmoko-qtopia-x11-image.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#------------------------------------------------------
-# OpenMoko Qtopia/X11 Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-IMAGE_INSTALL += "task-openmoko-qtopia-x11"
diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/multitap-pad/.mtn2git_empty
+++ /dev/null
diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/multitap-pad/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad
deleted file mode 100644
index d2b12ea7cc..0000000000
--- a/packages/multitap-pad/files/80multitappad
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-CMD=""
-
-if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
-    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
-        CMD="multitap-pad -d -o landscape"
-    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
-        CMD="multitap-pad -d -o portrait"
-    fi
-else
-    CMD="multitap-pad -d"
-fi
-
-
-# Delay to make sure the window manager is active
-
-if [ "$CMD" ]; then
-    (sleep 2 && $CMD) &
-fi
diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb
deleted file mode 100644
index 7543a44d72..0000000000
--- a/packages/multitap-pad/multitap-pad_svn.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Multi-tap input method for GTK"
-LICENSE = "GPL"
-DEPENDS = "libfakekey gtk+ matchbox-panel-2"
-RCONFLICTS = matchbox-keyboard-inputmethod
-SECTION = "x11"
-PV = "0.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
-	file://80multitappad"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${PN}"
-
-FILES_${PN} = "${bindir}/* \
-               ${libdir} \
-	       ${sysconfdir} \
-	       ${datadir}"
-
-FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
-                     ${libdir}/matchbox-panel/.debug"
-
-FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
-                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
-		     ${libdir}/matchbox-panel/*.a \
-		     ${libdir}/matchbox-panel/*.la"
-
-do_install_append () {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d/
-	install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
-}
-
-pkg_postinst_multitap-pad () {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm_multitap-pad () {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
deleted file mode 100644
index 8e8af7a086..0000000000
--- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
-DEPENDS = "libnotify"
-RDEPENDS = "openmoko-dialer2"
-PV = "0.0.0+svn${SVNREV}"
-PR = "r0"
-
-inherit openmoko-panel-plugin
diff --git a/packages/openmoko-tools/pty-forward-native.bb b/packages/openmoko-tools/pty-forward-native.bb
deleted file mode 100644
index 972070d6b6..0000000000
--- a/packages/openmoko-tools/pty-forward-native.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE="GPL"
-SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY"
-
-SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
-S = "${WORKDIR}/serial_forward"
-
-inherit native
-
-do_compile() {
-    cd ${S}
-    oe_runmake
-}
-
-do_stage() {
-    :
-}
-
-do_deploy() {
-    install -d ${DEPLOY_DIR_IMAGE}
-    install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward
-}
-
-addtask deploy before do_package after do_install
-
diff --git a/packages/openmoko-tools/serial-forward.bb b/packages/openmoko-tools/serial-forward.bb
deleted file mode 100644
index 3cc33770d6..0000000000
--- a/packages/openmoko-tools/serial-forward.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE="GPL"
-SUMMARY="Forward a serial using TCP/IP"
-
-SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
-S="${WORKDIR}/serial_forward"
-
-do_compile() {
-    cd ${S}
-    oe_runmake
-}
-
-do_install() {
-    install -d ${D}/${bindir}
-    install -m 0755 ${S}/forward ${D}/${bindir}/${PN}
-}
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
deleted file mode 100644
index c6f34f4131..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
-@@ -38,7 +38,7 @@
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
- #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
deleted file mode 100644
index 72c516f5d6..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
-@@ -37,8 +37,8 @@
-         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
--#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb
deleted file mode 100644
index 68fdcbbbe5..0000000000
--- a/packages/perl/libwww-perl-native_5.808.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-
-inherit native
-
-require libwww-perl_${PV}.bb
diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb
deleted file mode 100644
index 2bea48a2d0..0000000000
--- a/packages/perl/libwww-perl_5.808.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
-SECTION = "libs"
-LICENSE = "Artistic"
-DEPENDS = "liburi-perl-native"
-RDEPENDS = "liburi-perl"
-PR = "r1"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
-
-S = "${WORKDIR}/libwww-perl-${PV}"
-
-inherit cpan
diff --git a/packages/qtopia-phone/.mtn2git_empty b/packages/qtopia-phone/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/files/.mtn2git_empty b/packages/qtopia-phone/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf b/packages/qtopia-phone/files/fic-gta01/device-conf
deleted file mode 100644
index f1c3b21f24..0000000000
--- a/packages/qtopia-phone/files/fic-gta01/device-conf
+++ /dev/null
@@ -1,46 +0,0 @@
--arch OE_QT_ARCH
--xplatform OE_QT_XPLATFORM
--verbose
--qtopiamedia
--mediaengines gstreamer
--extra-qtopiacore-config "-qt-mouse-linuxtp"
--extra-qtopiacore-config "-depths 16"
--no-infrared
--dbus
--dbuspath OE_QT_DBUSPATH
--iconsize 22
--displaysize 480x640
--extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
--extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
--extra-qtopiacore-config "-fast" 
--extra-qtopiacore-config "-no-accessibility" 
--extra-qtopiacore-config "-no-cups"
--extra-qtopiacore-config "-no-freetype" 
--extra-qtopiacore-config "-nomake demos" 
--extra-qtopiacore-config "-nomake examples"
--extra-qtopiacore-config "-qt-gfx-linuxfb" 
--extra-qtopiacore-config "-qt-libjpeg" 
--extra-qtopiacore-config "-qt-libmng" 
--extra-qtopiacore-config "-qt-libpng" 
--extra-qtopiacore-config "-qt-mouse-tslib" 
--extra-qtopiacore-config "-qt-zlib" 
--extra-qtopiacore-config "-release" 
--extra-qtopiacore-config "OE_QT_ENDIAN"
--extra-qt-config "-nomake examples" 
--extra-qt-config "-nomake demos" 
--font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
--image OE_QT_RPREFIX
--launch-method quicklaunch
--force-quicklaunch
--no-clean 
--no-drm
--no-qvfb
--no-vpn
--no-sxe
--no-silent
--prefix OE_QT_RPREFIX
--reduce-exports=yes
--release
--confirm-license
-OE_QT_EXTRACONFIG
-
diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf.old b/packages/qtopia-phone/files/fic-gta01/device-conf.old
deleted file mode 100644
index 37a9d1e7de..0000000000
--- a/packages/qtopia-phone/files/fic-gta01/device-conf.old
+++ /dev/null
@@ -1,48 +0,0 @@
--arch OE_QT_ARCH
--xplatform OE_QT_XPLATFORM
--verbose
--qtopiamedia
--mediaengines gstreamer
--extra-qtopiacore-config "-qt-mouse-linuxtp"
--extra-qtopiacore-config "-depths OE_QT_DEPTHS"
--no-infrared
--dbus
--dbuspath OE_QT_DBUSPATH
--iconsize OT_QT_ICONSIZE
--displaysize OE_QT_DISPLAYSIZE
--extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
--extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
--extra-qtopiacore-config "-fast" 
--extra-qtopiacore-config "-no-accessibility" 
--extra-qtopiacore-config "-no-cups"
--extra-qtopiacore-config "-no-freetype" 
--extra-qtopiacore-config "-nomake demos" 
--extra-qtopiacore-config "-nomake examples"
--extra-qtopiacore-config "-qt-gfx-linuxfb" 
--extra-qtopiacore-config "-qt-libjpeg" 
--extra-qtopiacore-config "-qt-libmng" 
--extra-qtopiacore-config "-qt-libpng" 
--extra-qtopiacore-config "-qt-mouse-tslib" 
--extra-qtopiacore-config "-qt-zlib" 
--extra-qtopiacore-config "-release" 
-#-extra-qtopiacore-config "-LOE_QT_LIBDIR" 
-#-extra-qtopiacore-config "-IOE_QT_INCDIR" 
--extra-qtopiacore-config "OE_QT_ENDIAN"
--extra-qt-config "-nomake examples" 
--extra-qt-config "-nomake demos" 
--font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
--image OE_QT_RPREFEX
--launch-method quicklaunch
--force-quicklaunch
--no-clean 
--no-drm
--no-qvfb
--no-vpn
--no-sxe
--no-silent
--prefix OE_QT_RPREFIX
--reduce-exports=yes
--release
--confirm-license
-OE_QT_EXTRACONFIG
-
diff --git a/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
deleted file mode 100644
index c216578d97..0000000000
--- a/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
-**
-** This file is part of the Opensource Edition of the Qtopia Toolkit.
-**
-** This software is licensed under the terms of the GNU General Public
-** License (GPL) version 2.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#include <features.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct stat64
-#define QT_STATBUF4TSTAT        struct stat64
-#define QT_STAT                 ::stat64
-#define QT_FSTAT                ::fstat64
-#define QT_LSTAT                ::lstat64
-#define QT_OPEN                 ::open64
-#define QT_TRUNCATE             ::truncate64
-#define QT_FTRUNCATE            ::ftruncate64
-#define QT_LSEEK                ::lseek64
-#else
-#define QT_STATBUF              struct stat
-#define QT_STATBUF4TSTAT        struct stat
-#define QT_STAT                 ::stat
-#define QT_FSTAT                ::fstat
-#define QT_LSTAT                ::lstat
-#define QT_OPEN                 ::open
-#define QT_TRUNCATE             ::truncate
-#define QT_FTRUNCATE            ::ftruncate
-#define QT_LSEEK                ::lseek
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN                ::fopen64
-#define QT_FSEEK                ::fseeko64
-#define QT_FTELL                ::ftello64
-#define QT_FGETPOS              ::fgetpos64
-#define QT_FSETPOS              ::fsetpos64
-#define QT_FPOS_T               fpos64_t
-#define QT_OFF_T                off64_t
-#else
-#define QT_FOPEN                ::fopen
-#define QT_FSEEK                ::fseek
-#define QT_FTELL                ::ftell
-#define QT_FGETPOS              ::fgetpos
-#define QT_FSETPOS              ::fsetpos
-#define QT_FPOS_T               fpos_t
-#define QT_OFF_T                long
-#endif
-
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_SOCKET_CONNECT	::connect
-#define QT_SOCKET_BIND		::bind
-#define QT_SOCKET_BIND		::bind
-#define QT_FILENO		fileno
-#define QT_CLOSE		::close
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_LARGEFILE       O_LARGEFILE
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
-#endif
-
-#define QT_QLOCALE_USES_FCVT
-
-#endif // QPLATFORMDEFS_H
diff --git a/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf b/packages/qtopia-phone/files/fic-gta02/device-conf
deleted file mode 100644
index f1c3b21f24..0000000000
--- a/packages/qtopia-phone/files/fic-gta02/device-conf
+++ /dev/null
@@ -1,46 +0,0 @@
--arch OE_QT_ARCH
--xplatform OE_QT_XPLATFORM
--verbose
--qtopiamedia
--mediaengines gstreamer
--extra-qtopiacore-config "-qt-mouse-linuxtp"
--extra-qtopiacore-config "-depths 16"
--no-infrared
--dbus
--dbuspath OE_QT_DBUSPATH
--iconsize 22
--displaysize 480x640
--extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
--extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
--extra-qtopiacore-config "-fast" 
--extra-qtopiacore-config "-no-accessibility" 
--extra-qtopiacore-config "-no-cups"
--extra-qtopiacore-config "-no-freetype" 
--extra-qtopiacore-config "-nomake demos" 
--extra-qtopiacore-config "-nomake examples"
--extra-qtopiacore-config "-qt-gfx-linuxfb" 
--extra-qtopiacore-config "-qt-libjpeg" 
--extra-qtopiacore-config "-qt-libmng" 
--extra-qtopiacore-config "-qt-libpng" 
--extra-qtopiacore-config "-qt-mouse-tslib" 
--extra-qtopiacore-config "-qt-zlib" 
--extra-qtopiacore-config "-release" 
--extra-qtopiacore-config "OE_QT_ENDIAN"
--extra-qt-config "-nomake examples" 
--extra-qt-config "-nomake demos" 
--font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
--image OE_QT_RPREFIX
--launch-method quicklaunch
--force-quicklaunch
--no-clean 
--no-drm
--no-qvfb
--no-vpn
--no-sxe
--no-silent
--prefix OE_QT_RPREFIX
--reduce-exports=yes
--release
--confirm-license
-OE_QT_EXTRACONFIG
-
diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf.old b/packages/qtopia-phone/files/fic-gta02/device-conf.old
deleted file mode 100644
index 37a9d1e7de..0000000000
--- a/packages/qtopia-phone/files/fic-gta02/device-conf.old
+++ /dev/null
@@ -1,48 +0,0 @@
--arch OE_QT_ARCH
--xplatform OE_QT_XPLATFORM
--verbose
--qtopiamedia
--mediaengines gstreamer
--extra-qtopiacore-config "-qt-mouse-linuxtp"
--extra-qtopiacore-config "-depths OE_QT_DEPTHS"
--no-infrared
--dbus
--dbuspath OE_QT_DBUSPATH
--iconsize OT_QT_ICONSIZE
--displaysize OE_QT_DISPLAYSIZE
--extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
--extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
--extra-qtopiacore-config "-fast" 
--extra-qtopiacore-config "-no-accessibility" 
--extra-qtopiacore-config "-no-cups"
--extra-qtopiacore-config "-no-freetype" 
--extra-qtopiacore-config "-nomake demos" 
--extra-qtopiacore-config "-nomake examples"
--extra-qtopiacore-config "-qt-gfx-linuxfb" 
--extra-qtopiacore-config "-qt-libjpeg" 
--extra-qtopiacore-config "-qt-libmng" 
--extra-qtopiacore-config "-qt-libpng" 
--extra-qtopiacore-config "-qt-mouse-tslib" 
--extra-qtopiacore-config "-qt-zlib" 
--extra-qtopiacore-config "-release" 
-#-extra-qtopiacore-config "-LOE_QT_LIBDIR" 
-#-extra-qtopiacore-config "-IOE_QT_INCDIR" 
--extra-qtopiacore-config "OE_QT_ENDIAN"
--extra-qt-config "-nomake examples" 
--extra-qt-config "-nomake demos" 
--font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
--image OE_QT_RPREFEX
--launch-method quicklaunch
--force-quicklaunch
--no-clean 
--no-drm
--no-qvfb
--no-vpn
--no-sxe
--no-silent
--prefix OE_QT_RPREFIX
--reduce-exports=yes
--release
--confirm-license
-OE_QT_EXTRACONFIG
-
diff --git a/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
deleted file mode 100644
index c216578d97..0000000000
--- a/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
-**
-** This file is part of the Opensource Edition of the Qtopia Toolkit.
-**
-** This software is licensed under the terms of the GNU General Public
-** License (GPL) version 2.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#include <features.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct stat64
-#define QT_STATBUF4TSTAT        struct stat64
-#define QT_STAT                 ::stat64
-#define QT_FSTAT                ::fstat64
-#define QT_LSTAT                ::lstat64
-#define QT_OPEN                 ::open64
-#define QT_TRUNCATE             ::truncate64
-#define QT_FTRUNCATE            ::ftruncate64
-#define QT_LSEEK                ::lseek64
-#else
-#define QT_STATBUF              struct stat
-#define QT_STATBUF4TSTAT        struct stat
-#define QT_STAT                 ::stat
-#define QT_FSTAT                ::fstat
-#define QT_LSTAT                ::lstat
-#define QT_OPEN                 ::open
-#define QT_TRUNCATE             ::truncate
-#define QT_FTRUNCATE            ::ftruncate
-#define QT_LSEEK                ::lseek
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN                ::fopen64
-#define QT_FSEEK                ::fseeko64
-#define QT_FTELL                ::ftello64
-#define QT_FGETPOS              ::fgetpos64
-#define QT_FSETPOS              ::fsetpos64
-#define QT_FPOS_T               fpos64_t
-#define QT_OFF_T                off64_t
-#else
-#define QT_FOPEN                ::fopen
-#define QT_FSEEK                ::fseek
-#define QT_FTELL                ::ftell
-#define QT_FGETPOS              ::fgetpos
-#define QT_FSETPOS              ::fsetpos
-#define QT_FPOS_T               fpos_t
-#define QT_OFF_T                long
-#endif
-
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_SOCKET_CONNECT	::connect
-#define QT_SOCKET_BIND		::bind
-#define QT_SOCKET_BIND		::bind
-#define QT_FILENO		fileno
-#define QT_CLOSE		::close
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_LARGEFILE       O_LARGEFILE
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
-#endif
-
-#define QT_QLOCALE_USES_FCVT
-
-#endif // QPLATFORMDEFS_H
diff --git a/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty
+++ /dev/null
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
deleted file mode 100644
index c987e2618d..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# xmodmap to allow the soft-menu to work
-xmodmap -e "keycode 180 = 0x11000601"
-xmodmap -e "keycode 181 = 0x11000602"
-xmodmap -e "keycode 182 = 0x11000603"
-xmodmap -e "keycode 183 = 0x11000604"
-xmodmap -e "keycode 184 = 0x11000605"
-xmodmap -e "keycode 185 = 0x11000606"
-xmodmap -e "keycode 186 = 0x11000607"
-xmodmap -e "keycode 187 = 0x11000608"
-xmodmap -e "keycode 188 = 0x11000609"
-xmodmap -e "keycode 189 = 0x1100060A"
-xmodmap -e "keycode 190 = 0x1100060B"
-xmodmap -e "keycode 191 = 0x1100060B"
-xmodmap -e "keycode 192 = 0x1100060A"
-xmodmap -e "keycode 193 = 0x1100060C"
-xmodmap -e "keycode 194 = 0x1100060D"
-xmodmap -e "keycode 195 = 0x1100060E"
-xmodmap -e "keycode 196 = 0x1100060F"
-xmodmap -e "keycode 197 = 0x11000610"
-xmodmap -e "keycode 198 = 0x1008ff26"
-
-# path setup
-export QPEDIR=/opt/Qtopia
-export PATH=$QPEDIR/bin:$PATH
-export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
-
-#tell Qtopia how to inform illume on incoming phone calls
-#export ILLUME_PHONE_CALL=
-export QTOPIA_PHONE_VENDOR=ficgta01
-export QTOPIA_PHONE_MUX=ficgta01
-
-
-# Now start Qtopia
-qpe &
diff --git a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
deleted file mode 100644
index b28001d016..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export QPEDIR=/opt/Qtopia
-export PATH=$PATH:$QPEDIR/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib
diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
deleted file mode 100644
index f200c1682f..0000000000
--- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
+++ /dev/null
@@ -1,123 +0,0 @@
-# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
-# distribution.
-#
-# Please DO NOT merge this file into OE, it is not suitable for that yet as
-# it compiles both native and target binaries. This requires stuff to be
-# installed on the host which is against the aim of OE.
-
-DESCRIPTION = "Qtopia OpenSource"
-SECTION = "qtopia-phone"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
-PROVIDES = "qtopia-phone"
-PR = "r8"
-SRCREV = "${AUTOREV}"
-SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
-           file://Xsession.d/89qtopia \
-           file://qtopia.sh"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig
-
-TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"
-
-require qtopia-phone_arch.inc
-
-QT_ARCH = "${@qtopia_arch(d)}"
-QT_ENDIAN = "${@qtopia_endian(d)}"
-PLATFORM = "${BUILD_OS}-g++"
-BUILDDIR = "${WORKDIR}/build"
-OE_QT_PREFIX = "/opt/Qtopia"
-
-export OE_QMAKE_CC="${CC}"
-export OE_QMAKE_CFLAGS="${CFLAGS}"
-export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-export OE_QMAKE_AR="${AR}"
-export OE_QMAKE_STRIP="echo"
-export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-
-do_configure() {
-
-# This qmake some how does not honor env var, let us fix it by sed force
-sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g       ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g   ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g            ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g     ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
-
-
-unset CC
-unset CXX
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
-
-
-mkdir -p ${BUILDDIR}
-cd ${BUILDDIR}
-echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \
-                          -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \
-                           -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0
-
-}
-
-do_compile() {
-    cd ${BUILDDIR}
-    oe_runmake
-}
-
-do_stage() {
-}
-
-
-do_install() {
-   cd ${BUILDDIR}
-   oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX}
-
-   # Install freedesktop.org .desktop files for enlightenment
-   install -d ${D}${datadir}/applications
-   for app in "${S}/apps-fdo/"*; do
-     for file in "$app"/*.desktop; do
-        install -m 0644 $file ${D}${datadir}/applications/
-     done
-   done 
-
-   # Install good icons for the desktop files
-
-   # Make sure qpe gets launched by X
-   install -d ${D}/${sysconfdir}/X11/Xsession.d
-   install -m 0755 ${WORKDIR}/Xsession.d/89qtopia ${D}${sysconfdir}/X11/Xsession.d/
-
-   # Install some scripts
-   install -d ${D}${bindir}
-   install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
-
-   install -d ${D}${sysconfdir}/profile.d/
-   install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
-}
-
-FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \
-                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
-                ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
-                ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
-                ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
-                ${OE_QT_PREFIX}/services"
-
-FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \
-                    ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ "
-
-FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so"
-
diff --git a/packages/qtopia-phone/qtopia-phone.inc b/packages/qtopia-phone/qtopia-phone.inc
deleted file mode 100644
index ed6e153559..0000000000
--- a/packages/qtopia-phone/qtopia-phone.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
-# distribution.
-#
-# Please DO NOT merge this file into OE, it is not suitable for that yet as
-# it compiles both native and target binaries. This requires stuff to be
-# installed on the host which is against the aim of OE.
-
-DESCRIPTION = "Qtopia OpenSource"
-SECTION = "qtopia-phone"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus tslib gstreamer"
-PROVIDES = "qtopia-phone"
-PR = "r1"
-SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \
-           file://device-conf \
-           file://qplatformdefs.h"
-
-S = "${WORKDIR}/qtopia-opensource-${PV}"
-
-inherit pkgconfig update-rc.d
-
-TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
-TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
-
-INITSCRIPT_NAME = "qpe"
-INITSCRIPT_PARAMS = "defaults 98"
-
-export QTOPIA_DEPOT_PATH = "${S}"
-
-require qtopia-phone_arch.inc
-
-QT_ARCH = "${@qtopia_arch(d)}"
-QT_ENDIAN = "${@qtopia_endian(d)}"
-PLATFORM = "${BUILD_OS}-g++"
-XPLATFORM = "linux-oe-g++"
-BUILDDIR = "${WORKDIR}/build"
-
-OE_QT_DBUSPATH = "${STAGING_DIR_HOST}"
-OE_QT_ARCH = "${QT_ARCH}"
-OE_QT_XPLATFORM = "${XPLATFORM}"
-OE_QT_LIBDIR = "${STAGING_LIBDIR}"
-OE_QT_INCDIR = "${STAGING_INCDIR}"
-OE_QT_RPREFIX = "/opt/Qtopia"
-OE_QT_ENDIAN = "${QT_ENDIAN}"
-OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0"
-
-do_configure() {
-
-unset CC
-unset CXX
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
-
-mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
-install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \
-    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
-install -m 644 ${WORKDIR}/qplatformdefs.h \
-    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
-sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
-sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
-
-# sed the dynamic config into the file
-sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf
-sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf
-
-rm -f ${S}/devices/${TARGET-DEVICE}/configure
-cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure
-rm -f ${S}/devices/${TARGET-DEVICE}/environment
-echo "" > ${S}/devices/${TARGET-DEVICE}/environment
-
-mkdir -p ${BUILDDIR}
-cd ${BUILDDIR}
-echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM}
-
-}
-
-do_compile() {
-    cd ${BUILDDIR}
-    oe_runmake
-}
-
-do_stage() {
-}
-
-
-do_install() {
-   cd ${BUILDDIR}
-   oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
-   install -d ${D}${sysconfdir}/init.d
-   install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe
-
-}
-
-FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help  \
-                ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \
-                ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \
-                ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \
-                ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \
-                ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts"
-
-FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so"
-
diff --git a/packages/qtopia-phone/qtopia-phone_4.3.0.bb b/packages/qtopia-phone/qtopia-phone_4.3.0.bb
deleted file mode 100644
index ca6978b952..0000000000
--- a/packages/qtopia-phone/qtopia-phone_4.3.0.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qtopia-phone.inc
diff --git a/packages/qtopia-phone/qtopia-phone_4.3.1.bb b/packages/qtopia-phone/qtopia-phone_4.3.1.bb
deleted file mode 100644
index ca6978b952..0000000000
--- a/packages/qtopia-phone/qtopia-phone_4.3.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qtopia-phone.inc
diff --git a/packages/qtopia-phone/qtopia-phone_arch.inc b/packages/qtopia-phone/qtopia-phone_arch.inc
deleted file mode 100644
index 84f0e51d01..0000000000
--- a/packages/qtopia-phone/qtopia-phone_arch.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit siteinfo
-
-def qtopia_arch(d):
-    import bb, re
-    arch = bb.data.getVar('TARGET_ARCH', d, 1)
-    if re.match("^i.86$", arch):
-        arch = "i386"
-    elif re.match("^arm.*", arch):
-        arch = "arm"
-    elif arch == "x86_64":
-        arch = "x86"
-    elif arch == "mipsel":
-        arch = "mips"
-    return arch
-
-def qtopia_endian(d):
-    import bb
-    if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
-        return "-little-endian"
-    elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
-        return "-big-endian"
-    else:
-        assert False
diff --git a/packages/tasks/task-openmoko-qtopia-x11.bb b/packages/tasks/task-openmoko-qtopia-x11.bb
deleted file mode 100644
index 801e0e4ea5..0000000000
--- a/packages/tasks/task-openmoko-qtopia-x11.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
-SECTION = "openmoko/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-LICENSE = "MIT"
-PR = "r46"
-
-inherit task
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
-PACKAGES = "task-openmoko-qtopia-x11"
-
-#
-# task-openmoko-qtopia-x11
-#
-DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
-RDEPENDS_task-openmoko-qtopia-x11 = "\
-  alsa-state \
-  bluez-hcidump \
-  readline \
-  qtopia-phone-x11 \
-  e-wm \
-  illume \
-  ${XSERVER} \
-  xserver-kdrive-common \
-  xserver-nodm-init \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-  neod \
-  libnotify \
-"
-
diff --git a/packages/tasks/task-openmoko-qtopia.bb b/packages/tasks/task-openmoko-qtopia.bb
deleted file mode 100644
index 6179bae8e6..0000000000
--- a/packages/tasks/task-openmoko-qtopia.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
-SECTION = "openmoko/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
-LICENSE = "MIT"
-PR = "r45"
-
-PACKAGES = "task-openmoko-qtopia"
-
-#
-# task-openmoko-qtopia
-#
-DESCRIPTION_task-openmoko-qtopia = "OpenMoko: The Qtopia based native User Interface"
-RDEPENDS_task-openmoko-qtopia = "\
-  alsa-state \
-  bluez-hcidump \
-  readline \
-  gstreamer \
-  bootchart \
-  qtopia-phone \
-"
-