summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch128
-rw-r--r--packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch18
-rw-r--r--packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch96
-rw-r--r--packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop10
-rw-r--r--packages/gpsdrive/gpsdrive_2.10pre4.bb33
-rw-r--r--packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty (renamed from packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty)0
-rw-r--r--packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff (renamed from packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff)20
-rw-r--r--packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty0
-rw-r--r--packages/hostap/hostap-daemon-0.6.3/init37
-rw-r--r--packages/hostap/hostap-daemon/init24
-rw-r--r--packages/hostap/hostap-daemon_0.5.1.bb5
-rw-r--r--packages/hostap/hostap-daemon_0.5.10.bb (renamed from packages/hostap/hostap-daemon_0.6.3.bb)8
-rw-r--r--packages/images/openmoko-qtopia-image.bb22
-rw-r--r--packages/images/openmoko-qtopia-x11-image.bb7
-rw-r--r--packages/multitap-pad/.mtn2git_empty0
-rw-r--r--packages/multitap-pad/files/.mtn2git_empty0
-rw-r--r--packages/multitap-pad/files/80multitappad20
-rw-r--r--packages/multitap-pad/multitap-pad_svn.bb47
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb7
-rw-r--r--packages/openmoko-tools/pty-forward-native.bb24
-rw-r--r--packages/openmoko-tools/serial-forward.bb15
-rw-r--r--packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch13
-rw-r--r--packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty0
-rw-r--r--packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch15
-rw-r--r--packages/perl/libwww-perl-native_5.808.bb5
-rw-r--r--packages/perl/libwww-perl_5.808.bb12
-rw-r--r--packages/qtopia-phone/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta01/device-conf46
-rw-r--r--packages/qtopia-phone/files/fic-gta01/device-conf.old48
-rw-r--r--packages/qtopia-phone/files/fic-gta01/qplatformdefs.h146
-rw-r--r--packages/qtopia-phone/files/fic-gta02/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta02/device-conf46
-rw-r--r--packages/qtopia-phone/files/fic-gta02/device-conf.old48
-rw-r--r--packages/qtopia-phone/files/fic-gta02/qplatformdefs.h146
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia36
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/qtopia.sh4
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb123
-rw-r--r--packages/qtopia-phone/qtopia-phone.inc114
-rw-r--r--packages/qtopia-phone/qtopia-phone_4.3.0.bb1
-rw-r--r--packages/qtopia-phone/qtopia-phone_4.3.1.bb1
-rw-r--r--packages/qtopia-phone/qtopia-phone_arch.inc23
-rw-r--r--packages/tasks/task-openmoko-qtopia-x11.bb35
-rw-r--r--packages/tasks/task-openmoko-qtopia.bb22
49 files changed, 29 insertions, 1376 deletions
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/