aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
committerRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
commit182573fdba68b6fe20942ac93ded46909663e37b (patch)
treec841a01aff4ff23f46f47cb1f78bc17fffec1bac
parent4148cabf119303c0a6ceddd4d8c4ed2abb669cc9 (diff)
downloadopenembedded-182573fdba68b6fe20942ac93ded46909663e37b.tar.gz
openembedded-182573fdba68b6fe20942ac93ded46909663e37b.tar.bz2
openembedded-182573fdba68b6fe20942ac93ded46909663e37b.zip
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/01/14 06:05:21-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/13 15:05:24-06:00 ti.com!kergoth Import '[PATCH] more trailing spaces and missing quotes' from Marc Singer. 2005/01/13 15:02:51-06:00 ti.com!kergoth Add a /etc/network/interfaces file for coLinux. 2005/01/13 13:24:50-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 13:24:42-06:00 ti.com!kergoth Fix btxml and devmem2 to stop working around the do_unpack bug I just fixed. 2005/01/13 18:33:04+00:00 cambridgebroadband.com!rjt Merge oe-devel@oe-devel.bkbits.net:openembedded into flotta.cambridgebroadband.com:/development/openembedded/openembedded 2005/01/13 13:14:19-06:00 ti.com!kergoth Add lemon, an LALR(1) parser generator. 2005/01/13 13:09:04-06:00 ti.com!kergoth BUGFIX in do_unpack: only create a relative directory structure in WORKDIR when unpacking using cp if the type is file:// (FILESPATH handling). 2005/01/13 12:30:36-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 18:29:26+00:00 cambridgebroadband.com!rjt update PR on openzaurus-pxa 2005/01/13 12:27:56-06:00 ti.com!kergoth Update klibc to 0.190, the latest stable version. 2005/01/13 18:11:50+00:00 cambridgebroadband.com!rjt make select work on the apm device for tosa,corgi,poodle and related archictectures 2005/01/13 09:10:02+01:00 hrw.one.pl!hrw justreader: fix Settings file location (fix #204) 2005/01/13 00:32:44+00:00 rpsys.net!RP Fix after merge 2005/01/13 00:26:37+00:00 rpsys.net!RP Merge 2005/01/13 00:23:32+00:00 rpsys.net!RP openzaurus-2.6: Switch to 2.6.11-rc1. Remove patches now merged upstream (8 of them). Add patches to fix upstream bug (reported). Improve MMC driver. 2005/01/12 23:02:21+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/12 23:02:08+00:00 nexus.co.uk!pb fix some postinst/postrm issues in module-init-tools 2005/01/12 23:52:41+01:00 uni-frankfurt.de!mickeyl make the check and the WARNING also work for kernel 2.6.x 2005/01/12 20:32:37+01:00 uni-frankfurt.de!mickeyl improve readme for prism3-firmware 2005/01/12 20:03:32+01:00 uni-frankfurt.de!mickeyl fix qte crashing right after calibration (again). patch courtesy qte-uberhacker Holger 'Zecke' Freyther 2005/01/12 18:42:20+01:00 (none)!br1 added package yamonenv (inside nylon/): read any write yamon environment 2005/01/12 16:40:38+01:00 uni-frankfurt.de!mickeyl add wireless tools v27 2005/01/12 16:05:25+01:00 uni-frankfurt.de!mickeyl upgrade bison to 2.0 2005/01/12 16:04:20+01:00 uni-frankfurt.de!mickeyl use pregenerated yacc files in kgrog. still nonworky though 2005/01/12 12:35:05+01:00 uni-frankfurt.de!mickeyl pcmcia-cs: don't ship config.opts on arm machines 2005/01/12 11:51:05+01:00 uni-frankfurt.de!mickeyl CONFIG_FEATURE_IFUPDOWN_MAPPING=y in busybox defconfig. This adds just 3K but is very useful 2005/01/12 10:27:23+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 10:26:59+01:00 hrw.one.pl!hrw changed tremor SRC_URI to fetch from svn via http 2005/01/12 08:26:26+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/12 08:26:12+00:00 rpsys.net!RP openzaurus-2.6: Update corgi after pushing code upstream 2005/01/12 00:12:52+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 00:12:18+01:00 hrw.one.pl!hrw updated kdepimpi to 1.9.16 (also added their fork of gammu) 2005/01/11 23:46:19+01:00 uni-frankfurt.de!mickeyl ipkg-utils has been fixed upstream 2005/01/11 23:39:28+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 17:09:51-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 17:09:37-06:00 ti.com!kergoth Add OpenNTPD, a free NTP implementation from the OpenBSD guys. 2005/01/11 23:39:20+01:00 uni-frankfurt.de!mickeyl opie: use Transformed:Rot0 instead of LinuxFb for kernel 2.6 2005/01/11 21:36:12+01:00 uni-frankfurt.de!mickeyl ship libopie2 examples in libopie2_cvs 2005/01/11 21:30:53+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 21:30:43+01:00 uni-frankfurt.de!mickeyl machine.confs: catchup with changes in orinoco package granularity 2005/01/11 20:24:29+00:00 nexus.co.uk!pb remove spurious DEPENDS 2005/01/11 20:58:09+01:00 uni-frankfurt.de!mickeyl orinoco-modules: use KERNEL_OBJECT_SUFFIX and increase package granularity 2005/01/11 20:37:02+01:00 uni-frankfurt.de!mickeyl hostap-modules: use KERNEL_OBJECT_SUFFIX to make it work w/ old and new kernels 2005/01/11 20:21:51+01:00 uni-frankfurt.de!mickeyl set KERNEL_OBJECT_SUFFIX to .ko on 2.6 kernels and .o for earlier kernels 2005/01/11 16:57:01+00:00 rpsys.net!RP openzaurus-2.6: update patch order. Add MMC and SD support 2005/01/11 16:59:54+01:00 (none)!br1 /bin/sh update-alternative calls have to be done in prerm not postrm 2005/01/11 10:22:15-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 10:22:07-06:00 ti.com!kergoth Add fnmatch test result to some arm*linux* site files. 2005/01/11 12:05:37+01:00 (none)!br1 added "dash" shell 2005/01/10 20:20:01-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 20:19:53-06:00 ti.com!kergoth Add OpenCVS from cvs. 2005/01/10 23:26:51+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/10 16:34:16-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 16:34:07-06:00 ti.com!kergoth Fix unionfs 1.0.6 make.patch. 2005/01/10 23:26:28+01:00 uni-frankfurt.de!mickeyl it's irk-targus and irk-belkin, not irk-0.11.0 and irk-0.11.1 :( 2005/01/10 20:54:21+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/10 14:40:45-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 14:40:33-06:00 ti.com!kergoth Add didiwiki 0.5. 2005/01/10 20:54:06+01:00 hrw.one.pl!hrw added KGrok into nonworking (I dont know how to fix it's usage of yacc) 2005/01/10 18:52:01+01:00 (none)!koen add matchbox-desktop_svn 2005/01/10 18:42:31+01:00 (none)!koen add matchbox_panel_svn 2005/01/10 18:28:27+01:00 (none)!koen add matchbox-wm_svn 2005/01/10 18:09:30+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 18:09:12+01:00 (none)!koen add libmatchbox_svn 2005/01/10 17:38:04+01:00 uni-frankfurt.de!mickeyl add some extra depends for openzaurus-pxa-2.6 2005/01/10 17:30:19+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 17:29:57+01:00 (none)!koen delete unneeded patches for faad2 2005/01/10 17:27:22+01:00 (none)!koen libgpevtype 0.6 in familiar-0.8.0.conf 2005/01/10 14:08:45+01:00 mn-solutions.de!schurig removed cruft 2005/01/10 13:09:37+01:00 (none)!koen don't set PREFERRED_VERSION for gtk+ and bluetooth/dbus in familiar-0.8.1.conf 2005/01/09 20:24:58+00:00 nexus.co.uk!pb add dependency on xpm 2005/01/09 20:22:42+00:00 nexus.co.uk!pb add gnocky 2005/01/09 20:21:04+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 20:20:54+00:00 nexus.co.uk!pb add staging to gnokii 2005/01/09 20:19:35+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 20:18:32+00:00 rpsys.net!RP openzaurus-2.6: Update and use changes to SSP made in 2.6 bk tree (imported by ssp.patch) 2005/01/09 21:12:14+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 21:11:58+01:00 uni-frankfurt.de!mickeyl remove bogus stuff in opie-keytabs 2005/01/09 19:59:57+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 19:59:40+00:00 nexus.co.uk!pb add gnokii 2005/01/09 18:45:34+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 18:45:18+01:00 uni-frankfurt.de!mickeyl openzaurus 3.5.3.conf: use opie-cvs for now 2005/01/09 17:27:13+00:00 nexus.co.uk!pb add missing file 2005/01/09 17:21:59+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 17:21:42+00:00 nexus.co.uk!pb demote pciutils and usbutils from Recommends to Suggests in hotplug 2005/01/09 18:11:18+01:00 handhelds.org!CoreDump Remove ressource.patch from libqpe-opie_1.1.8 as it has been applied upstream 2005/01/09 17:01:46+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 17:01:32+00:00 rpsys.net!RP openzaurus-2.6: changes to help push patches upstream. Break poodle for now... 2005/01/09 17:00:18+00:00 rpsys.net!RP openzaurus-2.6: changes to patches to assist with pushing upstream. Break poodle for now :-/ 2005/01/09 16:07:24+01:00 dyndns.org!reenoo rosetta: it's pkg_postinst, not do_postinst 2005/01/09 14:24:35+00:00 nexus.co.uk!pb update libgpevtype to 0.6 2005/01/09 14:03:18+00:00 nexus.co.uk!pb update gtk+ to 2.6.1 2005/01/09 14:02:36+00:00 nexus.co.uk!pb update glib-2.0 to 2.6.1 2005/01/09 14:01:31+00:00 nexus.co.uk!pb remove some extraneous gtk+ patches 2005/01/09 14:00:43+00:00 nexus.co.uk!pb second attempt at fixing gpe-bluetooth dbus naming problems 2005/01/09 14:57:37+01:00 dyndns.org!reenoo sysvinit: use update-alternatives.bbclass. put PACKAGES/FILES related things in a single place. 2005/01/09 00:47:25+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:46:13+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:42:35+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to add usbf and bnep0 entries to interfaces file use CONFFILES for netbase under all DISTROs, not just nylon 2005/01/09 00:38:50+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to fix usbnet hotplug on iPAQ 2005/01/09 00:29:52+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 00:29:41+00:00 nexus.co.uk!pb apply patch from Marc Singer to correct typo in gpe-package 2005/01/08 15:16:29-08:00 (none)!emte Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into t.(none):/home/OE/speedracer/packages 2005/01/08 15:14:54-08:00 (none)!emte removed kbdd-patched 2005/01/08 16:49:42-05:00 handhelds.org!kergoth Add unionfs 1.0.6. 2005/01/08 20:14:46+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/08 20:14:26+00:00 nexus.co.uk!pb remove figment from gpe base set due to libxml2 dependency 2005/01/08 18:46:11+00:00 rpsys.net!RP openzaurus-2.6: corgi updates: make MAGIC_SYSRQ work + fix reboot bug. w100fb updates for mainline acceptance. 2005/01/08 18:01:30+00:00 nexus.co.uk!pb apply patch from Bob Davies to remove kismet from meta-sectest-gpe 2005/01/08 18:37:36+01:00 hrw.one.pl!hrw added description to librsvg 2005/01/08 18:37:12+01:00 hrw.one.pl!hrw added description to libart-lgpl 2005/01/08 18:36:26+01:00 hrw.one.pl!hrw added description to esound 2005/01/08 18:13:19+01:00 hrw.one.pl!hrw fixed description for Busybox 2005/01/08 18:04:49+01:00 hrw.one.pl!hrw added description to atd BKrev: 41e7d1ednFJIdPS8nrzP9S2cq5B_1A
-rw-r--r--classes/base.bbclass7
-rw-r--r--classes/module-base.bbclass1
-rw-r--r--conf/distro/familiar-0.8.1.conf12
-rw-r--r--conf/distro/openmnci.conf285
-rw-r--r--conf/distro/openzaurus-3.5.3.conf5
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/ipaq-common.conf2
-rw-r--r--conf/machine/openzaurus-pxa-2.6.conf6
-rw-r--r--conf/machine/poodle.conf2
-rw-r--r--conf/machine/ramses.conf1
-rw-r--r--conf/machine/simpad.conf2
-rw-r--r--conf/machine/tosa.conf2
-rw-r--r--packages/atd/atd_0.70.bb23
-rw-r--r--packages/bash/bash_2.05b.bb26
-rw-r--r--packages/bash/bash_3.0.bb41
-rw-r--r--packages/bison/bison-2.0/m4.patch (renamed from packages/bison/bison-1.875/m4.patch)0
-rw-r--r--packages/bison/bison-native_2.0.bb (renamed from packages/bison/bison-native_1.875.bb)0
-rw-r--r--packages/bison/bison_2.0.bb (renamed from packages/bison/bison_1.875.bb)0
-rw-r--r--packages/bl/bl_cvs.bb26
-rw-r--r--packages/btxml/btxml.bb19
-rw-r--r--packages/busybox/busybox-1.00/defconfig475
-rw-r--r--packages/busybox/busybox_1.00.bb7
-rw-r--r--packages/busybox/slingbox_1.00.bb44
-rw-r--r--packages/dash/dash_0.5.1.bb (renamed from packages/faad2/faad2-2.0/Makefile-dos.patch)0
-rw-r--r--packages/dash/files/makefile-build-cc.diff (renamed from packages/faad2/faad2-2.0/Makefile2.patch)0
-rw-r--r--packages/devmem2/devmem2.bb13
-rw-r--r--packages/didiwiki/didiwiki.inc (renamed from packages/gtk+/gtk+-2.4.13/my-documents.patch)0
-rw-r--r--packages/didiwiki/didiwiki_0.2.bb1
-rw-r--r--packages/didiwiki/didiwiki_0.4.bb1
-rw-r--r--packages/didiwiki/didiwiki_0.5.bb (renamed from packages/gtk+/gtk+-2.6.0/my-documents.patch)0
-rw-r--r--packages/esound/esound-gpe_20020817.bb31
-rw-r--r--packages/glib-2.0/glib-2.0-native_2.6.1.bb (renamed from packages/irk/irk_0.11.0.bb)0
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.1.bb (renamed from packages/irk/irk_0.11.1.bb)0
-rw-r--r--packages/gnocky/gnocky_0.0.3.bb (renamed from packages/kbdd/kbdd-patched-20040904/kbdd.default)0
-rw-r--r--packages/gnokii/gnokii/configure.patch (renamed from packages/kbdd/kbdd-patched-20040904/kbdd.init)0
-rw-r--r--packages/gnokii/gnokii_0.6.4.bb (renamed from packages/kbdd/kbdd-patched-20040904/snapntype.patch)0
-rw-r--r--packages/gnome/libart-lgpl_2.3.16.bb29
-rw-r--r--packages/gnumeric/gnumeric_1.3.1.cvs.bb30
-rw-r--r--packages/gpe-beam/gpe-beam_0.2.3.bb2
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch47
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.37.bb2
-rw-r--r--packages/gpe-package/gpe-package_0.0.12.bb5
-rw-r--r--packages/gtk+/gtk+-2.6.1/automake-lossage.patch (renamed from packages/kbdd/kbdd-patched-20040904/stowaway-fellowes-apm.patch)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/disable-tooltips.patch (renamed from packages/kdepimpi/files/manager.h.patch)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/error-dialog.patch (renamed from packages/kdepimpi/kdepimpi_1.9.15.bb)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/gtk+-handhelds.patch (renamed from packages/libqpe/libqpe-opie/resource.patch)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/gtklabel-resize-patch (renamed from packages/linux/openzaurus-2.6.10/defconfig-collie)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/hardcoded_libtool.patch (renamed from packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/menu-deactivate.patch (renamed from packages/linux/openzaurus-2.6.10/defconfig-poodle)0
-rw-r--r--packages/gtk+/gtk+-2.6.1/no-demos.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/no-xwc.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/scroll-timings.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/single-click.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/small-gtkfilesel.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/spinbutton.patch0
-rw-r--r--packages/gtk+/gtk+-2.6.1/xsettings.patch0
-rw-r--r--packages/gtk+/gtk+_2.6.1.bb0
-rw-r--r--packages/hostap/hostap-modules_0.1.3.bb8
-rw-r--r--packages/hostap/hostap-modules_0.2.0.bb25
-rw-r--r--packages/hostap/hostap-modules_0.2.6.bb10
-rw-r--r--packages/hostap/hostap-modules_0.3.3.bb12
-rw-r--r--packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch0
-rw-r--r--packages/hotplug/hotplug_20040920.bb5
-rw-r--r--packages/initscripts/initscripts_1.0.bb8
-rw-r--r--packages/ipkg-utils/ipkg-utils_1.6cvs.bb3
-rw-r--r--packages/ipkg/ipkg-collateral.bb21
-rw-r--r--packages/irk/irk_0.11-belkin.bb0
-rw-r--r--packages/irk/irk_0.11-targus.bb0
-rw-r--r--packages/justreader/files/correct-settings-path.patch0
-rw-r--r--packages/kbdd/kbdd-patched_20040904.bb66
-rw-r--r--packages/kdepimpi/files/qinputdialog_inc.patch49
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc131
-rw-r--r--packages/kdepimpi/kdepimpi_1.9.16.bb0
-rw-r--r--packages/kdepimpi/kdepimpi_cvs.bb2
-rw-r--r--packages/keyring/keyring_0.6.8.bb36
-rw-r--r--packages/klibc/klibc.inc0
-rw-r--r--packages/klibc/klibc_0.157.bb34
-rw-r--r--packages/klibc/klibc_0.190.bb0
-rw-r--r--packages/lemon/lemon-native.bb0
-rw-r--r--packages/lemon/lemon.bb0
-rw-r--r--packages/lemon/lemon.inc0
-rw-r--r--packages/libgpevtype/libgpevtype_0.6.bb0
-rw-r--r--packages/libmatchbox/libmatchbox_svn.bb0
-rw-r--r--packages/libopie/libopie2_cvs.bb6
-rw-r--r--packages/libopietooth/libopietooth1_1.1.8.bb24
-rw-r--r--packages/libqpe/libqpe-opie_1.1.8.bb4
-rw-r--r--packages/librsvg/librsvg_2.6.5.bb3
-rw-r--r--packages/libxine/libxine-opie_1.0.0-rc7.bb98
-rw-r--r--packages/libxine/libxine_1.0.0-rc7.bb108
-rw-r--r--packages/linux/openzaurus-2.6.10/defconfig-husky917
-rw-r--r--packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch0
-rw-r--r--packages/linux/openzaurus-2.6.11-rc1/defconfig-collie0
-rw-r--r--packages/linux/openzaurus-2.6.11-rc1/defconfig-husky0
-rw-r--r--packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.60
-rw-r--r--packages/linux/openzaurus-2.6.11-rc1/defconfig-poodle0
-rw-r--r--packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/fix_tosa_apm.patch0
-rw-r--r--packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb11
-rw-r--r--packages/linux/openzaurus_2.6.10.bb125
-rw-r--r--packages/linux/openzaurus_2.6.11-rc1.bb0
-rw-r--r--packages/lxt/lxt_1.0.bb16
-rw-r--r--packages/matchbox-desktop/matchbox-desktop_svn.bb0
-rw-r--r--packages/matchbox-panel/matchbox-panel_svn.bb0
-rw-r--r--packages/matchbox-wm/matchbox-wm_svn.bb0
-rw-r--r--packages/mbmerlin/mbmerlin_0.8.1-2.bb18
-rw-r--r--packages/meta/gpe-image.bb10
-rw-r--r--packages/meta/meta-gpe.bb5
-rw-r--r--packages/meta/meta-opie.bb2
-rw-r--r--packages/meta/meta-sectest-gpe.bb4
-rw-r--r--packages/meta/nylon-feed.bb2
-rw-r--r--packages/meta/nylon-image-base.bb2
-rw-r--r--packages/meta/nylon-image-standard.bb2
-rw-r--r--packages/misc-binary-only/prism3-firmware_1.8.3.bb24
-rw-r--r--packages/module-init-tools/module-init-tools_3.1-pre5.bb6
-rw-r--r--packages/netbase/netbase/colinux/interfaces0
-rw-r--r--packages/netbase/netbase/interfaces6
-rw-r--r--packages/netbase/netbase_4.19.bb4
-rw-r--r--packages/nonworking/kgrok/files/mediabutton.patch0
-rw-r--r--packages/nonworking/kgrok/files/parser_yacc.cpp0
-rw-r--r--packages/nonworking/kgrok/files/parser_yacc.h0
-rw-r--r--packages/nonworking/kgrok/kgrok_1.5.bb0
-rw-r--r--packages/nylon/yamonenv.bb0
-rw-r--r--packages/opencvs/files/linux.patch0
-rw-r--r--packages/opencvs/opencvs_cvs.bb0
-rw-r--r--packages/openntpd/files/autofoo.patch0
-rw-r--r--packages/openntpd/openntpd_3.6.1p1.bb0
-rw-r--r--packages/opie-i18n/opie-i18n_1.1.8.bb67
-rw-r--r--packages/opie-keytabs/opie-keytabs_1.1.8.bb18
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb4
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_0.2.bb2
-rw-r--r--packages/opie-sounds/opie-sounds_1.1.8.bb21
-rw-r--r--packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie89
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.1.8.bb133
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
-rw-r--r--packages/orinoco/orinoco-modules_0.13e.bb34
-rw-r--r--packages/orinoco/orinoco-modules_0.15rc1.bb46
-rw-r--r--packages/orinoco/orinoco-modules_0.15rc2.bb23
-rw-r--r--packages/orinoco/orinoco-modules_20050101.bb51
-rw-r--r--packages/pcmcia-cs/pcmcia-cs_3.2.8.bb15
-rw-r--r--packages/portabase/metakit_2.4.9.3.bb2
-rw-r--r--packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch0
-rw-r--r--packages/qte/qte_2.3.9-snapshot.bb3
-rw-r--r--packages/rdesktop/rdesktop_cvs.bb16
-rw-r--r--packages/rosetta/rosetta_cvs.bb4
-rw-r--r--packages/sysvinit/sysvinit_2.86.bb27
-rw-r--r--packages/tremor/tremor_20021126.bb27
-rw-r--r--packages/tremor/tremor_20041119.bb28
-rw-r--r--packages/tremor/tremor_svn.bb29
-rw-r--r--packages/unionfs/unionfs-1.0.6/make.patch0
-rw-r--r--packages/unionfs/unionfs-modules_1.0.6.bb0
-rw-r--r--packages/unionfs/unionfs-utils_1.0.6.bb0
-rw-r--r--packages/unionfs/unionfs_1.0.6.inc0
-rw-r--r--packages/wireless-tools/wireless-tools_27.bb0
-rw-r--r--packages/zroadmap/zroadmap_1.0.8.bb42
-rw-r--r--site/arm-linux3
-rw-r--r--site/arm-linux-uclibc4
-rw-r--r--site/armeb-linux3
-rw-r--r--site/armeb-linux-uclibc3
157 files changed, 2070 insertions, 1582 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index e94e331fb4..c5b7ede8d0 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -361,7 +361,12 @@ def oe_unpack_file(file, data, url = None):
else:
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
if not 'patch' in parm:
- destdir = bb.decodeurl(url)[1] or "."
+ # The "destdir" handling was specifically done for FILESPATH
+ # items. So, only do so for file:// entries.
+ if type == "file":
+ destdir = bb.decodeurl(url)[1] or "."
+ else:
+ destdir = "."
bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))
cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir)
if not cmd:
diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass
index d9580ed5dc..41192807be 100644
--- a/classes/module-base.bbclass
+++ b/classes/module-base.bbclass
@@ -7,6 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
export KERNEL_VERSION = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}
export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}
+KERNEL_OBJECT_SUFFIX = ${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}
KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}
KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}
KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index c0798bd452..9e05a58dc0 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -27,7 +27,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-PREFERRED_VERSION_bluez-utils-dbus = "2.13"
+#PREFERRED_VERSION_bluez-utils-dbus = "2.13"
#
# Opie
@@ -47,10 +47,10 @@ PREFERRED_VERSION_matchbox-desktop = "0.9"
PREFERRED_VERSION_matchbox-wm = "0.9"
PREFERRED_VERSION_matchbox-panel = "0.9"
PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_gtk+ = "2.6.0"
-PREFERRED_VERSION_libgpewidget = "0.97"
+#PREFERRED_VERSION_gtk+ = "2.6.0"
+#PREFERRED_VERSION_libgpewidget = "0.97"
PREFERRED_VERSION_libgpepimc = "0.4"
-PREFERRED_VERSION_libgpevtype = "0.5"
+PREFERRED_VERSION_libgpevtype = "0.6"
PREFERRED_VERSION_libschedule = "0.13"
PREFERRED_VERSION_gpe-icons = "0.24"
PREFERRED_VERSION_libgsm = "1.0.10"
@@ -71,8 +71,8 @@ PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
PREFERRED_VERSION_gpe-contacts = "0.34"
PREFERRED_VERSION_gpe-today = "0.08"
PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.22"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
+#PREFERRED_VERSION_dbus = "0.22"
+#PREFERRED_VERSION_gpe-bluetooth = "0.37"
PREFERRED_VERSION_gpe-su = "0.18"
PREFERRED_VERSION_gpe-conf = "0.1.22"
PREFERRED_VERSION_gpe-clock = "0.20"
diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
index 231fea0e2a..93a361a878 100644
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -2,288 +2,13 @@ INHERIT += "package_ipk"
INHERIT += "debian"
-CVSDATE = 20041120
+CVSDATE = 20050107
+CVSDATE_ipkg-utils = 20050110
#ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "ttyS0"
TARGET_FPU = "soft"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_libtool-native = "1.5.6"
-PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
-PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-
-#
-# Opie
-#
-
-OPIE_VERSION = "1.1.7"
-PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.3"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-
-#
-# GPE
-#
-
-PREFERRED_VERSION_libmatchbox = "1.4"
-PREFERRED_VERSION_matchbox = "0.8.1"
-PREFERRED_VERSION_matchbox-common = "0.8"
-PREFERRED_VERSION_matchbox-desktop = "0.8.1"
-PREFERRED_VERSION_matchbox-wm = "0.8.4"
-PREFERRED_VERSION_matchbox-panel = "0.8.3"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
-PREFERRED_VERSION_gtk+ = "2.4.13"
-PREFERRED_VERSION_libgpewidget = "0.95"
-PREFERRED_VERSION_libgpepimc = "0.3"
-PREFERRED_VERSION_libgpevtype = "0.5"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.24"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "3.7"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.73"
-PREFERRED_VERSION_gpe-session-scripts = "0.62"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.50"
-PREFERRED_VERSION_gpe-calendar = "0.58"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.33"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.22"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.22"
-PREFERRED_VERSION_gpe-clock = "0.14"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
-PREFERRED_VERSION_gpe-shield = "0.6"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.44"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.0.12"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.12"
-PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.1"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "1.0"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 4c068d96ce..17d0431698 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -45,11 +45,8 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11"
# Opie
#
-OPIE_VERSION = "1.1.8"
+OPIE_VERSION = "1.2.0"
include conf/distro/preferred-opie-versions.inc
-PREFERRED_VERSION_libopie2 = "the-latest-please"
-PREFERRED_VERSION_libqpe-opie = "the-latest-please"
-PREFERRED_VERSION_opie-taskbar = "the-latest-please"
#
# GPE
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c43c70e8f0..9b04708449 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \
kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \
kernel-module-usbdmonitor"
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index f1a1458de1..734a4bfbd5 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,4 +1,4 @@
IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs"
BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
index 9c5b241196..b1f5c24a7c 100644
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ b/conf/machine/openzaurus-pxa-2.6.conf
@@ -7,8 +7,10 @@ include conf/machine/zaurus-clamshell.conf
PREFERRED_PROVIDER_virtual/kernel = "openzaurus"
PREFERRED_VERSION_orinoco-modules = "20050101"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules chkhinge"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules chkhinge"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules chkhinge \
+pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ppp-dialin"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs chkhinge \
+pcmcia-cs apm ppp wireless-tools irda-utils"
# kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
# kernel-module-usbdcore kernel-module-usbdmonitor chkhinge"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index d59ffea18d..a3388bdf99 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
kernel-module-ip-gre \
kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
index 187ff8bf49..06fa1e6c13 100644
--- a/conf/machine/ramses.conf
+++ b/conf/machine/ramses.conf
@@ -5,7 +5,6 @@
TARGET_ARCH = "arm"
TARGET_OS = "linux"
IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 37e5e3116d..30bd894f26 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules mipv6 atmelwlandriver"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "mipv6 hostap-modules-cs orinoco-modules atmelwlandriver \
+BOOTSTRAP_EXTRA_RRECOMMENDS = "mipv6 hostap-modules-cs orinoco-modules-cs atmelwlandriver \
kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
kernel-module-pcnet-cs kernel-module-8390"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index b44fb1b43c..7396fe7d80 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge usbutils"
BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd \
kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage \
-kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \
+kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \
kernel-module-irnet kernel-module-ipip kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor"
RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev"
diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb
index e69de29bb2..64af00d1a2 100644
--- a/packages/atd/atd_0.70.bb
+++ b/packages/atd/atd_0.70.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Lightweight At Daemon"
+SECTION = "base"
+LICENSE = "GPLV2"
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70"
+S = "${WORKDIR}/atd"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "atd"
+INITSCRIPT_PARAMS = "defaults 97"
+
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install atd ${D}${sbindir}/atd
+ install -d ${D}/etc/init.d
+ install dist/etc/init.d/atd ${D}/etc/init.d/atd
+}
diff --git a/packages/bash/bash_2.05b.bb b/packages/bash/bash_2.05b.bb
index 775bdf860c..7134e04d5a 100644
--- a/packages/bash/bash_2.05b.bb
+++ b/packages/bash/bash_2.05b.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "An sh-compatible command language interpreter."
HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
DEPENDS = "ncurses"
+PROVIDES = "virtual/sh"
SECTION = "base/shell"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
file://bashbug-editor.patch;patch=1;pnum=0 \
@@ -38,11 +39,7 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
file://gcc34.patch;patch=1 \
file://signames-mipsel.diff;patch=1"
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/sh"
-ALTERNATIVE_NAME = "sh"
-ALTERNATIVE_PATH = "${bindir}/bash"
+inherit autotools
bindir = "/bin"
sbindir = "/sbin"
@@ -61,3 +58,20 @@ do_configure () {
fi
autotools_do_configure
}
+
+# dont use update-alternatives class because since we are dealing with /bin/sh
+# we need to do the remove in pkg_prerm where the /bin/sh link still points
+# to something (postrm is a shell script)
+
+ALTERNATIVE_NAME = "sh"
+ALTERNATIVE_PATH = "${bindir}/bash"
+ALTERNATIVE_PRIORITY = "30"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+
+pkg_postinst() {
+update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY}
+}
+
+pkg_prerm() {
+update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
+}
diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb
index e69de29bb2..ba7b080670 100644
--- a/packages/bash/bash_3.0.bb
+++ b/packages/bash/bash_3.0.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "An sh-compatible command language interpreter."
+HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
+DEPENDS = "ncurses"
+SECTION = "base/shell"
+LICENSE = "GPL"
+PROVIDES = "virtual/sh"
+PR = "r2"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+ file://signames-mipsel.diff;patch=1"
+
+inherit autotools
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+EXTRA_OECONF = "--with-curses"
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+do_configure () {
+ oe_runconf
+}
+
+# dont use update-alternatives class because since we are dealing with /bin/sh
+# we need to do the remove in pkg_prerm where the /bin/sh link still points
+# to something (postrm is a shell script)
+
+ALTERNATIVE_NAME = "sh"
+ALTERNATIVE_PATH = "${bindir}/bash"
+ALTERNATIVE_PRIORITY = "30"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+
+pkg_postinst() {
+update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY}
+}
+
+pkg_prerm() {
+update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
+}
diff --git a/packages/bison/bison-1.875/m4.patch b/packages/bison/bison-2.0/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/bison/bison-1.875/m4.patch
+++ b/packages/bison/bison-2.0/m4.patch
diff --git a/packages/bison/bison-native_1.875.bb b/packages/bison/bison-native_2.0.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/bison/bison-native_1.875.bb
+++ b/packages/bison/bison-native_2.0.bb
diff --git a/packages/bison/bison_1.875.bb b/packages/bison/bison_2.0.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/bison/bison_1.875.bb
+++ b/packages/bison/bison_2.0.bb
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index e69de29bb2..851ad15025 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -0,0 +1,26 @@
+SECTION = "base"
+PV = "0.0cvs${CVSDATE}"
+DESCRIPTION = "Command line tool for iPaq backlight control"
+MAINTAINER = "Florian Boor <florian@kernelconcets.de>"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/h3600_test \
+ file://nokernelheader.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/h3600_test"
+PR = "r0"
+
+inherit pkgconfig
+
+FILES_${PN} = "${bindir}"
+
+do_configure (){
+}
+
+do_compile (){
+ oe_runmake bl CC="${CROSS_DIR}/bin/${TARGET_SYS}-gcc -I{STAGING_INCDIR} -L${STAGING_LIBDIR}" AS=${CROSS_DIR}/bin/${TARGET_SYS}-as LD=${CROSS_DIR}/bin/${TARGET_SYS}-ld
+}
+
+do_install () {
+ install -d ${D}/usr/bin
+ install -m4755 ${S}/bl ${D}/usr/bin/bl
+}
diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb
index e69de29bb2..ee8e38a0e6 100644
--- a/packages/btxml/btxml.bb
+++ b/packages/btxml/btxml.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Bluetooh Download Data from remote phones"
+PRIORITY = "optional"
+SECTIONS = "apps"
+DEPENDS = "bluez-libs"
+HOMEPAGE = "http://www.saftware.de"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.saftware.de/bluetooth/btxml.c"
+S = "${WORKDIR}"
+
+do_compile() {
+ ${CC} ${CPPFLAGS} -c -o btxml.o btxml.c
+ ${CC} -o btxml -lbluetooth -L${STAGING_LIBDIR} btxml.o
+}
+
+do_install() {
+ install -d ${D}/${bindir}/
+ install -m 0775 btxml ${D}/${bindir}/
+}
diff --git a/packages/busybox/busybox-1.00/defconfig b/packages/busybox/busybox-1.00/defconfig
index e69de29bb2..3b2f214c22 100644
--- a/packages/busybox/busybox-1.00/defconfig
+++ b/packages/busybox/busybox-1.00/defconfig
@@ -0,0 +1,475 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_SELINUX is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+CONFIG_LFS=y
+# USING_CROSS_COMPILER is not set
+EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CMP is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_DF=y
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+# CONFIG_FEATURE_LS_RECURSIVE is not set
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_OD=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_STTY=y
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls and more
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_GETKEY=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_RUN_PARTS=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_PATCH is not set
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_HALT is not set
+# CONFIG_POWEROFF is not set
+# CONFIG_REBOOT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_U_W_TMP=y
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_LAST is not set
+# CONFIG_HDPARM is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MT is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_TIME is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+CONFIG_FEATURE_INSMOD_LOAD_MAP=y
+CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
+CONFIG_LSMOD=y
+CONFIG_MODPROBE=y
+CONFIG_RMMOD=y
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_ARPING is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_INETD is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_IPCALC is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+CONFIG_TFTP=y
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
+
+#
+# udhcp Server/Client
+#
+CONFIG_UDHCPD=y
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_PIDOF is not set
+CONFIG_PS=y
+CONFIG_RENICE=y
+CONFIG_TOP=y
+FEATURE_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+# CONFIG_SYSCTL is not set
+
+#
+# Another Bourne-like Shell
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+CONFIG_FEATURE_COMMAND_HISTORY=63
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
+CONFIG_LOSETUP=y
+CONFIG_MKSWAP=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+CONFIG_SWAPONOFF=y
+CONFIG_MOUNT=y
+CONFIG_NFSMOUNT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+# CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index faf3327ab2..e5458614b2 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -1,5 +1,4 @@
-DESCRIPTION = "BusyBox version ${PV}. \
-BusyBox combines tiny versions of many common UNIX utilities into a single \
+DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
small executable. It provides minimalist replacements for most of the \
utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
in BusyBox generally have fewer options than their full-featured GNU \
@@ -11,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r14"
+PR = "r16"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://add-getkey-applet.patch;patch=1 \
@@ -33,7 +32,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://hwclock.sh \
file://default.script \
file://syslog.conf"
-
+
S = "${WORKDIR}/busybox-${PV}"
export EXTRA_CFLAGS = "${CFLAGS}"
diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
index e69de29bb2..eeb9622353 100644
--- a/packages/busybox/slingbox_1.00.bb
+++ b/packages/busybox/slingbox_1.00.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
+to enable ipkg to run on an Unslung NSLU2 device."
+HOMEPAGE = "http://www.busybox.net"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "required"
+PR = "r4"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+ file://defconfig \
+ file://slingbox.patch;patch=1"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+python () {
+ # Don't build slingbox unless we're targeting an nslu2
+ if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+ raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
+}
+
+export EXTRA_CFLAGS = "${CFLAGS}"
+EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/bin /sbin"
+FILES_${PN}-doc = ""
+FILES_${PN}-dev = ""
+FILES_${PN}-locale = ""
+
+inherit cml1
+
+do_configure () {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ cml1_do_configure
+}
+
+do_compile () {
+ unset CFLAGS
+ base_do_compile
+}
+
+do_install () {
+ oe_runmake 'PREFIX=${D}' install
+}
diff --git a/packages/faad2/faad2-2.0/Makefile-dos.patch b/packages/dash/dash_0.5.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/faad2/faad2-2.0/Makefile-dos.patch
+++ b/packages/dash/dash_0.5.1.bb
diff --git a/packages/faad2/faad2-2.0/Makefile2.patch b/packages/dash/files/makefile-build-cc.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/faad2/faad2-2.0/Makefile2.patch
+++ b/packages/dash/files/makefile-build-cc.diff
diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb
index e69de29bb2..f24a007e6f 100644
--- a/packages/devmem2/devmem2.bb
+++ b/packages/devmem2/devmem2.bb
@@ -0,0 +1,13 @@
+SRC_URI = "http://www.lart.tudelft.nl/lartware/port/devmem2.c"
+LICENSE = "GPL"
+
+do_compile() {
+ ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install devmem2 ${D}${bindir}
+}
+
+
diff --git a/packages/gtk+/gtk+-2.4.13/my-documents.patch b/packages/didiwiki/didiwiki.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/gtk+/gtk+-2.4.13/my-documents.patch
+++ b/packages/didiwiki/didiwiki.inc
diff --git a/packages/didiwiki/didiwiki_0.2.bb b/packages/didiwiki/didiwiki_0.2.bb
index e69de29bb2..6873116c93 100644
--- a/packages/didiwiki/didiwiki_0.2.bb
+++ b/packages/didiwiki/didiwiki_0.2.bb
@@ -0,0 +1 @@
+include didiwiki.inc
diff --git a/packages/didiwiki/didiwiki_0.4.bb b/packages/didiwiki/didiwiki_0.4.bb
index e69de29bb2..6873116c93 100644
--- a/packages/didiwiki/didiwiki_0.4.bb
+++ b/packages/didiwiki/didiwiki_0.4.bb
@@ -0,0 +1 @@
+include didiwiki.inc
diff --git a/packages/gtk+/gtk+-2.6.0/my-documents.patch b/packages/didiwiki/didiwiki_0.5.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/gtk+/gtk+-2.6.0/my-documents.patch
+++ b/packages/didiwiki/didiwiki_0.5.bb
diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb
index e69de29bb2..0e912d78d6 100644
--- a/packages/esound/esound-gpe_20020817.bb
+++ b/packages/esound/esound-gpe_20020817.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Enlightened Sound Daemon - GPE version"
+SECTION = "gpe/base"
+LICENSE = "GPL"
+DEPENDS = "audiofile"
+PR = "r3"
+
+CVSDATE = "${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \
+ file://audiofile-please.patch;patch=1 \
+ file://configure.patch;patch=1"
+
+S = "${WORKDIR}/esound"
+
+inherit autotools libtool pkgconfig
+
+EXTRA_OECONF = "--disable-alsa"
+
+SOV = "0.2.28"
+
+do_stage () {
+ install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
+ oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
+ install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
+ install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
+}
+
+PACKAGES =+ "esddsp esd esd-utils"
+
+FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
+FILES_esd = "${bindir}/esd"
+FILES_esd-utils = "${bindir}"
diff --git a/packages/irk/irk_0.11.0.bb b/packages/glib-2.0/glib-2.0-native_2.6.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/irk/irk_0.11.0.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.1.bb
diff --git a/packages/irk/irk_0.11.1.bb b/packages/glib-2.0/glib-2.0_2.6.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/irk/irk_0.11.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.1.bb
diff --git a/packages/kbdd/kbdd-patched-20040904/kbdd.default b/packages/gnocky/gnocky_0.0.3.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/kbdd.default
+++ b/packages/gnocky/gnocky_0.0.3.bb
diff --git a/packages/kbdd/kbdd-patched-20040904/kbdd.init b/packages/gnokii/gnokii/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/kbdd.init
+++ b/packages/gnokii/gnokii/configure.patch
diff --git a/packages/kbdd/kbdd-patched-20040904/snapntype.patch b/packages/gnokii/gnokii_0.6.4.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/snapntype.patch
+++ b/packages/gnokii/gnokii_0.6.4.bb
diff --git a/packages/gnome/libart-lgpl_2.3.16.bb b/packages/gnome/libart-lgpl_2.3.16.bb
index e69de29bb2..68bb1dee1a 100644
--- a/packages/gnome/libart-lgpl_2.3.16.bb
+++ b/packages/gnome/libart-lgpl_2.3.16.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+PR = "r2"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+ file://${HOST_SYS}/art_config.h \
+ file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+ cp ${WORKDIR}/${HOST_SYS}/art_config.h ${S}
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+ autotools_stage_includes
+ oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb
index e69de29bb2..1b55704704 100644
--- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb
+++ b/packages/gnumeric/gnumeric_1.3.1.cvs.bb
@@ -0,0 +1,30 @@
+LICENSE = GPL
+SECTION = "x11/utils"
+#CVSDATE="20040719"
+CVSTAG="GNUMERIC_1_3_1"
+
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/gnumeric"
+
+
+PR = "r1"
+SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnumeric;tag=${CVSTAG} \
+ file://gnumeric-doc.make.patch;patch=1 \
+ file://Makefile.am.patch;patch=1"
+
+DEPENDS = "libgsf1 gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
+
+
+EXTRA_OECONF = "--without-gnome"
+
+do_configure_prepend() {
+ touch xmldocs.make
+ intltoolize --automake --debug
+# # aclocal seems to insist on looking in here. Make sure it exists.
+# mkdir -p ${S}/m4
+# # work around automake lossage with AC_CONFIG_AUX_DIR
+# ( cd libmutt; libtoolize --force ; cp ../ltmain.sh . )
+}
+
+inherit autotools
diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb
index 69588475d4..1f71522d5b 100644
--- a/packages/gpe-beam/gpe-beam_0.2.3.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.3.bb
@@ -5,4 +5,4 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex"
RDEPENDS = "libopenobex-1.0-1"
SECTION = "gpe"
PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch
index e69de29bb2..b7dc93b4e8 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch
+++ b/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch
@@ -0,0 +1,47 @@
+Index: dbus.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-bluetooth/dbus.c,v
+retrieving revision 1.7
+diff -u -r1.7 dbus.c
+--- gpe-bluetooth/dbus.c 7 Sep 2004 00:01:27 -0000 1.7
++++ gpe-bluetooth/dbus.c 9 Jan 2005 13:56:46 -0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2002, 2003, 2004 Philip Blundell <philb@gnu.org>
++ * Copyright (C) 2002, 2003, 2004, 2005 Philip Blundell <philb@gnu.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+@@ -27,9 +27,11 @@
+
+ #define _(x) gettext(x)
+
+-#define SERVICE_NAME "org.handhelds.gpe.bluez"
+-#define PIN_INTERFACE_NAME SERVICE_NAME ".PinAgent"
+-#define OBEX_INTERFACE_NAME SERVICE_NAME ".OBEX"
++#define PIN_SERVICE_NAME "org.bluez.PinAgent"
++#define PIN_INTERFACE_NAME PIN_SERVICE_NAME
++
++#define OBEX_SERVICE_NAME "org.handhelds.gpe.bluez"
++#define OBEX_INTERFACE_NAME OBEX_SERVICE_NAME ".OBEX"
+
+ extern DBusHandlerResult bluez_pin_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
+ extern DBusHandlerResult obex_client_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
+@@ -96,7 +98,7 @@
+
+ dbus_connection_register_object_path (connection, object_path1, &dbus_pin_vtable, NULL);
+
+- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
++ dbus_bus_acquire_service (connection, PIN_SERVICE_NAME, 0, &error);
+ if (dbus_error_is_set (&error))
+ {
+ gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
+@@ -118,7 +120,7 @@
+
+ dbus_connection_register_object_path (connection, object_path2, &dbus_obex_vtable, NULL);
+
+- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
++ dbus_bus_acquire_service (connection, OBEX_SERVICE_NAME, 0, &error);
+ if (dbus_error_is_set (&error))
+ {
+ gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb
index 1ef0a4a390..5c7581e224 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb
@@ -7,7 +7,7 @@ RDEPENDS = "bluez-utils-dbus blueprobe"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r6"
+PR = "r7"
FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-package/gpe-package_0.0.12.bb b/packages/gpe-package/gpe-package_0.0.12.bb
index 7b4e802642..b5c80369e7 100644
--- a/packages/gpe-package/gpe-package_0.0.12.bb
+++ b/packages/gpe-package/gpe-package_0.0.12.bb
@@ -1,5 +1,4 @@
-
-PR = "r2"
+PR = "r3"
LICENSE = "GPL"
inherit gpe pkgconfig
@@ -11,4 +10,4 @@ PRIORITY = "optional"
SRC_URI += "file://use-filesel.patch;patch=1"
-FILES_{PN} += "${datadir}"
+FILES_${PN} += "${datadir}"
diff --git a/packages/kbdd/kbdd-patched-20040904/stowaway-fellowes-apm.patch b/packages/gtk+/gtk+-2.6.1/automake-lossage.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/stowaway-fellowes-apm.patch
+++ b/packages/gtk+/gtk+-2.6.1/automake-lossage.patch
diff --git a/packages/kdepimpi/files/manager.h.patch b/packages/gtk+/gtk+-2.6.1/disable-tooltips.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/files/manager.h.patch
+++ b/packages/gtk+/gtk+-2.6.1/disable-tooltips.patch
diff --git a/packages/kdepimpi/kdepimpi_1.9.15.bb b/packages/gtk+/gtk+-2.6.1/error-dialog.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/kdepimpi_1.9.15.bb
+++ b/packages/gtk+/gtk+-2.6.1/error-dialog.patch
diff --git a/packages/libqpe/libqpe-opie/resource.patch b/packages/gtk+/gtk+-2.6.1/gtk+-handhelds.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/libqpe/libqpe-opie/resource.patch
+++ b/packages/gtk+/gtk+-2.6.1/gtk+-handhelds.patch
diff --git a/packages/linux/openzaurus-2.6.10/defconfig-collie b/packages/gtk+/gtk+-2.6.1/gtklabel-resize-patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-2.6.10/defconfig-collie
+++ b/packages/gtk+/gtk+-2.6.1/gtklabel-resize-patch
diff --git a/packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6 b/packages/gtk+/gtk+-2.6.1/hardcoded_libtool.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6
+++ b/packages/gtk+/gtk+-2.6.1/hardcoded_libtool.patch
diff --git a/packages/linux/openzaurus-2.6.10/defconfig-poodle b/packages/gtk+/gtk+-2.6.1/menu-deactivate.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-2.6.10/defconfig-poodle
+++ b/packages/gtk+/gtk+-2.6.1/menu-deactivate.patch
diff --git a/packages/gtk+/gtk+-2.6.1/no-demos.patch b/packages/gtk+/gtk+-2.6.1/no-demos.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/no-demos.patch
diff --git a/packages/gtk+/gtk+-2.6.1/no-xwc.patch b/packages/gtk+/gtk+-2.6.1/no-xwc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/no-xwc.patch
diff --git a/packages/gtk+/gtk+-2.6.1/scroll-timings.patch b/packages/gtk+/gtk+-2.6.1/scroll-timings.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/scroll-timings.patch
diff --git a/packages/gtk+/gtk+-2.6.1/single-click.patch b/packages/gtk+/gtk+-2.6.1/single-click.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/single-click.patch
diff --git a/packages/gtk+/gtk+-2.6.1/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.6.1/small-gtkfilesel.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/small-gtkfilesel.patch
diff --git a/packages/gtk+/gtk+-2.6.1/spinbutton.patch b/packages/gtk+/gtk+-2.6.1/spinbutton.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/spinbutton.patch
diff --git a/packages/gtk+/gtk+-2.6.1/xsettings.patch b/packages/gtk+/gtk+-2.6.1/xsettings.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.1/xsettings.patch
diff --git a/packages/gtk+/gtk+_2.6.1.bb b/packages/gtk+/gtk+_2.6.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+_2.6.1.bb
diff --git a/packages/hostap/hostap-modules_0.1.3.bb b/packages/hostap/hostap-modules_0.1.3.bb
index 244c7f94ad..cb288631ad 100644
--- a/packages/hostap/hostap-modules_0.1.3.bb
+++ b/packages/hostap/hostap-modules_0.1.3.bb
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf"
@@ -17,9 +17,9 @@ do_install() {
install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
${D}/${sysconfdir}/pcmcia
- install -m 0755 driver/modules/hostap_crypt_wep.o ${D}/lib/modules/${KERNEL_VERSION}/net/
- install -m 0755 driver/modules/hostap.o ${D}/lib/modules/${KERNEL_VERSION}/net/
- install -m 0755 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+ install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
diff --git a/packages/hostap/hostap-modules_0.2.0.bb b/packages/hostap/hostap-modules_0.2.0.bb
deleted file mode 100644
index 86aed7fe5e..0000000000
--- a/packages/hostap/hostap-modules_0.2.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
-SECTION = "kernel/modules"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
- file://hostap_cs.conf"
-S = "${WORKDIR}/hostap-driver-${PV}"
-
-inherit module
-
-MAKE_TARGETS = "hostap pccard"
-
-do_install() {
- install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
- ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
- ${D}/${sysconfdir}/pcmcia
- install -m 0644 driver/modules/hostap_crypt_wep.o ${D}/lib/modules/${KERNEL_VERSION}/net/
- install -m 0644 driver/modules/hostap.o ${D}/lib/modules/${KERNEL_VERSION}/net/
- install -m 0644 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
- install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
- cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-}
diff --git a/packages/hostap/hostap-modules_0.2.6.bb b/packages/hostap/hostap-modules_0.2.6.bb
index de1b4ffeaf..902d4d1a47 100644
--- a/packages/hostap/hostap-modules_0.2.6.bb
+++ b/packages/hostap/hostap-modules_0.2.6.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
@@ -18,7 +18,7 @@ inherit module
EXTRA_OEMAKE = "EXTRA_CFLAGS='-DPRISM2_NON_VOLATILE_DOWNLOAD'"
MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
-NET_MODULES = "hostap.o hostap_pci.o hostap_crypt_ccmp.o hostap_crypt_tkip.o hostap_crypt_wep.o"
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
do_install() {
install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
@@ -26,9 +26,9 @@ do_install() {
${D}/${sysconfdir}/pcmcia
for i in ${NET_MODULES}
do
- install -m 0644 driver/modules/$i ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
done
- install -m 0644 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+ install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
@@ -53,7 +53,7 @@ update-modules || true
PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
-FILES_hostap-modules-pci = "/etc/modutils /lib/modules/${KERNEL_VERSION}/net/hostap_pci.o"
+FILES_hostap-modules-pci = "/etc/modutils /lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/hostap/hostap-modules_0.3.3.bb b/packages/hostap/hostap-modules_0.3.3.bb
index 08c15b0275..92173a2511 100644
--- a/packages/hostap/hostap-modules_0.3.3.bb
+++ b/packages/hostap/hostap-modules_0.3.3.bb
@@ -3,9 +3,7 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r3"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
@@ -21,7 +19,7 @@ inherit module
ARCH_mipsel = "mips"
MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
-NET_MODULES = "hostap.o hostap_pci.o hostap_crypt_ccmp.o hostap_crypt_tkip.o hostap_crypt_wep.o"
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
do_install() {
install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
@@ -29,16 +27,16 @@ do_install() {
${D}/${sysconfdir}/pcmcia
for i in ${NET_MODULES}
do
- install -m 0644 driver/modules/$i ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
done
- install -m 0644 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+ install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
}
PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
-FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci.o"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch b/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
diff --git a/packages/hotplug/hotplug_20040920.bb b/packages/hotplug/hotplug_20040920.bb
index bfd4f3f421..a30c2ed62f 100644
--- a/packages/hotplug/hotplug_20040920.bb
+++ b/packages/hotplug/hotplug_20040920.bb
@@ -4,11 +4,12 @@ and use them immediately."
HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
LICENSE = "GPL"
SECTION = "base"
-PR = "r5"
-RRECOMMENDS = "pciutils usbutils"
+PR = "r7"
+RSUGGESTS = "pciutils usbutils"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
file://userspecified_hcd.patch;patch=1 \
+ file://hotplug-net-agent-usb.patch;patch=1 \
file://fix-net.agent \
file://update-usb.usermap \
file://logcheck-ignore \
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 95ad790b70..af2ae26822 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -3,9 +3,10 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
SECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"
+DEPENDS_openzaurus = "virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r26"
+PR = "r27"
SRC_URI = "file://halt \
file://ramdisk \
@@ -33,6 +34,8 @@ SRC_URI = "file://halt \
SRC_URI_append_arm = " file://alignment.sh"
SRC_URI_append_openzaurus = " file://checkversion"
+KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
+
do_install () {
#
# Create directories and install device independent scripts
@@ -72,9 +75,8 @@ do_install () {
# Install device dependent scripts
#
- # checkversion hardcoded for now since kernel may be built after initscripts
if [ "${DISTRO}" == "openzaurus" ]; then
- cat ${WORKDIR}/checkversion | sed -e "s,VERSION,2.4.18-rmk7-pxa3-embedix-${DISTRO_VERSION}," > ${D}/etc/init.d/checkversion
+ cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/etc/init.d/checkversion
chmod 0755 ${D}/etc/init.d/checkversion
ln -sf ../init.d/checkversion ${D}/etc/rcS.d/S05version
fi
diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
index a04e0d6809..5327f012eb 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
@@ -6,9 +6,8 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "GPL"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
-CVSDATE = "20041220"
PV_append = "${CVSDATE}"
-PR = "r6"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://fix-ipkg-link.patch;patch=1 \
diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index e69de29bb2..cf66278453 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -0,0 +1,21 @@
+SECTION = "base"
+DESCRIPTION = "ipkg configuration files"
+LICENSE = "MIT"
+PR = "r1"
+
+SRC_URI = " \
+file://ipkg.conf.comments \
+file://dest \
+file://src \
+"
+
+do_compile () {
+ cat ${WORKDIR}/ipkg.conf.comments >${WORKDIR}/ipkg.conf
+ cat ${WORKDIR}/src >>${WORKDIR}/ipkg.conf
+ cat ${WORKDIR}/dest >>${WORKDIR}/ipkg.conf
+}
+
+do_install () {
+ install -d ${D}/${sysconfdir}/
+ install -m 0644 ${WORKDIR}/ipkg.conf ${D}/${sysconfdir}/ipkg.conf
+}
diff --git a/packages/irk/irk_0.11-belkin.bb b/packages/irk/irk_0.11-belkin.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/irk/irk_0.11-belkin.bb
diff --git a/packages/irk/irk_0.11-targus.bb b/packages/irk/irk_0.11-targus.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/irk/irk_0.11-targus.bb
diff --git a/packages/justreader/files/correct-settings-path.patch b/packages/justreader/files/correct-settings-path.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/justreader/files/correct-settings-path.patch
diff --git a/packages/kbdd/kbdd-patched_20040904.bb b/packages/kbdd/kbdd-patched_20040904.bb
deleted file mode 100644
index ebb190a9d3..0000000000
--- a/packages/kbdd/kbdd-patched_20040904.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-DESCRIPTION = "Keyboard Device Daemon which provides support for snapntype and stowaway keyboards"
-MAINTAINER = "Paul Eggleton <http://handhelds.org/moin/moin.cgi/PaulEggleton>"
-SECTION = "utils"
-LICENSE = "GPL"
-PR = "r2"
-DEPENDS = "virtual/kernel"
-RDEPENDS = "kernel-module-keybdev kernel-module-uinput"
-SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV} \
- file://snapntype.patch;patch=1;pnum=0 \
- file://stowaway-fellowes-apm.patch;patch=1;pnum=0 \
- file://kbdd.init \
- file://kbdd.default"
-
-inherit autotools update-rc.d
-
-S = "${WORKDIR}/kbdd"
-INITSCRIPT_NAME = "kbdd.init"
-INITSCRIPT_PARAMS = "default"
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- install -d ${D}/${sbindir}
- install -d ${D}/${docdir}/kbdd/
- install -m 0755 kbdd ${D}/${sbindir}/
- install -m 0644 README ${D}/${docdir}/kbdd/
-}
-
-do_install_append () {
- mkdir -p ${D}/${sysconfdir}/defaults
- cat ${WORKDIR}/kbdd.default > ${D}/${sysconfdir}/defaults/kbdd
- chmod 755 ${D}/${sysconfdir}/defaults/kbdd
- mkdir -p ${D}/${sysconfdir}/modutils
- touch ${D}/${sysconfdir}/modutils/kbdd-modules
- echo "keybdev" > ${D}/${sysconfdir}/modutils/kbdd-modules
- echo "uinput" >> ${D}/${sysconfdir}/modutils/kbdd-modules
- chmod 755 ${D}/${sysconfdir}/modutils/kbdd-modules
-}
-
-pkg_postinst () {
- update-modules
-}
-
-pkg_prerm () {
- rm ${D}/${sysconfdir}/modutils/kbdd-modules
- update-modules
-}
-
-updatercd_postinst() {
-if test "x$D" != "x"; then
- D="-r $D"
-else
- D="-s"
-fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
-}
-
-updatercd_postrm() {
-if test "x$D" != "x"; then
- D="-r $D"
-else
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop
-fi
-update-rc.d $D ${INITSCRIPT_NAME} remove
-}
diff --git a/packages/kdepimpi/files/qinputdialog_inc.patch b/packages/kdepimpi/files/qinputdialog_inc.patch
index e69de29bb2..6044ae5c14 100644
--- a/packages/kdepimpi/files/qinputdialog_inc.patch
+++ b/packages/kdepimpi/files/qinputdialog_inc.patch
@@ -0,0 +1,49 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/microkde/kresources/configpage.cpp~qinputdialog_inc.patch
++++ kdepim/microkde/kresources/configpage.cpp
+@@ -29,7 +29,7 @@
+ */
+
+ #include <qgroupbox.h>
+-#include <qinputdialog.h>
++#include <qtcompat/qinputdialog.h>
+ #include <qlabel.h>
+ #include <qlayout.h>
+
+--- kdepim/kaddressbook/xxport/csvimportdialog.cpp~qinputdialog_inc.patch
++++ kdepim/kaddressbook/xxport/csvimportdialog.cpp
+@@ -30,7 +30,7 @@
+ #include <qbuttongroup.h>
+ #include <qcheckbox.h>
+ #include <qcombobox.h>
+-#include <qinputdialog.h>
++#include <qtcompat/qinputdialog.h>
+ #include <qlabel.h>
+ #include <qlineedit.h>
+ #include <qpushbutton.h>
+--- kdepim/kabc/distributionlisteditor.cpp~qinputdialog_inc.patch
++++ kdepim/kabc/distributionlisteditor.cpp
+@@ -22,7 +22,7 @@
+ #include <qlayout.h>
+ #include <qpushbutton.h>
+ #include <qcombobox.h>
+-#include <qinputdialog.h>
++#include <qtcompat/qinputdialog.h>
+ #include <qbuttongroup.h>
+ #include <qradiobutton.h>
+
+--- kdepim/kaddressbook/keywidget.cpp~qinputdialog_inc.patch
++++ kdepim/kaddressbook/keywidget.cpp
+@@ -23,7 +23,7 @@
+
+ #include <qfile.h>
+
+-#include <qinputdialog.h>
++#include <qtcompat/qinputdialog.h>
+
+ #include <qlabel.h>
+ #include <qlayout.h>
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index e69de29bb2..cccbe7727d 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -0,0 +1,131 @@
+DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA"
+DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool"
+DESCRIPTION_kopi-applet = "KDE Pim/PI applet"
+DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook"
+DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde"
+DESCRIPTION_libmicrokcal = "KDE Pim/PI library - microkcal"
+DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc"
+DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu"
+DESCRIPTION_kammu = "KDE Pim/PI fork of gammu"
+
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
+#DEPENDS = "gammu libetpan libmailwrapper"
+# gammu as replacement for libmicrogammu
+# libetpan & libmailwrapper as replacement for kdepim/pi versions
+
+SRC_URI += "\
+file://qinputdialog_inc.patch;patch=1 \
+file://libkcal.pro.patch;patch=1 \
+"
+
+# TODO:
+# checking libmailwrapper changes (diff sent to opie-devel ML)
+# author said that he didn't changed libetpan so we probably can get OE one
+# compile opie mail/pi
+
+# we can't build:
+# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library)
+# kabc/plugins/ldap - wants ldap libs (?)
+# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE)
+# kmicromail - have to check changes in KDEPIM/PI version libmailwrapper
+
+
+S = "${WORKDIR}/kdepim"
+EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DIR=moc/ \
+ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++ \
+ LIBS+=-Wl,-rpath-link,${S}/dest \
+ LIBS-=-lzlib LIBS+=-lz \
+ "
+
+# That changes will be needed for KMicroMail/PI to get it build with OE libs
+#
+# LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \
+
+QMAKE_PROFILES= "all.pro"
+SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim \
+ kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \
+ kabc/formats/binary kabc/plugins/qtopia \
+ gammu/emb/common \
+ gammu/emb/gammu \
+ "
+# pwmanager/libcrypt/mpi \
+# pwmanager/libcrypt/error \
+# pwmanager/libcrypt/cipher \
+# pwmanager/libcrypt/zlib \
+# pwmanager/pwmanager"
+
+inherit palmtop
+
+do_compile() {
+ export KDEPIMDIR=${S}
+ oe_runmake
+}
+
+do_configure_prepend() {
+ mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro
+ echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.pro
+ for d in ${SUBDIRS}
+ do
+ if [ -f ${d}/`basename ${d}`E.pro ];
+ then
+ mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+ fi
+ done
+ mkdir "${S}/dest"
+}
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin \
+ ${D}/${palmtopdir}/lib \
+ ${D}/${palmtopdir}/apps/1Pim \
+ ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 \
+ ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+ ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+ ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+ ${D}/${palmtopdir}/plugins/applets
+
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}/${palmtopdir}/pics/kdepim/korganizer
+ install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16
+ install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini
+ install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop
+
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}/${palmtopdir}/pics/kdepim/kaddressbook
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22
+ install -m 0644 kaddressbook/kaddressbook.desktop ${D}/${palmtopdir}/apps/1Pim/kaddressbook.desktop
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib
+ done
+
+ install -m 0755 ${S}/dest/kopi ${D}/${palmtopdir}/bin/kopi
+ install -m 0755 ${S}/dest/kapi ${D}/${palmtopdir}/bin/kapi
+
+ install -d ${D}/${bindir} ${D}/${libdir}
+ install -m 0755 ${S}/dest/kammu ${D}/${bindir}/kammu
+ oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}/${libdir}
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/plugins/applets
+ done
+}
+
+
+PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu"
+
+FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
+FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
+FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
+FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
+FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
+FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
+FILES_kammu = "${bindir}/kammu"
+FILES_libmicrokammu = "${libdir}/libmicrokammu*"
diff --git a/packages/kdepimpi/kdepimpi_1.9.16.bb b/packages/kdepimpi/kdepimpi_1.9.16.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/kdepimpi_1.9.16.bb
diff --git a/packages/kdepimpi/kdepimpi_cvs.bb b/packages/kdepimpi/kdepimpi_cvs.bb
index 7ad4736256..b520981d7c 100644
--- a/packages/kdepimpi/kdepimpi_cvs.bb
+++ b/packages/kdepimpi/kdepimpi_cvs.bb
@@ -1,4 +1,4 @@
-PV = "1.9.15+cvs-${CVSDATE}"
+PV = "1.9.16+cvs-${CVSDATE}"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index e69de29bb2..d2a0080285 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Stores accounts and passwords in an encrypted file."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Robert Anderson <rea@sr.unh.edu>"
+LICENSE = "GPL"
+DEPENDS = "gdbm"
+PR = "r2"
+
+SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz"
+S = "${WORKDIR}/Keyring"
+
+inherit palmtop
+
+QPEDIR = ${OPIEDIR}
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin \
+ ${D}/${palmtopdir}/apps/Applications \
+ ${D}/${palmtopdir}/pics/keyring
+ install -m 0755 keyring ${D}/${palmtopdir}/bin/
+ install -m 0644 keyring.desktop \
+ ${D}/${palmtopdir}/apps/Applications/
+ install -m 0644 ${S}/Keyring.png \
+ ${S}/keyring-pwlist.png \
+ ${D}/${palmtopdir}/pics/
+
+ # The following should appear in an assoicated DOC package.
+
+ install -d ${D}/${palmtopdir}/help/html
+ install -m 0644 ${S}/*.html ${D}/${palmtopdir}/help/html/
+}
+
+PACKAGES = "${PN} ${PN}-help"
+FILES_${PN} = " ${palmtopdir}/bin ${palmtopdir}/apps ${palmtopdir}/pics"
+FILES_${PN}-help = " ${palmtopdir}/help/html"
+
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/klibc/klibc.inc
diff --git a/packages/klibc/klibc_0.157.bb b/packages/klibc/klibc_0.157.bb
deleted file mode 100644
index d40c4963c5..0000000000
--- a/packages/klibc/klibc_0.157.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \
-use with initramfs. It is deliberately written for small size, \
-minimal entaglement, and portability, not speed."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-LICENSE ="BSD-ADV"
-SRC_URI = "http://www.kernel.org/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
-S = "${WORKDIR}/klibc-${PV}"
-
-# FIXME: This package fails to compile at the moment, and is missing a do_install()
-BROKEN = "1"
-
-EXTRA_OEMAKE = "'ARCH=${KLIBC_ARCH}' \
- 'CROSS=${TARGET_PREFIX}' \
- 'CC=${CC}' \
- 'LD=${LD}' \
- 'AR=${AR}' \
- 'RANLIB=${RANLIB}' \
- 'NM=${TARGET_PREFIX}nm' \
- 'STRIP=echo' \
- 'SHLIBDIR=/lib' \
- 'HOST_CC=${BUILD_CC}' \
- 'HOST_CFLAGS=${BUILD_CFLAGS}' \
- 'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
- 'HOST_LIBS=' \
- 'LDFLAGS=${LDFLAGS}' \
- 'WARNFLAGS=${CFLAGS}' \
- 'OPTFLAGS='"
-
-KLIBC_ARCH := '${TARGET_ARCH}'
-KLIBC_ARCH_armeb = 'arm'
-KLIBC_ARCH_mipsel = 'mips'
-
-CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)} -I${STAGING_KERNEL_DIR}/include"
diff --git a/packages/klibc/klibc_0.190.bb b/packages/klibc/klibc_0.190.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/klibc/klibc_0.190.bb
diff --git a/packages/lemon/lemon-native.bb b/packages/lemon/lemon-native.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lemon/lemon-native.bb
diff --git a/packages/lemon/lemon.bb b/packages/lemon/lemon.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lemon/lemon.bb
diff --git a/packages/lemon/lemon.inc b/packages/lemon/lemon.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lemon/lemon.inc
diff --git a/packages/libgpevtype/libgpevtype_0.6.bb b/packages/libgpevtype/libgpevtype_0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgpevtype/libgpevtype_0.6.bb
diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmatchbox/libmatchbox_svn.bb
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 9a5c372a98..1e59ed4e4f 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
DEPENDS = "libqpe-opie sqlite3 libpcap"
PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-PR = "r9"
+PR = "10"
PV = "1.1.8+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
@@ -105,7 +105,9 @@ do_install() {
done
}
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+PACKAGES = "libopie2-examples libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+
+FILES_libopie2-examples = "${palmtopdir}/bin"
FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
diff --git a/packages/libopietooth/libopietooth1_1.1.8.bb b/packages/libopietooth/libopietooth1_1.1.8.bb
index e69de29bb2..961ea8931e 100644
--- a/packages/libopietooth/libopietooth1_1.1.8.bb
+++ b/packages/libopietooth/libopietooth1_1.1.8.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Opie Bluetooth library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+DEPENDS = "libopie2"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
+
+inherit opie
+
+
+S = "${WORKDIR}/lib"
+
+do_stage() {
+ install -m 0644 *.h ${STAGING_INCDIR}/
+ oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
+}
+
+do_install() {
+ oe_libinstall -so libopietooth1 ${D}/${palmtopdir}/lib
+}
+
diff --git a/packages/libqpe/libqpe-opie_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.8.bb
index 0c12765d88..2dd3fe7703 100644
--- a/packages/libqpe/libqpe-opie_1.1.8.bb
+++ b/packages/libqpe/libqpe-opie_1.1.8.bb
@@ -9,8 +9,8 @@ PR = "r4"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://nomax.patch;patch=1;pnum=1 \
- file://resource.patch;patch=1;pnum=1"
+ file://nomax.patch;patch=1;pnum=1"
+
S = "${WORKDIR}/library"
inherit qmake
diff --git a/packages/librsvg/librsvg_2.6.5.bb b/packages/librsvg/librsvg_2.6.5.bb
index 6796b342af..59e8cecd28 100644
--- a/packages/librsvg/librsvg_2.6.5.bb
+++ b/packages/librsvg/librsvg_2.6.5.bb
@@ -1,8 +1,9 @@
+DESCRIPTION = "Library for rendering SVG files"
SECTION = "x11/utils"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "gtk+ libart-lgpl libxml2 popt"
-PR = "r2"
LICENSE = "LGPL"
+PR = "r3"
inherit autotools pkgconfig gnome
diff --git a/packages/libxine/libxine-opie_1.0.0-rc7.bb b/packages/libxine/libxine-opie_1.0.0-rc7.bb
index e69de29bb2..df3ca8e68f 100644
--- a/packages/libxine/libxine-opie_1.0.0-rc7.bb
+++ b/packages/libxine/libxine-opie_1.0.0-rc7.bb
@@ -0,0 +1,98 @@
+LICENSE = GPL
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine compiled for Opie"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg tremor libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-1-rc7"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz \
+ file://cpu-${PV}.patch;patch=1 \
+ file://configure-${PV}.patch;patch=1 \
+ file://demuxogg.patch;patch=1 \
+ file://fix-syntax.patch;patch=1 \
+ file://libxine-cut-memusage.patch;patch=1 \
+ file://libxine-ffmpeg-enable-arm.patch;patch=1 \
+ file://libxine-libvorbis.patch;patch=1 \
+ file://libxine-tremor-autoconf.patch;patch=1 \
+ file://mpegvideo-static-inlinine.patch;patch=1 \
+ file://libxine-arm-configure.patch;patch=1 \
+ file://fix-x.patch;patch=1 "
+
+
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-oggtest \
+ --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-altivec --disable-vis --disable-mlib \
+ --enable-shared --disable-static \
+ --disable-fb --disable-alsa --disable-vcd \
+ --disable-asf --disable-faad --disable-iconv \
+ --disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+ --without-v4l --without-arts --without-sdl \
+ --disable-dxr3 --without-xv --without-xvmc \
+ --without-xxmc --without-Xshm --without-x "
+
+do_compile() {
+ oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+ src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+ src/xine-utils/xine_buffer.h src/xine-engine/video_out.h \
+ src/xine-engine/buffer.h src/xine-engine/vo_scale.h \
+ src/xine-engine/configfile.h src/xine-utils/attributes.h \
+ src/xine-engine/info_helper.h src/xine-engine/scratch.h \
+ src/xine-engine/audio_decoder.h src/input/input_plugin.h \
+ src/xine-engine/spu_decoder.h src/xine-engine/audio_out.h \
+ src/xine-engine/io_helper.h src/xine-engine/video_decoder.h \
+ src/xine-engine/broadcaster.h src/xine-engine/metronom.h \
+ src/xine-utils/xmllexer.h src/xine-engine/osd.h \
+ src/xine-engine/video_overlay.h src/xine-utils/xmlparser.h \
+ src/xine-utils/compat.h src/xine-engine/plugin_catalog.h \
+ src/xine-engine/post.h src/demuxers/demux.h \
+ src/xine-engine/resample.h lib/os_types.h \
+ src/xine-engine/refcounter.h"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xine
+
+ install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+ for file in ${HEADERS}; do
+ cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+ done
+
+ oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+ plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
+ do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+ do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d)
+ do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/packages/libxine/libxine_1.0.0-rc7.bb b/packages/libxine/libxine_1.0.0-rc7.bb
index e69de29bb2..6b17b31578 100644
--- a/packages/libxine/libxine_1.0.0-rc7.bb
+++ b/packages/libxine/libxine_1.0.0-rc7.bb
@@ -0,0 +1,108 @@
+LICENSE = GPL
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+#FIXME: libxine doesn't build when X11 has been built before:
+#| In file included from video_out_dxr3.c:55:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:16: error: parse error before "Bool"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:17: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: type defaults to `int' in declaration of
+#`XineramaQueryExtension'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:22: error: parse error before "XineramaQueryVersion"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:23: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: type defaults to `int' in declaration of
+#`XineramaQueryVersion'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before "XineramaIsActive"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: type defaults to `int' in declaration of
+#`XineramaIsActive'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:41: error: parse error before '*' token
+#| In file included from /local/pkg/oe/collie/tmp/staging/arm-linux/include/inttypes.h:28,
+#| from ../../src/xine-engine/xine_internal.h:31,
+#| from video_out_dxr3.c:65:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/stdint.h:49: error: syntax error before "typedef"
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-1-rc7"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz \
+ file://cpu-${PV}.patch;patch=1 \
+ file://configure-${PV}.patch;patch=1"
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-oggtest \
+ --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-altivec --disable-vis --disable-mlib \
+ --enable-shared --disable-static \
+ --disable-fb --disable-alsa --disable-vcd \
+ --disable-asf --disable-faad --disable-iconv \
+ --disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+ --without-v4l --without-arts --without-sdl"
+
+do_compile() {
+ oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+ src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+ src/xine-utils/xine_buffer.h src/xine-engine/video_out.h \
+ src/xine-engine/buffer.h src/xine-engine/vo_scale.h \
+ src/xine-engine/configfile.h src/xine-utils/attributes.h \
+ src/xine-engine/info_helper.h src/xine-engine/scratch.h \
+ src/xine-engine/audio_decoder.h src/input/input_plugin.h \
+ src/xine-engine/spu_decoder.h src/xine-engine/audio_out.h \
+ src/xine-engine/io_helper.h src/xine-engine/video_decoder.h \
+ src/xine-engine/broadcaster.h src/xine-engine/metronom.h \
+ src/xine-utils/xmllexer.h src/xine-engine/osd.h \
+ src/xine-engine/video_overlay.h src/xine-utils/xmlparser.h \
+ src/xine-utils/compat.h src/xine-engine/plugin_catalog.h \
+ src/xine-engine/post.h src/demuxers/demux.h \
+ src/xine-engine/resample.h lib/os_types.h \
+ src/xine-engine/refcounter.h"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xine
+
+ install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+ for file in ${HEADERS}; do
+ cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+ done
+
+ oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+ plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
+ do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+ do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d)
+ do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/packages/linux/openzaurus-2.6.10/defconfig-husky b/packages/linux/openzaurus-2.6.10/defconfig-husky
deleted file mode 100644
index d49f760e47..0000000000
--- a/packages/linux/openzaurus-2.6.10/defconfig-husky
+++ /dev/null
@@ -1,917 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-rc2-rp1
-# Mon Dec 20 13:01:33 2004
-#
-CONFIG_ARM=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_IOMAP=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_L7200 is not set
-CONFIG_ARCH_PXA=y
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-
-#
-# Intel PXA2xx Implementations
-#
-# CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_ARCH_PXA_IDP is not set
-# CONFIG_MACH_POODLE is not set
-# CONFIG_MACH_CORGI is not set
-# CONFIG_MACH_SHEPHERD is not set
-CONFIG_MACH_HUSKY=y
-# CONFIG_SHARP_LOCOMO is not set
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA25x=y
-CONFIG_SHARP_SCOOP=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_XSCALE=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-CONFIG_XSCALE_PMU=y
-
-#
-# General setup
-#
-# CONFIG_ZBOOT_ROM is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_XIP_KERNEL is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_OBSOLETE is not set
-CONFIG_PCMCIA=y
-
-#
-# PC-card bridges
-#
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_PXA2XX=y
-
-#
-# At least one math emulation must be selected
-#
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_PM=y
-CONFIG_PREEMPT=y
-CONFIG_APM=y
-# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="console=tty0 console=ttyS0,115200n8 noinitrd debug root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) mem=64M"
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_SHARP_SL=y
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=y
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_SMC91X is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-CONFIG_PPP=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_BSDCOMP=y
-# CONFIG_PPPOE is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-
-#
-# Fusion MPT device support
-#
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_TSDEV=y
-CONFIG_INPUT_TSDEV_SCREEN_X=640
-CONFIG_INPUT_TSDEV_SCREEN_Y=480
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_RAW is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_CORGI=y
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-# CONFIG_I2C_CHARDEV is not set
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ISA=m
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Hardware Sensors Chip support
-#
-# CONFIG_I2C_SENSOR is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-
-#
-# Other I2C Chip support
-#
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-CONFIG_I2C_DEBUG_CORE=y
-CONFIG_I2C_DEBUG_ALGO=y
-CONFIG_I2C_DEBUG_BUS=y
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-
-#
-# Radio Adapters
-#
-# CONFIG_RADIO_MAESTRO is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_ROMFS_FS=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_NAND=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_CRAMFS=y
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_EXPORTFS is not set
-CONFIG_SMB_FS=y
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_PXA is not set
-CONFIG_FB_W100=y
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_LCD_CLASS_DEVICE=n
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# Misc devices
-#
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-
-#
-# USB Gadget Support
-#
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-CONFIG_USB_GADGET_PXA2XX=y
-CONFIG_USB_PXA2XX=y
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_SA1100 is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-
-#
-# MMC/SD Card support
-#
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_PXA=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_ICEDCC is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_CRC_CCITT=y
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-
diff --git a/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch b/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch
diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-collie b/packages/linux/openzaurus-2.6.11-rc1/defconfig-collie
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-collie
diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky b/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky
diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6 b/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6
diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-poodle b/packages/linux/openzaurus-2.6.11-rc1/defconfig-poodle
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-poodle
diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/fix_tosa_apm.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/fix_tosa_apm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/fix_tosa_apm.patch
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
index ad04cd19b6..5028f40647 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
@@ -5,7 +5,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20031107"
-PR = "r29"
+PR = "r30"
DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -36,7 +36,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
file://keymap-more-sane.patch;patch=1 \
file://mkdep.patch;patch=1 \
file://disable-pcmcia-probe.patch;patch=1 \
- file://deviceinfo.patch;patch=1 \
+ file://deviceinfo.patch;patch=1 \
file://linux-2.4.18-list_move.patch;patch=1 \
file://tosa_map.patch;patch=1 \
file://tosa_ts.patch;patch=1 \
@@ -45,9 +45,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
file://1764-1.patch;patch=1 \
file://module_licence.patch;patch=1 \
- http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
- file://defconfig-${MACHINE} \
- http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz "
+ http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
+ file://defconfig-${MACHINE} \
+ http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \
+ file://fix_tosa_apm.patch;patch=1 "
SRC_URI_append_poodle += " file://smallfonts.diff;patch=1"
# apply this when we have a kernel that builds with gcc 3.x:
diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
deleted file mode 100644
index 3e3459f582..0000000000
--- a/packages/linux/openzaurus_2.6.10.bb
+++ /dev/null
@@ -1,125 +0,0 @@
-DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices."
-SECTION = "kernel"
-MAINTAINER = "Richard Purdie <rp@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
-LICENSE = "GPL"
-#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
-KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r2"
-
-#SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
-# http://www.cs.wisc.edu/~lenz/zaurus/files/patch-2.6.7-jl1.diff.gz;patch=1 \
-# http://www.rpsys.net/openzaurus/${KV}/jl1/localversion.patch;patch=1 \
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.gz \
-http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_devices.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_lcd.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/collie_uart.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/collie_batswitch.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/collie_pcmcia.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_base-r8.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_ssp-r4.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/w100-r14.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r3.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_map-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r4.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r6.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_param-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r3.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_power-r3.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/fb_blank-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/sharpsl_head_asm-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/sharpsl_pcmcia-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/arm_scoop-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/class_backlight-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
-file://defconfig-husky \
-file://defconfig-collie \
-file://defconfig-poodle \
-file://defconfig-openzaurus-pxa-2.6 "
-
-SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
-SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
-SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1"
-
-
-S = "${WORKDIR}/linux-${KV}"
-
-inherit kernel
-
-#
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-FILES_kernel = ""
-ALLOW_EMPTY = 1
-
-EXTRA_OEMAKE = ""
-COMPATIBLE_HOST = "arm.*-linux"
-
-#
-# Create the kernel command line.
-#
-#CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)"
-#CMDLINE_MTDPARTS_corgi = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
-#CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
-#CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)"
-#CMDLINE_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2"
-
-#CMDLINE_MEM_husky = "mem=64M"
-
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
-CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
-
-# configure memory/ramdisk split on collie
-export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
-export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
-
-CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MTDPARTS} ${CMDLINE_MEM}"
-
-do_configure() {
-
- install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-
- if [ "${MACHINE}" == "collie" ]
- then
- mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
- rdsize=`echo "$rd * 1024" | bc`
- total=`expr $mem + $rd`
- addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
- if [ "$rd" == "0" ]
- then
- echo "No RAMDISK"
- echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
- else
- echo "RAMDIR = $rdsize on $addr"
- echo "CONFIG_MTD_MTDRAM_SA1100=y" >> ${S}/.config
- echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize" >> ${S}/.config
- echo "CONFIG_MTDRAM_ERASE_SIZE=1" >> ${S}/.config
- echo "CONFIG_MTDRAM_ABS_POS=$addr" >> ${S}/.config
- fi
-
- fi
- echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
- yes '' | oe_runmake oldconfig
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR}/images
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus_2.6.11-rc1.bb
diff --git a/packages/lxt/lxt_1.0.bb b/packages/lxt/lxt_1.0.bb
index e69de29bb2..a72df24c95 100644
--- a/packages/lxt/lxt_1.0.bb
+++ b/packages/lxt/lxt_1.0.bb
@@ -0,0 +1,16 @@
+LICENSE = GPL
+SECTION = "console/utils"
+DESCRIPTION = "lxt ncurses filemanager xtree clone"
+PRIORITY = "optional"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+DEPENDS = "ncurses"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/lxt-1.0"
+
+SRC_URI = "http://www.xtreefanpage.org/download/lxt-1.0.tgz \
+ file://lxt.patch;patch=1"
+S = "${WORKDIR}/lxt"
+
+do_install() {
+ install -d ${D}/${bindir}/
+ install -m 755 -D ${S}/lxt ${D}/${bindir}/lxt
+}
diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb
diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel_svn.bb
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
diff --git a/packages/mbmerlin/mbmerlin_0.8.1-2.bb b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
index e69de29bb2..a79949f0b1 100644
--- a/packages/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -0,0 +1,18 @@
+LICENSE = GPL
+PR = "r3"
+
+inherit pkgconfig gpe
+
+DEPENDS = "virtual/xserver libxft startup-notification"
+
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/mbmerlin ${datadir}/applications"
+FILES_${PN} += " ${datadir}/pixmaps"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+ file://fix_makefile.patch;patch=1"
+
+S = "${WORKDIR}/mbmerlin"
+
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index ec4d225b78..a042032422 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -5,7 +5,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D
FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
-PR = "r9"
+PR = "r10"
export IMAGE_BASENAME = "gpe-image"
@@ -18,11 +18,11 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-e
#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
+GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
+GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
GPE_EXTRA_DEPENDS_none = ""
GPE_EXTRA_INSTALL_none = ""
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index bfc7e043bc..60a11fc590 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r33"
+PR = "r34"
ALLOW_EMPTY = 1
@@ -49,8 +49,7 @@ gpe-task-pim = "\
gpe-calendar \
gpe-sketchbook \
gpe-contacts \
- gpe-today \
- figment"
+ gpe-today"
RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
DEPENDS += " ${gpe-task-pim}"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 87c12b8f60..0f745831a2 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -59,7 +59,7 @@ opie-suspendapplet \
opie-vmemo \
opie-volumeapplet \
opie-vtapplet \
-opie-zkbapplet \
+opie-zkbapplet \
"
RDEPENDS_task-opie-applets = "${task-opie-applets}"
DEPENDS += " ${task-opie-applets}"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 66b1037380..7bfcae10f9 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -82,8 +82,10 @@ gpe-task-apps = "\
btscanner \
curl \
dsniff \
- kismet \
prismstumbler \
+ prismstumbler-frontend \
+ dillo \
+ tcpdump \
miniclipboard"
RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index cac48d56b1..9ecd2b92f1 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -4,6 +4,7 @@ bash \
bridge-utils \
busybox \
chillispot \
+dash \
db3 \
ddclient \
dhcp-forwarder \
@@ -76,6 +77,7 @@ usbutils \
vtun \
wireless-tools \
wlan-ng-modules \
+yamonenv \
zlib \
"
diff --git a/packages/meta/nylon-image-base.bb b/packages/meta/nylon-image-base.bb
index 742ce0db74..dbcd9a91eb 100644
--- a/packages/meta/nylon-image-base.bb
+++ b/packages/meta/nylon-image-base.bb
@@ -7,7 +7,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \
openssh sysvinit \
timezones tinylogin"
-DEPENDS = "virtual/kernel \
+DEPENDS = "virtual/kernel \
${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
RDEPENDS = "kernel modutils-depmod modutils-modinfo \
diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb
index 1cd0853678..9b712ba358 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/meta/nylon-image-standard.bb
@@ -18,7 +18,7 @@ NYLON_STANDARD = "\
usbutils \
wireless-tools"
-DEPENDS += "hostap-modules ntp \
+DEPENDS += "hostap-modules ntp \
${NYLON_STANDARD}"
RDEPENDS += "hostap-modules-pci ntpdate \
diff --git a/packages/misc-binary-only/prism3-firmware_1.8.3.bb b/packages/misc-binary-only/prism3-firmware_1.8.3.bb
index e69de29bb2..b5d87f3184 100644
--- a/packages/misc-binary-only/prism3-firmware_1.8.3.bb
+++ b/packages/misc-binary-only/prism3-firmware_1.8.3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Firmware for the Prism3 cards"
+SECTION = "base"
+LICENSE = "Unknown"
+PR = "r2"
+
+SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.gz \
+ http://www.red-bean.com/~proski/firmware/primary.tar.gz"
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${sysconfdir}/pcmcia/
+ install -m 0644 primary/pm010102.hex ${D}/${sysconfdir}/pcmcia/
+ install -m 0644 1.8.3/rf010803.hex ${D}/${sysconfdir}/pcmcia/
+ cat >${D}/${sysconfdir}/pcmcia/README.prism3-firmware <<EOF
+To make a prism3 card w/ downloadable firmware work, do the following:
+ 0.) Install hostap-utils
+ 1.) Add "needs_reset yes" and "needs_firmware hostap_fw_load" to
+ the proper interface in /etc/network/interfaces
+ 2.) echo -e "#!/bin/sh\nifdown wlan0" >> /etc/apm/suspend.d/ifdown
+ 3.) chmod a+rx /etc/apm/suspend.d/ifdown
+ 4.) echo -e "#!/bin/sh\nifup wlan0" >> /etc/apm/resume.d/ifup
+ 5.) chmod a+rx /etc/apm/suspend.d/ifup
+EOF
+}
diff --git a/packages/module-init-tools/module-init-tools_3.1-pre5.bb b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
index 1fc882ac56..ff8b4d5b60 100644
--- a/packages/module-init-tools/module-init-tools_3.1-pre5.bb
+++ b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
@@ -3,7 +3,7 @@ SECTION = "base"
DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
removing kernel modules for Linux (versions 2.5.48 and above). It serves \
the same function that the modutils package serves for Linux 2.4."
-PR = "r5"
+PR = "r6"
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -47,10 +47,10 @@ done
pkg_postinst_module-init-tools-depmod() {
#!/bin/sh
-update-alternatives --install /sbin/depmod depmod.26 /sbin/depmod.26 20
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
}
pkg_prerm_module-init-tools() {
#!/bin/sh
-update-alternatives --remove depmod /sbin/debmod.26
+update-alternatives --remove depmod /sbin/depmod.26
}
diff --git a/packages/netbase/netbase/colinux/interfaces b/packages/netbase/netbase/colinux/interfaces
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/colinux/interfaces
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index 7768ea298a..4afec0ff74 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -17,3 +17,9 @@ iface eth1 inet dhcp
# Zaurus usbnet
iface usbd0 inet dhcp
+# iPAQ usbnet
+iface usbf inet dhcp
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
diff --git a/packages/netbase/netbase_4.19.bb b/packages/netbase/netbase_4.19.bb
index 3e59ab5c55..525ba4e4ad 100644
--- a/packages/netbase/netbase_4.19.bb
+++ b/packages/netbase/netbase_4.19.bb
@@ -2,7 +2,7 @@ SECTION = "base"
DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
inherit update-rc.d
@@ -34,4 +34,4 @@ do_install () {
install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
}
-CONFFILES_${PN}_nylon = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
+CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
diff --git a/packages/nonworking/kgrok/files/mediabutton.patch b/packages/nonworking/kgrok/files/mediabutton.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/kgrok/files/mediabutton.patch
diff --git a/packages/nonworking/kgrok/files/parser_yacc.cpp b/packages/nonworking/kgrok/files/parser_yacc.cpp
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/kgrok/files/parser_yacc.cpp
diff --git a/packages/nonworking/kgrok/files/parser_yacc.h b/packages/nonworking/kgrok/files/parser_yacc.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/kgrok/files/parser_yacc.h
diff --git a/packages/nonworking/kgrok/kgrok_1.5.bb b/packages/nonworking/kgrok/kgrok_1.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/kgrok/kgrok_1.5.bb
diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nylon/yamonenv.bb
diff --git a/packages/opencvs/files/linux.patch b/packages/opencvs/files/linux.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opencvs/files/linux.patch
diff --git a/packages/opencvs/opencvs_cvs.bb b/packages/opencvs/opencvs_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opencvs/opencvs_cvs.bb
diff --git a/packages/openntpd/files/autofoo.patch b/packages/openntpd/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openntpd/files/autofoo.patch
diff --git a/packages/openntpd/openntpd_3.6.1p1.bb b/packages/openntpd/openntpd_3.6.1p1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openntpd/openntpd_3.6.1p1.bb
diff --git a/packages/opie-i18n/opie-i18n_1.1.8.bb b/packages/opie-i18n/opie-i18n_1.1.8.bb
index e69de29bb2..336a162906 100644
--- a/packages/opie-i18n/opie-i18n_1.1.8.bb
+++ b/packages/opie-i18n/opie-i18n_1.1.8.bb
@@ -0,0 +1,67 @@
+DESCRIPTION = "Opie i18n files"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-lrelease-native"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict"
+S = "${WORKDIR}/i18n"
+
+do_compile() {
+ for f in ?? ??_??
+ do
+ cd ${S}/$f
+ for g in *.ts
+ do
+ opie-lrelease $g
+ done
+ done
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/i18n/
+ install -d ${D}${palmtopdir}/etc/dict/
+ for f in ?? ??_??
+ do
+ echo Installing language $f
+ install -d ${D}${palmtopdir}/i18n/$f/
+ install -m 0644 $f/.directory ${D}${palmtopdir}/i18n/$f/
+ install -m 0644 $f/*.qm ${D}${palmtopdir}/i18n/$f/
+ if [ -e ${WORKDIR}/dict/dawg.$f ]
+ then
+ install -m 0644 ${WORKDIR}/dict/dawg.$f ${D}${palmtopdir}/etc/dict/
+ fi
+ done
+}
+
+PACKAGES = " opie-i18n-cz opie-i18n-da opie-i18n-de opie-i18n-dk opie-i18n-en opie-i18n-es opie-i18n-fr opie-i18n-hu \
+ opie-i18n-it opie-i18n-ja opie-i18n-ko opie-i18n-lv opie-i18n-mk opie-i18n-nl opie-i18n-no opie-i18n-pl \
+ opie-i18n-pt opie-i18n-pt-br opie-i18n-ru opie-i18n-sl opie-i18n-xx opie-i18n-zh-cn opie-i18n-zh-tw "
+
+FILES_opie-i18n-cz = "${palmtopdir}/i18n/cz ${palmtopdir}/etc/dict/dawg.cz"
+FILES_opie-i18n-da = "${palmtopdir}/i18n/da ${palmtopdir}/etc/dict/dawg.da"
+FILES_opie-i18n-de = "${palmtopdir}/i18n/de ${palmtopdir}/etc/dict/dawg.de"
+FILES_opie-i18n-dk = "${palmtopdir}/i18n/dk ${palmtopdir}/etc/dict/dawg.dk"
+FILES_opie-i18n-en = "${palmtopdir}/i18n/en ${palmtopdir}/etc/dict/dawg.en"
+FILES_opie-i18n-es = "${palmtopdir}/i18n/es ${palmtopdir}/etc/dict/dawg.es"
+FILES_opie-i18n-fr = "${palmtopdir}/i18n/fr ${palmtopdir}/etc/dict/dawg.fr"
+FILES_opie-i18n-hu = "${palmtopdir}/i18n/hu ${palmtopdir}/etc/dict/dawg.hu"
+FILES_opie-i18n-it = "${palmtopdir}/i18n/it ${palmtopdir}/etc/dict/dawg.it"
+FILES_opie-i18n-ja = "${palmtopdir}/i18n/ja ${palmtopdir}/etc/dict/dawg.ja"
+FILES_opie-i18n-ko = "${palmtopdir}/i18n/ko ${palmtopdir}/etc/dict/dawg.ko"
+FILES_opie-i18n-lv = "${palmtopdir}/i18n/lv ${palmtopdir}/etc/dict/dawg.lv"
+FILES_opie-i18n-mk = "${palmtopdir}/i18n/mk ${palmtopdir}/etc/dict/dawg.mk"
+FILES_opie-i18n-nl = "${palmtopdir}/i18n/nl ${palmtopdir}/etc/dict/dawg.nl"
+FILES_opie-i18n-no = "${palmtopdir}/i18n/no ${palmtopdir}/etc/dict/dawg.no"
+FILES_opie-i18n-pl = "${palmtopdir}/i18n/pl ${palmtopdir}/etc/dict/dawg.pl"
+FILES_opie-i18n-pt = "${palmtopdir}/i18n/pt ${palmtopdir}/etc/dict/dawg.pt"
+FILES_opie-i18n-pt-br = "${palmtopdir}/i18n/pt_BR ${palmtopdir}/etc/dict/dawg.pt_BR"
+FILES_opie-i18n-ru = "${palmtopdir}/i18n/ru ${palmtopdir}/etc/dict/dawg.ru"
+FILES_opie-i18n-sl = "${palmtopdir}/i18n/sl ${palmtopdir}/etc/dict/dawg.sl"
+FILES_opie-i18n-xx = "${palmtopdir}/i18n/xx ${palmtopdir}/etc/dict/dawg.xx"
+FILES_opie-i18n-zh-cn = "${palmtopdir}/i18n/zh_CN ${palmtopdir}/etc/dict/dawg.zh_CN"
+FILES_opie-i18n-zh-tw = "${palmtopdir}/i18n/zh_TW ${palmtopdir}/etc/dict/dawg.zh_TW"
+
diff --git a/packages/opie-keytabs/opie-keytabs_1.1.8.bb b/packages/opie-keytabs/opie-keytabs_1.1.8.bb
index e69de29bb2..f08dfc5a91 100644
--- a/packages/opie-keytabs/opie-keytabs_1.1.8.bb
+++ b/packages/opie-keytabs/opie-keytabs_1.1.8.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Opie keytabs for terminal applications"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie-devel@handhelds.org>"
+DEPENDS = "virtual/libqpe"
+APPTYPE = "binary"
+PR = "r1"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc "
+
+do_install() {
+ install -d ${D}${palmtopdir}/etc/keytabs/
+ install -m 0644 ${WORKDIR}/etc/keytabs/*.* ${D}${palmtopdir}/etc/keytabs/
+}
+
+FILES_${PN} = "${palmtopdir}/etc/keytabs/*"
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index a82c60f220..27a0c69ff8 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -3,13 +3,13 @@ SECTION = "opie/base"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libqpe"
+MAINTAINER = "Team Opie <opie-devel@handhelds.org>"
PV = "1.1.8+cvs-${CVSDATE}"
APPTYPE = "binary"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/etc "
-$palmtopdir = "/opt/QtPalmtop/"
-
do_install() {
install -d ${D}${palmtopdir}/etc/keytabs/
install -m 0644 ${WORKDIR}/etc/keytabs/*.* ${D}${palmtopdir}/etc/keytabs/
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index a18d187daa..c8cfb35d2b 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>
+MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
DESCRIPTION = "Displays a list of available ROMs for use with snes9x."
SECTION = "opie/shell"
PRIORITY = "optional"
diff --git a/packages/opie-sounds/opie-sounds_1.1.8.bb b/packages/opie-sounds/opie-sounds_1.1.8.bb
index e69de29bb2..b02434f001 100644
--- a/packages/opie-sounds/opie-sounds_1.1.8.bb
+++ b/packages/opie-sounds/opie-sounds_1.1.8.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Common Opie Sounds"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};module=opie/sounds;tag=${TAG}"
+S = "${WORKDIR}/sounds"
+
+SOUNDS = "alarm touchsound keysound"
+
+do_install() {
+ install -d ${D}${palmtopdir}/sounds/
+ for i in ${SOUNDS}
+ do
+ install $i.wav ${D}${palmtopdir}/sounds/$i.wav
+ done
+}
+
+FILES_${PN} = "${palmtopdir}"
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
index e69de29bb2..ed0426f3ca 100644
--- a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
+++ b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root
+[ -z $HOME ] && export HOME=/$LOGNAME
+
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+# FIXME: add check for qt version here. the statement above applies to qt >=2.3.9
+# export QWS_KEYBOARD=KernelTTY
+
+export QWS_DISPLAY=Transformed:Rot0:0
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
+ echo Opie not installed
+ exit 0
+fi
+
+. /etc/profile
+
+if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
+ echo "Copying default qpe.conf into $HOME/Settings/"
+ mkdir -p $HOME/Settings/
+ cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf
+fi
+
+if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then
+ cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf
+fi
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+ mkdir -p $HOME/systeminfo/
+ echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+ ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+if [ ! -e "/home/root" ] ; then
+ ln -sf /root /home
+fi
+
+case $1 in
+'start')
+ /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+
+ if [ -x "$OPIEDIR/bin/opie-login" ]; then
+ echo Starting Opie-login....
+ $OPIEDIR/bin/opie-login -terminal 2
+ else
+ $OPIEDIR/bin/opie-reorgfiles
+ if [ -x /usr/bin/ssh-agent ]; then
+ SSHAGENT=/usr/bin/ssh-agent
+ else
+ SSHAGENT=""
+ fi
+
+ if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+ export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+ fi
+ echo Starting Opie....
+ $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+ fi
+
+ ;;
+
+'stop')
+ echo "Stopping Opie..."
+ killall qpe
+ killall opie-login
+ killall quicklauncher
+
+ ;;
+
+'restart')
+ $0 stop && $0 start
+
+ ;;
+
+*)
+ echo "usage: $0 { start | stop | restart }"
+
+ ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.8.bb b/packages/opie-taskbar/opie-taskbar_1.1.8.bb
index e69de29bb2..3ca5b2902b 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.8.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.8.bb
@@ -0,0 +1,133 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+DEPENDS = "opie-libqrsync"
+PR = "r3"
+APPNAME = "qpe"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+ file://nomax.patch;patch=1;pnum=3 \
+ file://server.pro-1.1.8 \
+ file://opie-reorgfiles \
+ file://opie \
+ file://qpe.conf \
+ file://opie_defaults"
+
+S = "${WORKDIR}/launcher"
+
+CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+
+# Caps/Numlock icons for devices with keyboard
+EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE = ""
+PIXMAP_SIZE_shepherd = "-640x480"
+PIXMAP_SIZE_corgi = "-640x480"
+PIXMAP_SIZE_husky = "-640x480"
+# PIXMAP_SIZE_tosa = "-640x480"
+PIXMAP_SIZE_simpad = "-800x600"
+
+inherit opie update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure_prepend() {
+ ln -s ${WORKDIR}/calibrate ${S}/calibrate
+ ln -s ${WORKDIR}/mediummount ${S}/mediummount
+ install -m 0644 ${WORKDIR}/server.pro-1.1.8 ${S}/server.pro
+}
+
+do_stage() {
+ install obexinterface.h ${STAGING_INCDIR}/
+
+}
+
+SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin
+ for i in ${SECTIONS}
+ do
+ install -d ${D}/${palmtopdir}/apps/$i/
+ install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+ done
+ install -d ${D}/${palmtopdir}/pics/launcher
+ install -d ${D}/${palmtopdir}/pics/logo
+ install -d ${D}/${palmtopdir}/pics/RoH/star/
+ install -d ${D}/etc/init.d
+ install -d ${D}/etc/profile.d
+ install -d ${D}/${palmtopdir}/etc/colors
+ install -d ${D}/${palmtopdir}/etc/skel
+
+ install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
+ install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
+ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
+ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+ install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+
+ for p in ${PICS}
+ do
+ install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+ done
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
+ install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+ install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+
+ install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
+ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
+ install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+ install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+}
+
+# These two should be installed only on devices with keyboard
+do_install_append_collie () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_poodle () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_corgi () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_shepherd () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_husky () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_tosa () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
+FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 5488c7b148..acc566271f 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "opie-libqrsync"
PV = "1.1.8+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
APPNAME = "qpe"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index ab99ff28c6..2e289a7480 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -4,12 +4,13 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
file://crosscompile.patch;patch=1 \
file://monitor-${PV}.patch;patch=1 \
- file://spectrum*"
+ file://spectrum* \
+ file://orinoco_cs.conf"
S = "${WORKDIR}/orinoco-${PV}"
inherit module
@@ -18,17 +19,24 @@ do_compile_prepend() {
cp -f ${WORKDIR}/spectrum* ${S}/
}
-do_install() {
- install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+do_install() {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
install -d ${D}/etc/pcmcia
- install -m 0644 *.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/
- install -m 0644 spectrum.conf ${D}/etc/pcmcia/
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
install -m 0644 hermes.conf ${D}/etc/pcmcia/
-
- # if PCI is disabled, don't ship the PCI modules
- if grep -q '#undef \+CONFIG_PCI' ${STAGING_KERNEL_DIR}/include/linux/autoconf.h; then
- for f in plx pci tmd; do
- rm -f ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/orinoco_$f.o
- done
- fi
+ install -d ${D}/etc/modutils
+ install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
}
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+ /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index e69de29bb2..3174ca094f 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r3"
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
+ file://list-move.patch;patch=1 \
+ file://spectrum-firmware.patch;patch=1 \
+ file://spectrum.conf \
+ file://spectrum_fw.h \
+ file://orinoco_cs.conf"
+S = "${WORKDIR}/orinoco-${PV}"
+
+inherit module
+
+do_compile_prepend() {
+ install ${WORKDIR}/spectrum_fw.h ${S}/
+}
+
+do_install() {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -d ${D}/etc/pcmcia
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
+ install -m 0644 hermes.conf ${D}/etc/pcmcia/
+ install -d ${D}/etc/modutils
+ install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+}
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+ /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index ba814e2e4d..26cb60473e 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
PROVIDES = "spectrum-modules"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
# seems to cause problems on arm
DEFAULT_PREFERENCE_arm = "-1"
@@ -26,13 +26,24 @@ do_compile_prepend() {
install ${WORKDIR}/spectrum_fw.h ${S}/
}
-do_install() {
- install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+do_install() {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
install -d ${D}/etc/pcmcia
- install -m 0644 *.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
install -m 0644 hermes.conf ${D}/etc/pcmcia/
- install -d ${D}/etc/modutils
- install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+ install -d ${D}/etc/modutils
+ install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
}
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+ /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_20050101.bb b/packages/orinoco/orinoco-modules_20050101.bb
index e69de29bb2..26f6aef33c 100644
--- a/packages/orinoco/orinoco-modules_20050101.bb
+++ b/packages/orinoco/orinoco-modules_20050101.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+PROVIDES = "spectrum-modules"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+CVSDATE = "${PV}"
+PR = "r1"
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+# doesnt help :(
+export EXTRACFLAGS = "-mstructure-size-boundary=32"
+
+SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=ext;rsh=ssh \
+ file://list-move.patch;patch=1 \
+ file://spectrum-firmware.patch;patch=1 \
+ file://spectrum.conf \
+ file://spectrum_fw.h \
+ file://orinoco_cs.conf"
+S = "${WORKDIR}/orinoco"
+
+inherit module
+
+do_compile_prepend() {
+ install ${WORKDIR}/spectrum_fw.h ${S}/
+}
+
+do_install() {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -d ${D}/etc/pcmcia
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+ install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
+ install -m 0644 hermes.conf ${D}/etc/pcmcia/
+ install -d ${D}/etc/modutils
+ install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+}
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+ /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 2553d9c6b3..d170611c5a 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,12 +3,7 @@ SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-PR = "r12"
-
-PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"
-
-FILES_${PN}-ftl = "/sbin/ftl_format /sbin/ftl_check /etc/pcmcia/ftl*"
-FILES_${PN}-pcinitrd = "/sbin/pcinitrd"
+PR = "r13"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://busybox.patch;patch=1 \
@@ -58,7 +53,8 @@ do_compile() {
}
INSTALL_ETC = "ftl ide ieee1394 memory network parport scsi serial wireless"
-INSTALL_ETC_DATA = "config config.opts ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
+INSTALL_ETC_DATA = "config config.opts ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
+INSTALL_ETC_DATA_arm = "config ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
do_install() {
install -d ${D}/${sbindir}
@@ -89,4 +85,9 @@ do_install() {
install -m 0755 ${WORKDIR}/pcmcia ${D}/${sysconfdir}/sysconfig/pcmcia
}
+PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"
+
FILES_${PN} = "${sbindir} ${sysconfdir}"
+FILES_${PN}-ftl = "/sbin/ftl_format /sbin/ftl_check /etc/pcmcia/ftl*"
+FILES_${PN}-pcinitrd = "/sbin/pcinitrd"
+
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index b36fd2c176..0d8ad6c323 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
DESCRIPTION = "Metakit is an efficient embedded database library with a small \
footprint. It fills the gap between flat-file, relational, object-oriented, and \
-tree-structured databases, supporting relational joins, serialization, nested structures,\
+tree-structured databases, supporting relational joins, serialization, nested structures,\
and instant schema evolution."
LICENSE = "MetaKit"
HOMEPAGE = "http://www.equi4.com/metakit.html"
diff --git a/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch b/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index 15b94f6173..c17f5c85a8 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL QPL"
DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
file://qpe.patch;patch=1 \
@@ -17,6 +17,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
file://encoding.patch;patch=1 \
file://fix-qgfxraster.patch;patch=1 \
file://qt-visibility.patch;patch=1 \
+ file://fix-mouse-release.patch;patch=1 \
file://update-qtfontdir \
file://sharp_char.h \
file://switches.h "
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index e69de29bb2..74d9d4cd81 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "x11 openssl"
+HOMEPAGE = "http://www.rdesktop.org"
+SECTION = "x11/network"
+MAINTAINER = "Adrian Davey <ade@beth2.org>"
+LICENSE = "GPL"
+PV = "1.3.1cvs${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
+S = "${WORKDIR}/rdesktop"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+
diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb
index 3e09e2d86f..4512e2c691 100644
--- a/packages/rosetta/rosetta_cvs.bb
+++ b/packages/rosetta/rosetta_cvs.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
SRC_URI = "${HANDHELDS_CVS};module=rosetta \
file://rosetta-makefile.patch;patch=1"
S = "${WORKDIR}/rosetta"
-PR = "r3"
+PR = "r4"
inherit pkgconfig
@@ -17,7 +17,7 @@ do_install () {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
}
-do_postinst () {
+pkg_postinst () {
if test "x$D" != "x"; then
exit 1
else
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index c69167b611..7d996d81f1 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -4,8 +4,7 @@ LICENSE = "GPL"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-FILES_${PN} += "/sbin /bin"
-PR = "r3"
+PR = "r4"
# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
@@ -26,6 +25,18 @@ SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz
S = "${WORKDIR}/sysvinit-2.85"
B = "${S}/src"
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "init"
+ALTERNATIVE_LINK = "/sbin/init"
+ALTERNATIVE_PATH = "/sbin/init.sysvinit"
+ALTERNATIVE_PRIORITY = "50"
+
+PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
+FILES_${PN} += "/sbin /bin"
+FILES_sysvinit-pidof = "/bin/pidof"
+FILES_sysvinit-sulogin = "/sbin/sulogin"
+
CFLAGS_prepend = "-D_GNU_SOURCE "
export LCRYPT = "-lcrypt"
EXTRA_OEMAKE += "'INSTALL=install' \
@@ -86,15 +97,3 @@ do_install_append_ramses () {
v1:2345:respawn:/sbin/getty -L 115200 vc/1
EOF
}
-
-pkg_postinstall_sysvinit () {
- update-alternatives --install /sbin/init init /sbin/init.sysvinit 50
-}
-
-pkg_postrm_sysvinit () {
- update-alternatives --remove init /sbin/init.sysvinit
-}
-
-PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
-FILES_sysvinit-pidof = "/bin/pidof"
-FILES_sysvinit-sulogin = "/sbin/sulogin"
diff --git a/packages/tremor/tremor_20021126.bb b/packages/tremor/tremor_20021126.bb
index e69de29bb2..614387bb31 100644
--- a/packages/tremor/tremor_20021126.bb
+++ b/packages/tremor/tremor_20021126.bb
@@ -0,0 +1,27 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libogg"
+DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
+LICENSE = "BSD"
+CVSDATE = "${PV}"
+
+SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4120;proto=http"
+
+S = "${WORKDIR}/Tremor"
+
+inherit autotools
+
+EXTRA_OECONF=" --enable-shared --disable-rpath "
+
+#do_configure_prepend() {
+# ./autogen.sh
+#}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR}/tremor \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb
index e69de29bb2..00145120e0 100644
--- a/packages/tremor/tremor_20041119.bb
+++ b/packages/tremor/tremor_20041119.bb
@@ -0,0 +1,28 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libogg"
+DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
+LICENSE = "BSD"
+CVSDATE = "${PV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
+
+S = "${WORKDIR}/Tremor"
+
+inherit autotools
+
+EXTRA_OECONF=" --enable-shared --disable-rpath "
+
+#do_configure_prepend() {
+# ./autogen.sh
+#}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR}/tremor \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb
index e69de29bb2..b7e1576ea2 100644
--- a/packages/tremor/tremor_svn.bb
+++ b/packages/tremor/tremor_svn.bb
@@ -0,0 +1,29 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libogg"
+DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
+PV = "svn-${CVSDATE}"
+LICENSE = "BSD"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;proto=http"
+
+S = "${WORKDIR}/Tremor"
+
+inherit autotools
+
+EXTRA_OECONF=" --enable-shared --disable-rpath "
+
+#do_configure_prepend() {
+# ./autogen.sh
+#}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR}/tremor \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/unionfs/unionfs-1.0.6/make.patch b/packages/unionfs/unionfs-1.0.6/make.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unionfs/unionfs-1.0.6/make.patch
diff --git a/packages/unionfs/unionfs-modules_1.0.6.bb b/packages/unionfs/unionfs-modules_1.0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unionfs/unionfs-modules_1.0.6.bb
diff --git a/packages/unionfs/unionfs-utils_1.0.6.bb b/packages/unionfs/unionfs-utils_1.0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unionfs/unionfs-utils_1.0.6.bb
diff --git a/packages/unionfs/unionfs_1.0.6.inc b/packages/unionfs/unionfs_1.0.6.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unionfs/unionfs_1.0.6.inc
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools_27.bb
diff --git a/packages/zroadmap/zroadmap_1.0.8.bb b/packages/zroadmap/zroadmap_1.0.8.bb
index e69de29bb2..d5f7f1f95b 100644
--- a/packages/zroadmap/zroadmap_1.0.8.bb
+++ b/packages/zroadmap/zroadmap_1.0.8.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
+It displays a map of the streets, tracks the position provided by a NMEA-compliant \
+GPS receiver, identifies the street matching this GPS position and announces the name \
+of the crossing street at the next intersection. A rudimentary trip feature allows \
+RoadMap to display some basic navigation information (distance to the destination, \
+direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://roadmap.digitalomaha.net/roadmap/roadmap_1_0_8_src.tar.gz \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+ file://zroadgps.png"
+
+S = "${WORKDIR}/roadmap-${PV}/src/qt"
+
+inherit palmtop
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
+ GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
+
+do_configure() {
+ rm -rf moc*
+}
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin
+ install -d ${D}/${palmtopdir}/apps/Applications
+ install -d ${D}/${palmtopdir}/pics
+ install -m 0755 qtroadmap ${D}/${palmtopdir}/bin/roadmap
+ install -m 0755 qtroadgps ${D}/${palmtopdir}/bin/roadgps
+ install -m 0644 ../roadmap.png ${D}/${palmtopdir}/pics/zroadmap.png
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}/${palmtopdir}/pics/zroadgps.png
+ install -m 0644 ipkg/*.desktop ${D}/${palmtopdir}/apps/
+ install -d ${D}/${palmtopdir}/share/roadmap/
+ install -m 0644 ../sprites ../schema ../preferences ${D}/${palmtopdir}/share/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}/${palmtopdir}/share/roadmap/
+}
diff --git a/site/arm-linux b/site/arm-linux
index a4a5a34248..13b279a540 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -325,3 +325,6 @@ ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+
+# fnmatch
+ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 4b6ac504aa..83f70ff837 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -315,5 +315,5 @@ ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
-# gettext
-am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+# fnmatch
+ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
diff --git a/site/armeb-linux b/site/armeb-linux
index d06dc2a8dd..113492a208 100644
--- a/site/armeb-linux
+++ b/site/armeb-linux
@@ -314,3 +314,6 @@ ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+
+# fnmatch
+ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc
index d06dc2a8dd..113492a208 100644
--- a/site/armeb-linux-uclibc
+++ b/site/armeb-linux-uclibc
@@ -314,3 +314,6 @@ ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+
+# fnmatch
+ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}