aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorg2@giantshoulder.com <g2@giantshoulder.com>2005-03-16 13:36:11 +0000
committerg2@giantshoulder.com <g2@giantshoulder.com>2005-03-16 13:36:11 +0000
commitdf91e18416af9f4d460a3fc9b65f2de2f3362bac (patch)
tree25757d56a30cbf5584188af56144a99b86a23fa8 /packages
parent7a7d1666be0940bdcf4790c72d84484c9fc5b60a (diff)
downloadopenembedded-df91e18416af9f4d460a3fc9b65f2de2f3362bac.tar.gz
openembedded-df91e18416af9f4d460a3fc9b65f2de2f3362bac.tar.bz2
openembedded-df91e18416af9f4d460a3fc9b65f2de2f3362bac.zip
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded 2005/03/17 00:06:10+10:30 (none)!rwhitby Removed the ehci module from openslug-init. 2005/03/17 00:03:09+10:30 (none)!rwhitby Removed the ehci module from openslug-image. 2005/03/16 08:34:55+10:30 (none)!rwhitby OpenSlug 1.7 - removed KALLSYMS, and EHCI is now compiled back into the kernel. 2005/03/15 08:41:13-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/15 15:48:57+00:00 (none)!dp Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cimmeria.(none):/home/dp/zaurus/openembedded 2005/03/15 15:44:34+00:00 (none)!dp Change TARGET_ARCH to TARGET_SYS and enable RTC for timing 2005/03/15 07:41:18-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/15 16:02:40+01:00 mn-solutions.de!schurig mnci-ramses: kernel image fixes 2005/03/14 03:41:08-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/14 12:29:29+01:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into marcinj.local:/home/hrw/zaurus/bb/openembedded 2005/03/14 12:26:37+01:00 local!hrw allow packages to not have shlibs info generated - useful with packages like sharp-compat-libs 2005/03/14 03:06:57-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/14 21:33:42+10:30 (none)!rwhitby Updated fakeroot from 1.2.1 to 1.2.2 (upstream change). 2005/03/14 12:02:04+01:00 uni-frankfurt.de!mickeyl upgrade fakeroot to 1.2.2 2005/03/13 19:41:10-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/14 03:38:40+00:00 (none)!cwiiis Add missing dependencies to gconf-dbus (libxml2, popt) 2005/03/14 03:13:30+00:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded 2005/03/14 03:12:25+00:00 (none)!cwiiis Fix automake 1.9 breakage in libmatchbox. 2005/03/13 17:41:10-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/14 00:54:51+00:00 rpsys.net!RP openzaurus-2.6: Add pxa udc suspend/resume patch by David Brownell 2005/03/13 10:41:06-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 13:31:09-05:00 handhelds.org!kergoth Add fakeroot 1.2.1. 2005/03/13 13:25:28-05:00 handhelds.org!kergoth Add hdparm 5.8. 2005/03/13 13:21:24-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/03/13 13:21:04-05:00 handhelds.org!kergoth Add rxvt-unicode 5.3. 2005/03/13 09:41:04-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 18:13:24+01:00 handhelds.org!zecke libsdl-qpe: Try placing __attribute__ at a different location 2005/03/13 08:41:59-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 11:49:00-05:00 handhelds.org!kergoth Fix the efl package builds that were broken by the recent binconfig changes (they were directly specifying the -config script paths in staging_bindir). 2005/03/13 11:43:47-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/03/13 11:43:30-05:00 handhelds.org!kergoth Apply bugfix from Finn Thain to the bytes_per_inode patch in genext2fs. 2005/03/13 07:41:23-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 16:15:10+01:00 uni-frankfurt.de!mickeyl add collections.so and itertools.so to python-lang 2005/03/13 06:41:12-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 15:17:47+01:00 uni-frankfurt.de!mickeyl bump CVSDATE for oz-3.5.3 2005/03/13 15:15:43+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/03/13 15:13:39+01:00 uni-frankfurt.de!mickeyl repair fortune-mod and bring it back from nonworking 2005/03/13 13:34:54+01:00 uni-frankfurt.de!mickeyl add GNU recode, a charset conversion utility 2005/03/13 03:41:06-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 12:16:41+01:00 (none)!koen Add vlc-gpe_0.8.1, courtesy Marc Poulhies. Fix configure flags, disable ogg/tremor for now. 2005/03/12 21:41:06-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/13 00:47:35-05:00 handhelds.org!kergoth Upgrade beep-media-player from 0.9.7rc2 to 0.9.7, and fix the build by defining _GNU_SOURCE. 2005/03/13 00:35:23-05:00 handhelds.org!kergoth Make the libogg builds inherit pkgconfig. 2005/03/13 00:21:46-05:00 handhelds.org!kergoth Unbork the ccdv build. 2005/03/12 20:41:07-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 23:46:08-05:00 handhelds.org!kergoth Add OpenSSH 4.0p1. 2005/03/12 19:41:14-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 17:28:56-10:00 (none)!dyoung Set NLS for glib-2.0 to be on so packages that depend on it will build 2005/03/12 22:16:52-05:00 handhelds.org!kergoth Add openssh test results to the i686 linux* site files. 2005/03/12 22:02:28-05:00 handhelds.org!kergoth Disable mmx in the inkscape builds. 2005/03/12 21:57:04-05:00 handhelds.org!kergoth Split libsigc++ 1.2 and 2.0 into seperate entities, as they should be, and adjust the inkscape deps accordingly. Inkscape builds again. 2005/03/12 18:41:10-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 20:57:13-05:00 handhelds.org!kergoth Fix the libart-lgpl build for i686. 2005/03/12 17:41:03-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 20:44:07-05:00 handhelds.org!kergoth Fix FILESPATH in freetype-native. 2005/03/12 20:34:07-05:00 handhelds.org!kergoth Add feh version 1.2.7. 2005/03/12 20:32:27-05:00 handhelds.org!kergoth imlib2: * Enable X support, and patch up the buildsystem to do so more intelligently. * Depend on x11 and xext. * Fixup the -config script. * Split out the binaries into a -bin package. 2005/03/12 20:03:00-05:00 handhelds.org!kergoth Apply patch to fixup giblib-config. 2005/03/12 16:41:04-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 19:28:47-05:00 handhelds.org!kergoth Add giblib 1.2.4 and consolodate some metadata into a .inc. 2005/03/12 19:09:47-05:00 handhelds.org!kergoth Unbork the imlib2 build.. its packaging needed tweaks, and its manual set oF EET_CONFIG and FREETYPE_CONFIG was broken by the recent binconfig changes. 2005/03/12 18:53:25-05:00 handhelds.org!kergoth Clean up the freetype builds.. use autotools_stage_includes. 2005/03/12 15:41:11-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 18:28:04-05:00 handhelds.org!kergoth Add grep 2.5.1. 2005/03/12 18:19:59-05:00 handhelds.org!kergoth Upgrade mysql to 4.1.10a. 2005/03/12 14:41:18-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 17:38:33-05:00 handhelds.org!kergoth Add php 4.3.10, and move common bits into a .inc. 2005/03/12 17:35:21-05:00 handhelds.org!kergoth Add php test results to the i686 linux* site files. 2005/03/12 17:08:27-05:00 handhelds.org!kergoth Pass the password in the cvs:// uri in the slugimage .bb 2005/03/12 17:03:03-05:00 handhelds.org!kergoth Per the recommendation of Erik Andersen, kill off the setting of -rpath in our TARGET_LDFLAGS. We now rely on ldconfig more than ever. This was necessary, because the linker looks in both rpath _and_ rpath-link to find things during the build. 2005/03/12 17:01:41-05:00 handhelds.org!kergoth Fix the naming of the .ext2 image inside the .ext2.gz for that image type. 2005/03/12 16:57:29-05:00 handhelds.org!kergoth Fix the autom4te_perllibdir bits in gnu-configize, to make it usable natively on the target. 2005/03/12 12:41:25-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/12 15:32:05-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/03/12 15:31:46-05:00 handhelds.org!kergoth genext2fs 1.3+cvs: * Apply bytes per inode patch, to fix the default inode count based on # of blocks, so it no longer uses the auto bits unnecessarily, and add a cmdline opt to control it. BKrev: 4238364bBtYSx5s1QTTJbjtEROGB3w
Diffstat (limited to 'packages')
-rw-r--r--packages/beepmp/beepmp/gnusource.patch (renamed from packages/beepmp/beepmp/bugfix.patch)0
-rw-r--r--packages/beepmp/beepmp_0.9.7.bb (renamed from packages/beepmp/beepmp_0.9.7rc2.bb)0
-rw-r--r--packages/ccdv/ccdv.bb2
-rw-r--r--packages/ecore/ecore-native_cvs.bb14
-rw-r--r--packages/ecore/ecore_cvs.bb49
-rw-r--r--packages/edje/edje-native_cvs.bb13
-rw-r--r--packages/edje/edje_cvs.bb30
-rw-r--r--packages/etox/etox_cvs.bb24
-rw-r--r--packages/evas/evas-native_cvs.bb14
-rw-r--r--packages/evas/evas_cvs.bb86
-rw-r--r--packages/evoak/evoak_0.0.1.bb21
-rw-r--r--packages/fakeroot/fakeroot-native-1.2.2/fix-prefix.patch (renamed from packages/freetype/freetype-2.1.7/configure.patch)0
-rw-r--r--packages/fakeroot/fakeroot-native_1.2.2.bb (renamed from packages/freetype/freetype-2.1.8/configure.patch)0
-rw-r--r--packages/fakeroot/fakeroot_1.2.2.bb (renamed from packages/gnome/libart-lgpl/arm-linux-uclibc/art_config.h)0
-rw-r--r--packages/feh/feh-1.2.7/cross.patch (renamed from packages/gnome/libart-lgpl/arm-linux/art_config.h)0
-rw-r--r--packages/feh/feh_1.2.6.bb11
-rw-r--r--packages/feh/feh_1.2.7.bb (renamed from packages/gnome/libart-lgpl/i386-linux/art_config.h)0
-rw-r--r--packages/fortune-mod/fortune-mod_1.99.1.bb (renamed from packages/nonworking/fortune-mod/fortune-mod_1.99.1.bb)0
-rw-r--r--packages/freetype/files/configure.patch (renamed from packages/gnome/libart-lgpl/i386-oe-linux/art_config.h)0
-rw-r--r--packages/freetype/freetype-native_2.1.7.bb10
-rw-r--r--packages/freetype/freetype-native_2.1.8.bb8
-rw-r--r--packages/freetype/freetype_2.1.7.bb12
-rw-r--r--packages/freetype/freetype_2.1.8.bb7
-rw-r--r--packages/genext2fs/genext2fs-1.3+cvs/bytes_per_inode.patch (renamed from packages/libsigc++/libsigc++-1.2.5/autofoo.patch)0
-rw-r--r--packages/genext2fs/genext2fs-native_1.3+cvs.bb10
-rw-r--r--packages/genext2fs/genext2fs_1.3+cvs.bb10
-rw-r--r--packages/giblib/files/binconfig.patch (renamed from packages/libsigc++/libsigc++-1.2.5/pkgconfig.patch)0
-rw-r--r--packages/giblib/giblib.inc (renamed from packages/libsigc++/libsigc++-2.0.6/define_sigc_api.patch)0
-rw-r--r--packages/giblib/giblib_1.2.3.bb29
-rw-r--r--packages/giblib/giblib_1.2.4.bb (renamed from packages/libsigc++/libsigc++_2.0.6.bb)0
-rw-r--r--packages/gnome/gconf-dbus_cvs.bb4
-rw-r--r--packages/gnome/libart-lgpl/arm/art_config.h (renamed from packages/linux/mnci-ramses-2.4.21-rmk2-pxa1.bb)0
-rw-r--r--packages/gnome/libart-lgpl/i386/art_config.h (renamed from packages/mysql/mysql-4.1.4a/autofoo.patch)0
-rw-r--r--packages/gnome/libart-lgpl/i686/art_config.h (renamed from packages/mysql/mysql-4.1.4a/gen_lex_hash.patch)0
-rw-r--r--packages/gnome/libart-lgpl_2.3.16.bb5
-rw-r--r--packages/gnu-config/gnu-config/config-guess-uclibc.patch153
-rw-r--r--packages/gnu-config/gnu-config_cvs.bb7
-rw-r--r--packages/grep/grep_2.5.1.bb (renamed from packages/mysql/mysql-native_4.1.4a.bb)0
-rw-r--r--packages/hdparm/hdparm-5.8/bswap.patch (renamed from packages/openssh/openssh-3.7.1p1/scp-nossl.patch)0
-rw-r--r--packages/hdparm/hdparm-5.8/readahead.patch (renamed from packages/openssh/openssh-3.7.1p2/scp-nossl.patch)0
-rw-r--r--packages/hdparm/hdparm_5.8.bb (renamed from packages/openssh/openssh-3.8p1/scp-nossl.patch)0
-rw-r--r--packages/imlib2/imlib2-1.2.0/binconfig.patch (renamed from packages/php/php-4.3.6/autotools.patch)0
-rw-r--r--packages/imlib2/imlib2-1.2.0/x.patch (renamed from packages/php/php-4.3.6/pear.patch)0
-rw-r--r--packages/imlib2/imlib2_1.2.0.bb29
-rw-r--r--packages/inkscape/inkscape_0.38.1.bb14
-rw-r--r--packages/inkscape/inkscape_0.39.bb14
-rw-r--r--packages/libmatchbox/files/fix-configure-for-1.9.patch0
-rw-r--r--packages/libmatchbox/libmatchbox_1.6.bb3
-rw-r--r--packages/libogg/libogg_1.0.bb4
-rw-r--r--packages/libogg/libogg_1.1.bb5
-rw-r--r--packages/libsdl/libsdl-qpe-1.2.7/pygame.patch20
-rw-r--r--packages/libsigc++-1.2/libsigc++-1.2-1.2.5/autofoo.patch0
-rw-r--r--packages/libsigc++-1.2/libsigc++-1.2-1.2.5/pkgconfig.patch0
-rw-r--r--packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb0
-rw-r--r--packages/libsigc++-2.0/libsigc++-2.0-2.0.6/define_sigc_api.patch0
-rw-r--r--packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb0
-rw-r--r--packages/libsigc++/libsigc++_1.2.5.bb27
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb9
-rw-r--r--packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb10
-rw-r--r--packages/linux/openslug-kernel-2.6.11.2/defconfig1299
-rw-r--r--packages/linux/openslug-kernel_2.6.11.2.bb61
-rw-r--r--packages/meta/openslug-image.bb3
-rw-r--r--packages/mplayer/mplayer_1.0pre3try2.bb5
-rw-r--r--packages/mplayer/mplayer_1.0pre6.bb4
-rw-r--r--packages/mysql/mysql-4.1.10a/autofoo.patch0
-rw-r--r--packages/mysql/mysql-4.1.10a/gen_lex_hash.patch0
-rw-r--r--packages/mysql/mysql-native_4.1.10a.bb0
-rw-r--r--packages/mysql/mysql_4.1.10a.bb0
-rw-r--r--packages/mysql/mysql_4.1.4a.bb32
-rw-r--r--packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb4
-rw-r--r--packages/openslug-init/openslug-init-0.10/modutils.txt1
-rw-r--r--packages/openssh/files/scp-nossl.patch0
-rw-r--r--packages/openssh/openssh-4.0p1/configure.patch0
-rw-r--r--packages/openssh/openssh-4.0p1/sshd_config0
-rw-r--r--packages/openssh/openssh_4.0p1.bb0
-rw-r--r--packages/php/files/autotools.patch0
-rw-r--r--packages/php/files/pear.patch0
-rw-r--r--packages/php/php-native_4.3.10.bb0
-rw-r--r--packages/php/php-native_4.3.6.bb5
-rw-r--r--packages/php/php.inc0
-rw-r--r--packages/php/php_4.3.10.bb0
-rw-r--r--packages/php/php_4.3.6.bb29
-rw-r--r--packages/python/python-2.4.0-manifest.inc10
-rw-r--r--packages/recode/recode_3.6.bb0
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.3.bb0
-rw-r--r--packages/sharp-binary-only/sharp-compat-libs_0.5.bb81
-rw-r--r--packages/slugimage/slugimage.bb2
-rw-r--r--packages/vlc/files/fix-pda.patch0
-rw-r--r--packages/vlc/vlc-gpe_0.8.1.bb0
89 files changed, 2003 insertions, 187 deletions
diff --git a/packages/beepmp/beepmp/bugfix.patch b/packages/beepmp/beepmp/gnusource.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/beepmp/beepmp/bugfix.patch
+++ b/packages/beepmp/beepmp/gnusource.patch
diff --git a/packages/beepmp/beepmp_0.9.7rc2.bb b/packages/beepmp/beepmp_0.9.7.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/beepmp/beepmp_0.9.7rc2.bb
+++ b/packages/beepmp/beepmp_0.9.7.bb
diff --git a/packages/ccdv/ccdv.bb b/packages/ccdv/ccdv.bb
index 2adf9f1a35..05aceabce1 100644
--- a/packages/ccdv/ccdv.bb
+++ b/packages/ccdv/ccdv.bb
@@ -3,7 +3,7 @@ finding actual problems easier."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "GPL"
SRC_URI = "http://openembedded.org/dl/ccdv.c"
-S = "${WORKDIR}/openembedded.org"
+S = "${WORKDIR}"
do_compile () {
${CC} ${CFLAGS} ${LDFLAGS} ccdv.c -o ccdv
diff --git a/packages/ecore/ecore-native_cvs.bb b/packages/ecore/ecore-native_cvs.bb
index e69de29bb2..6e5e1d1413 100644
--- a/packages/ecore/ecore-native_cvs.bb
+++ b/packages/ecore/ecore-native_cvs.bb
@@ -0,0 +1,14 @@
+include ecore_${PV}.bb
+LICENSE = "MIT"
+inherit native
+DEPENDS = "edb-native eet-native evas-native freetype-native"
+
+do_stage () {
+ for p in ${parts}; do
+ dir=`echo $p|tr A-Z a-z`
+ install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
+ oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
+ done
+ install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
+ install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/ecore/ecore_cvs.bb b/packages/ecore/ecore_cvs.bb
index e69de29bb2..1a90928fad 100644
--- a/packages/ecore/ecore_cvs.bb
+++ b/packages/ecore/ecore_cvs.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
+foundation libraries. It makes makes doing selections, drag and drop, event loops, \
+timeouts and idle handlers fast, optimized, and convenient."
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/libs"
+PRIORITY = "optional"
+LEAD_SONAME = "libecore.so"
+LICENSE = "MIT"
+PV = "${CVSDATE}"
+DEPENDS = "edb eet evas freetype edb-native"
+PR = "r5"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore \
+ file://no-x-test.patch;patch=1"
+S = "${WORKDIR}/ecore"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--enable-ecore-fb \
+ --enable-ecore-job \
+ --enable-ecore-evas-fb \
+ --disable-ecore-evas-x \
+ --disable-ecore-evas-gl \
+ --enable-ecore-con \
+ --enable-ecore-ipc \
+ --enable-ecore-txt \
+ --disable-ecore-x \
+ --enable-ecore-config \
+ --disable-openssl"
+
+parts = "Ecore Ecore_Job \
+ Ecore_Txt Ecore_Fb Ecore_Con \
+ Ecore_Ipc Ecore_Evas Ecore_Config"
+
+do_stage () {
+ for p in ${parts}; do
+ dir=`echo $p|tr A-Z a-z`
+ install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
+ oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
+ done
+ install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
+ install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES += "ecore-examples"
+
+FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
+FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
diff --git a/packages/edje/edje-native_cvs.bb b/packages/edje/edje-native_cvs.bb
index e69de29bb2..848c8dbe21 100644
--- a/packages/edje/edje-native_cvs.bb
+++ b/packages/edje/edje-native_cvs.bb
@@ -0,0 +1,13 @@
+include edje_${PV}.bb
+inherit native
+DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
+
+EXTRA_OECONF = "--enable-fb-only"
+
+do_stage() {
+ for i in edje edje_ls edje_cc
+ do
+ install -m 0755 src/bin/$i ${STAGING_BINDIR}
+ done
+}
diff --git a/packages/edje/edje_cvs.bb b/packages/edje/edje_cvs.bb
index e69de29bb2..a426df9a79 100644
--- a/packages/edje/edje_cvs.bb
+++ b/packages/edje/edje_cvs.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "edje is a complex graphical design & layout library."
+DEPENDS = "freetype evas ecore embryo eet edb edje-native"
+LICENSE = "MIT"
+SECTION = "e/libs"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PV = "${CVSDATE}"
+PR = "r4"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje"
+S = "${WORKDIR}/edje"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--disable-edje-cc \
+ --enable-fb-only"
+
+LEAD_SONAME = "libedje.so"
+
+do_stage () {
+ oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
+ oe_libinstall -C src/lib libedje_edit ${STAGING_LIBDIR}/
+ install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
+}
+
+PACKAGES += "edje-examples"
+
+FILES_${PN} = "${libdir}/libedje*.so*"
+FILES_${PN}-dev += "${bindir}/edje-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_ls ${datadir}"
+
diff --git a/packages/etox/etox_cvs.bb b/packages/etox/etox_cvs.bb
index e69de29bb2..409ae91728 100644
--- a/packages/etox/etox_cvs.bb
+++ b/packages/etox/etox_cvs.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
+Etox helps you when it comes to displaying, moving, resizing, layering, \
+clipping, aligning and coloring fonts in different styles, and more."
+SECTION = "e/libs"
+DEPENDS = "edb evas ecore"
+PV = "${CVSDATE}"
+PR = "r3"
+LICENSE = "MIT"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/etox"
+S = "${WORKDIR}/etox"
+
+inherit autotools pkgconfig binconfig
+
+do_stage () {
+ oe_libinstall -C src libetox ${STAGING_LIBDIR}/
+ install -m 0644 ${S}/src/Etox.h ${STAGING_INCDIR}/
+}
+
+PACKAGES += "etox-examples"
+
+FILES_${PN} = "${libdir}/libetox*.so*"
+FILES_${PN}-dev += "${bindir}/etox-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/etox* ${datadir}"
diff --git a/packages/evas/evas-native_cvs.bb b/packages/evas/evas-native_cvs.bb
index e69de29bb2..8ccc3bf2ab 100644
--- a/packages/evas/evas-native_cvs.bb
+++ b/packages/evas/evas-native_cvs.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "The Enlightenment Canvas Library"
+include evas_${PV}.bb
+inherit native
+DEPENDS = "freetype-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
+
+do_stage () {
+ for i in ${headers}; do
+ install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
+ done
+ oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
+}
+
+#FIXME: Conflicts with zlib-devel on the build machine. Remove it and it builds.
diff --git a/packages/evas/evas_cvs.bb b/packages/evas/evas_cvs.bb
index e69de29bb2..401969b61c 100644
--- a/packages/evas/evas_cvs.bb
+++ b/packages/evas/evas_cvs.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
+LICENSE = "MIT"
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/libs"
+PRIORITY = "optional"
+DEPENDS = "libpng jpeg edb eet freetype"
+PV = "${CVSDATE}"
+PR = "r4"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas \
+ file://pkg.m4"
+S = "${WORKDIR}/evas"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--enable-fb \
+ --disable-directfb \
+ --disable-buffer \
+ --disable-software-qtopia \
+ --disable-software-x11 \
+ --disable-gl-x11 \
+ --enable-image-loader-eet \
+ --enable-image-loader-edb \
+ --enable-image-loader-png \
+ --enable-image-loader-jpeg \
+ --enable-small-dither-mask \
+ --enable-cpu-c \
+ --enable-font-loader-eet \
+ --enable-scale-sample \
+ --enable-scale-smooth \
+ --enable-convert-yuv \
+ --disable-convert-8-rgb-332 \
+ --disable-convert-8-rgb-666 \
+ --disable-convert-8-rgb-232 \
+ --disable-convert-8-rgb-222 \
+ --disable-convert-8-rgb-221 \
+ --disable-convert-8-rgb-121 \
+ --disable-convert-8-rgb-111 \
+ --enable-convert-16-rgb-565 \
+ --disable-convert-16-rgb-555 \
+ --disable-convert-16-rgb-444 \
+ --disable-convert-16-rgb-ipq \
+ --enable-convert-16-rgb-rot-0 \
+ --disable-convert-16-rgb-rot-90 \
+ --enable-convert-16-rgb-rot-270 \
+ --disable-convert-24-rgb-888 \
+ --disable-convert-24-bgr-888 \
+ --disable-convert-32-rgb-8888 \
+ --disable-convert-32-rgbx-8888 \
+ --disable-convert-32-bgr-8888 \
+ --disable-convert-32-bgrx-8888 \
+ --disable-convert-32-rgb-rot-0 \
+ --disable-convert-32-rgb-rot-90 \
+ --disable-convert-32-rgb-rot-270"
+
+do_configure () {
+ install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
+ autotools_do_configure
+}
+
+headers = "Evas_Engine_Buffer.h \
+ Evas_Engine_FB.h \
+ Evas.h"
+
+# Don't install these headers or subsequent libraries will include support for it:
+# Evas_Engine_DirectFB.h \
+# Evas_Engine_GL_X11.h \
+# Evas_Engine_Software_Win32_GDI.h \
+# Evas_Engine_Software_X11.h
+# Evas_Engine_Software_Qtopia.h \
+
+do_stage () {
+ for i in ${headers}; do
+ install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
+ done
+ oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
+}
+
+PACKAGES += "evas-examples"
+
+FILES_${PN} = "${libdir}/libevas*.so*"
+FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/evoak/evoak_0.0.1.bb b/packages/evoak/evoak_0.0.1.bb
index e69de29bb2..551dc8eca5 100644
--- a/packages/evoak/evoak_0.0.1.bb
+++ b/packages/evoak/evoak_0.0.1.bb
@@ -0,0 +1,21 @@
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "ecore evas edje embryo eet"
+LICENSE = "MIT"
+
+SRC_URI = "http://www.rasterman.com/files/evoak-${PV}.tar.gz"
+S = "${WORKDIR}/evoak-${PV}"
+
+inherit autotools binconfig
+
+#FIXME: evoak fails to build, because it doesn't realize that
+#our ecore was built without X support. Ecore should really
+#be installing a copy of its config.h, and Evoak should be
+#ifdefing blocks of code based on the ecore build options.
+BROKEN = "1"
+
+do_stage () {
+ oe_libinstall -C src/lib libvoak ${STAGING_LIBDIR}/
+ install -m 0644 ${S}/src/lib/Evoak.h ${STAGING_INCDIR}/
+}
diff --git a/packages/freetype/freetype-2.1.7/configure.patch b/packages/fakeroot/fakeroot-native-1.2.2/fix-prefix.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/freetype/freetype-2.1.7/configure.patch
+++ b/packages/fakeroot/fakeroot-native-1.2.2/fix-prefix.patch
diff --git a/packages/freetype/freetype-2.1.8/configure.patch b/packages/fakeroot/fakeroot-native_1.2.2.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/freetype/freetype-2.1.8/configure.patch
+++ b/packages/fakeroot/fakeroot-native_1.2.2.bb
diff --git a/packages/gnome/libart-lgpl/arm-linux-uclibc/art_config.h b/packages/fakeroot/fakeroot_1.2.2.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libart-lgpl/arm-linux-uclibc/art_config.h
+++ b/packages/fakeroot/fakeroot_1.2.2.bb
diff --git a/packages/gnome/libart-lgpl/arm-linux/art_config.h b/packages/feh/feh-1.2.7/cross.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libart-lgpl/arm-linux/art_config.h
+++ b/packages/feh/feh-1.2.7/cross.patch
diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb
index e69de29bb2..372c2d3d2a 100644
--- a/packages/feh/feh_1.2.6.bb
+++ b/packages/feh/feh_1.2.6.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/utils"
+DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "MIT"
+DEPENDS = "imlib2 giblib jpeg x11 xext xt"
+
+SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
+ file://cross.patch;patch=1"
+S = "${WORKDIR}/feh-${PV}"
+
+inherit autotools
diff --git a/packages/gnome/libart-lgpl/i386-linux/art_config.h b/packages/feh/feh_1.2.7.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libart-lgpl/i386-linux/art_config.h
+++ b/packages/feh/feh_1.2.7.bb
diff --git a/packages/nonworking/fortune-mod/fortune-mod_1.99.1.bb b/packages/fortune-mod/fortune-mod_1.99.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/fortune-mod/fortune-mod_1.99.1.bb
+++ b/packages/fortune-mod/fortune-mod_1.99.1.bb
diff --git a/packages/gnome/libart-lgpl/i386-oe-linux/art_config.h b/packages/freetype/files/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libart-lgpl/i386-oe-linux/art_config.h
+++ b/packages/freetype/files/configure.patch
diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb
index 7f0e7039df..dbebbef1ab 100644
--- a/packages/freetype/freetype-native_2.1.7.bb
+++ b/packages/freetype/freetype-native_2.1.7.bb
@@ -2,12 +2,14 @@ SECTION = "base"
LICENSE = "freetype"
DESCRIPTION = "Freetype font rendering library"
+PR = "r1"
+
SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
file://configure.patch;patch=1"
-inherit autotools pkgconfig native
+inherit autotools pkgconfig native binconfig
DEPENDS = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/freetype-${PV}"
+FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
S = "${WORKDIR}/freetype-${PV}"
PACKAGES = ""
@@ -17,8 +19,6 @@ do_configure () {
}
do_stage () {
+ autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
- cp -a ${S}/include/*.h ${STAGING_INCDIR}
- install -d ${STAGING_INCDIR}/freetype2
- cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
}
diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb
index 212e239e6e..b0bdb0fb38 100644
--- a/packages/freetype/freetype-native_2.1.8.bb
+++ b/packages/freetype/freetype-native_2.1.8.bb
@@ -2,12 +2,14 @@ SECTION = "libs"
LICENSE = "freetype"
DESCRIPTION = "Freetype font rendering library"
+PR = "r1"
+
SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
file://${FILESDIR}/configure.patch;patch=1"
inherit autotools pkgconfig native binconfig
DEPENDS = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/freetype-${PV}"
+FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
S = "${WORKDIR}/freetype-${PV}"
PACKAGES = ""
@@ -17,8 +19,6 @@ do_configure () {
}
do_stage () {
+ autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
- cp -a ${S}/include/*.h ${STAGING_INCDIR}
- install -d ${STAGING_INCDIR}/freetype2
- cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
}
diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb
index e043ee0f75..107c3dc142 100644
--- a/packages/freetype/freetype_2.1.7.bb
+++ b/packages/freetype/freetype_2.1.7.bb
@@ -2,13 +2,15 @@ SECTION = "libs"
LICENSE = "freetype"
DESCRIPTION = "Freetype font rendering library"
+PR = "r1"
+
SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
file://configure.patch;patch=1"
FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-dev += " ${bindir}"
-inherit autotools pkgconfig
+inherit autotools binconfig pkgconfig
LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
@@ -23,12 +25,6 @@ do_configure () {
}
do_stage () {
+ autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-
- cp -a ${S}/include/*.h ${STAGING_INCDIR}
- install -d ${STAGING_INCDIR}/freetype2
- cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
-
- sed -e 's,${prefix},${STAGING_LIBDIR}/..,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
- chmod u+x ${STAGING_BINDIR}/freetype-config
}
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 2a2d101e37..f5b0dde110 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -2,6 +2,8 @@ SECTION = "libs"
LICENSE = "freetype"
DESCRIPTION = "Freetype font rendering library"
+PR = "r1"
+
SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
file://configure.patch;patch=1"
@@ -23,9 +25,6 @@ do_configure () {
}
do_stage () {
+ autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-
- cp -a ${S}/include/*.h ${STAGING_INCDIR}
- install -d ${STAGING_INCDIR}/freetype2
- cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
}
diff --git a/packages/libsigc++/libsigc++-1.2.5/autofoo.patch b/packages/genext2fs/genext2fs-1.3+cvs/bytes_per_inode.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsigc++/libsigc++-1.2.5/autofoo.patch
+++ b/packages/genext2fs/genext2fs-1.3+cvs/bytes_per_inode.patch
diff --git a/packages/genext2fs/genext2fs-native_1.3+cvs.bb b/packages/genext2fs/genext2fs-native_1.3+cvs.bb
index e69de29bb2..b81df887a4 100644
--- a/packages/genext2fs/genext2fs-native_1.3+cvs.bb
+++ b/packages/genext2fs/genext2fs-native_1.3+cvs.bb
@@ -0,0 +1,10 @@
+include genext2fs_${PV}.bb
+inherit native
+
+do_stage () {
+ install -m 0755 genext2fs ${STAGING_BINDIR}/
+}
+
+do_install () {
+ :
+}
diff --git a/packages/genext2fs/genext2fs_1.3+cvs.bb b/packages/genext2fs/genext2fs_1.3+cvs.bb
index e69de29bb2..94f04d54f1 100644
--- a/packages/genext2fs/genext2fs_1.3+cvs.bb
+++ b/packages/genext2fs/genext2fs_1.3+cvs.bb
@@ -0,0 +1,10 @@
+include genext2fs.inc
+
+PV_append = "${CVSDATE}"
+PR = "r2"
+FILESPATH = "${FILE_DIRNAME}/genext2fs-1.3+cvs:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files"
+SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/genext2fs;module=genext2fs \
+ file://bytes_per_inode.patch;patch=1"
+S = "${WORKDIR}/genext2fs"
+
+inherit autotools
diff --git a/packages/libsigc++/libsigc++-1.2.5/pkgconfig.patch b/packages/giblib/files/binconfig.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsigc++/libsigc++-1.2.5/pkgconfig.patch
+++ b/packages/giblib/files/binconfig.patch
diff --git a/packages/libsigc++/libsigc++-2.0.6/define_sigc_api.patch b/packages/giblib/giblib.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsigc++/libsigc++-2.0.6/define_sigc_api.patch
+++ b/packages/giblib/giblib.inc
diff --git a/packages/giblib/giblib_1.2.3.bb b/packages/giblib/giblib_1.2.3.bb
index 514b4a0b21..59065c2abf 100644
--- a/packages/giblib/giblib_1.2.3.bb
+++ b/packages/giblib/giblib_1.2.3.bb
@@ -1,28 +1,5 @@
-SECTION = "libs"
-DESCRIPTION = "giblib is a utility library that incorporates doubly linked \
-lists, some string functions, and a wrapper for imlib2."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-LICENSE = "BSD"
-DEPENDS = "imlib2"
-PR = "r1"
+include giblib.inc
-SRC_URI = "http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \
- file://pkgconfig.patch;patch=1"
-S = "${WORKDIR}/giblib-${PV}"
+PR = "r3"
-inherit autotools pkgconfig
-
-headers = "gib_imlib.h gib_btree.h gib_debug.h gib_queue.h gib_stack.h \
-gib_style.h giblib_config.h gib_hash.h giblib.h gib_list.h gib_utils.h"
-do_stage () {
- oe_libinstall -a -so -C giblib libgiblib ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/giblib
- for h in ${headers}; do
- install -m 0644 ${S}/giblib/$h ${STAGING_INCDIR}/giblib/
- done
- cat giblib-config | sed -e "s,${prefix},${STAGING_LIBDIR}/..," \
- -e "s,${exec_prefix},${STAGING_BINDIR}/..," \
- -e "s,${includedir},${STAGING_INCDIR}," \
- -e "s,${libdir},${STAGING_LIBDIR}," > ${STAGING_BINDIR}/giblib-config
- chmod a+rx ${STAGING_BINDIR}/giblib-config
-}
+SRC_URI += "file://pkgconfig.patch;patch=1"
diff --git a/packages/libsigc++/libsigc++_2.0.6.bb b/packages/giblib/giblib_1.2.4.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsigc++/libsigc++_2.0.6.bb
+++ b/packages/giblib/giblib_1.2.4.bb
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index 9c5270569f..b5d88f7e59 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -1,8 +1,8 @@
SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus"
+DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
PROVIDES = "gconf"
RPROVIDES = "gconf"
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1.bb b/packages/gnome/libart-lgpl/arm/art_config.h
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1.bb
+++ b/packages/gnome/libart-lgpl/arm/art_config.h
diff --git a/packages/mysql/mysql-4.1.4a/autofoo.patch b/packages/gnome/libart-lgpl/i386/art_config.h
index e69de29bb2..e69de29bb2 100644
--- a/packages/mysql/mysql-4.1.4a/autofoo.patch
+++ b/packages/gnome/libart-lgpl/i386/art_config.h
diff --git a/packages/mysql/mysql-4.1.4a/gen_lex_hash.patch b/packages/gnome/libart-lgpl/i686/art_config.h
index e69de29bb2..e69de29bb2 100644
--- a/packages/mysql/mysql-4.1.4a/gen_lex_hash.patch
+++ b/packages/gnome/libart-lgpl/i686/art_config.h
diff --git a/packages/gnome/libart-lgpl_2.3.16.bb b/packages/gnome/libart-lgpl_2.3.16.bb
index 68bb1dee1a..8028c8ef3f 100644
--- a/packages/gnome/libart-lgpl_2.3.16.bb
+++ b/packages/gnome/libart-lgpl_2.3.16.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "Library of functions for 2D graphics"
SECTION = "x11/gnome"
LICENSE = "LGPL"
PR = "r2"
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
# 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://${ART_CONFIG} \
file://Makefile.am.patch;patch=1"
inherit autotools pkgconfig
@@ -18,7 +19,7 @@ FILES_${PN}-dev += "${bindir}/libart2-config"
S = "${WORKDIR}/libart_lgpl-${PV}"
do_configure_prepend() {
- cp ${WORKDIR}/${HOST_SYS}/art_config.h ${S}
+ cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
}
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/packages/gnu-config/gnu-config/config-guess-uclibc.patch b/packages/gnu-config/gnu-config/config-guess-uclibc.patch
index e69de29bb2..1fc21bfec9 100644
--- a/packages/gnu-config/gnu-config/config-guess-uclibc.patch
+++ b/packages/gnu-config/gnu-config/config-guess-uclibc.patch
@@ -0,0 +1,153 @@
+Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch.
+
+Index: config/config.guess
+===================================================================
+--- config.orig/config.guess 2005-02-17 22:52:45.000000000 -0500
++++ config/config.guess 2005-03-09 13:29:04.453535064 -0500
+@@ -136,6 +136,19 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
++# Detect uclibc systems.
++
++LIBC="gnu"
++if [ -f /usr/include/bits/uClibc_config.h ]
++then
++ LIBC=uclibc
++ if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]
++ then
++ UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h`
++ LIBC=$LIBC$UCLIBC_SUBVER
++ fi
++fi
++
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -825,7 +838,7 @@
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+@@ -834,16 +847,16 @@
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
++ echo frv-unknown-linux-${LIBC}
+ exit 0 ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+@@ -862,7 +875,7 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -881,13 +894,13 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
+ ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ echo powerpc-unknown-linux-${LIBC}
+ exit 0 ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
++ echo powerpc64-unknown-linux-${LIBC}
+ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -900,34 +913,34 @@
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-gnu ;;
+- PA8*) echo hppa2.0-unknown-linux-gnu ;;
+- *) echo hppa-unknown-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ echo hppa64-unknown-linux-${LIBC}
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo x86_64-unknown-linux-${LIBC}
+ exit 0 ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+@@ -942,20 +955,21 @@
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+ ;;
+ a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+ exit 0 ;;
+ coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+ exit 0 ;;
+ esac
++ if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit 0; fi
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
diff --git a/packages/gnu-config/gnu-config_cvs.bb b/packages/gnu-config/gnu-config_cvs.bb
index 2ac9eea1ac..135ad54138 100644
--- a/packages/gnu-config/gnu-config_cvs.bb
+++ b/packages/gnu-config/gnu-config_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
INHIBIT_DEFAULT_DEPS = "1"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
PV = "0.1cvs${CVSDATE}"
-PR = "r2"
+PR = "r3"
SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/config;module=config;method=ext;rsh=ssh \
file://config-guess-uclibc.patch;patch=1 \
@@ -20,8 +20,9 @@ do_install () {
install -d ${D}${datadir}/gnu-config \
${D}${bindir}
cat ${WORKDIR}/gnu-configize.in | \
- sed -e 's,@gnu-configdir@,${datadir}/gnu-config,' \
- -e 's,@autom4te_perllibdir@,${D}${datadir}/autoconf,' > ${D}${bindir}/gnu-configize
+ sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
+ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' \
+ -e 's,/usr/bin/perl,${bindir}/perl,g' > ${D}${bindir}/gnu-configize
chmod 755 ${D}${bindir}/gnu-configize
install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
}
diff --git a/packages/mysql/mysql-native_4.1.4a.bb b/packages/grep/grep_2.5.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/mysql/mysql-native_4.1.4a.bb
+++ b/packages/grep/grep_2.5.1.bb
diff --git a/packages/openssh/openssh-3.7.1p1/scp-nossl.patch b/packages/hdparm/hdparm-5.8/bswap.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/openssh/openssh-3.7.1p1/scp-nossl.patch
+++ b/packages/hdparm/hdparm-5.8/bswap.patch
diff --git a/packages/openssh/openssh-3.7.1p2/scp-nossl.patch b/packages/hdparm/hdparm-5.8/readahead.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/openssh/openssh-3.7.1p2/scp-nossl.patch
+++ b/packages/hdparm/hdparm-5.8/readahead.patch
diff --git a/packages/openssh/openssh-3.8p1/scp-nossl.patch b/packages/hdparm/hdparm_5.8.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/openssh/openssh-3.8p1/scp-nossl.patch
+++ b/packages/hdparm/hdparm_5.8.bb
diff --git a/packages/php/php-4.3.6/autotools.patch b/packages/imlib2/imlib2-1.2.0/binconfig.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/php-4.3.6/autotools.patch
+++ b/packages/imlib2/imlib2-1.2.0/binconfig.patch
diff --git a/packages/php/php-4.3.6/pear.patch b/packages/imlib2/imlib2-1.2.0/x.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/php-4.3.6/pear.patch
+++ b/packages/imlib2/imlib2-1.2.0/x.patch
diff --git a/packages/imlib2/imlib2_1.2.0.bb b/packages/imlib2/imlib2_1.2.0.bb
index e4b82ba619..eaa7477a19 100644
--- a/packages/imlib2/imlib2_1.2.0.bb
+++ b/packages/imlib2/imlib2_1.2.0.bb
@@ -5,30 +5,31 @@ MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
LICENSE = BSD
SECTION = "e/libs"
PRIORITY = "optional"
-DEPENDS = "freetype libpng jpeg"
-PR = "2"
+DEPENDS = "freetype libpng jpeg x11 xext"
+PR = "r4"
do_prepsources () {
- make clean distclean || true
+ make clean distclean || true
}
addtask prepsources after do_fetch before do_unpack
-SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-1.2.0.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-1.2.0.tar.gz \
+ file://binconfig.patch;patch=1 \
+ file://x.patch;patch=1"
inherit autotools pkgconfig binconfig
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-
EXTRA_OECONF = "--disable-mmx \
- --disable-x11"
+ --with-x \
+ --x-includes=${STAGING_INCDIR} \
+ --x-libraries=${STAGING_LIBDIR}"
do_stage () {
- oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
- install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
+ oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
+ install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
}
-FILES_${PN} = "${libdir}/libImlib2*.so*"
-FILES_${PN} = "${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
-
+PACKAGES += "${PN}-bin"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
+FILES_${PN}-dev += "${bindir}/imlib2-config"
+FILES_${PN}-bin = "${bindir}"
diff --git a/packages/inkscape/inkscape_0.38.1.bb b/packages/inkscape/inkscape_0.38.1.bb
index e69de29bb2..71f6fa5032 100644
--- a/packages/inkscape/inkscape_0.38.1.bb
+++ b/packages/inkscape/inkscape_0.38.1.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/utils"
+DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
+blending, node editing, SVG to PNG export, and more. Its goal is for features \
+similar to Illustrator, CorelDraw, Visio, etc."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
+S = "${WORKDIR}/inkscape-${PV}"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--disable-mmx"
diff --git a/packages/inkscape/inkscape_0.39.bb b/packages/inkscape/inkscape_0.39.bb
index e69de29bb2..71f6fa5032 100644
--- a/packages/inkscape/inkscape_0.39.bb
+++ b/packages/inkscape/inkscape_0.39.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/utils"
+DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
+blending, node editing, SVG to PNG export, and more. Its goal is for features \
+similar to Illustrator, CorelDraw, Visio, etc."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
+S = "${WORKDIR}/inkscape-${PV}"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--disable-mmx"
diff --git a/packages/libmatchbox/files/fix-configure-for-1.9.patch b/packages/libmatchbox/files/fix-configure-for-1.9.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmatchbox/files/fix-configure-for-1.9.patch
diff --git a/packages/libmatchbox/libmatchbox_1.6.bb b/packages/libmatchbox/libmatchbox_1.6.bb
index 3db7db47f0..e3e62c5d3a 100644
--- a/packages/libmatchbox/libmatchbox_1.6.bb
+++ b/packages/libmatchbox/libmatchbox_1.6.bb
@@ -3,7 +3,8 @@ include libmatchbox.inc
PR = "r1"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
- file://check.m4"
+ file://check.m4 \
+ file://fix-configure-for-1.9.patch;patch=1"
do_configure_prepend () {
mv ${WORKDIR}/check.m4 ${S}/
diff --git a/packages/libogg/libogg_1.0.bb b/packages/libogg/libogg_1.0.bb
index 27f4f6b465..7af1468004 100644
--- a/packages/libogg/libogg_1.0.bb
+++ b/packages/libogg/libogg_1.0.bb
@@ -3,9 +3,11 @@ DESCRIPTION = "libogg is the bitstream and framing library \
for the Ogg project. It provides functions which are \
necessary to codec libraries like libvorbis."
LICENSE = "BSD"
+PR = "r1"
+
SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libogg-${PV}.tar.gz"
-inherit autotools
+inherit autotools pkgconfig
do_stage () {
oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
diff --git a/packages/libogg/libogg_1.1.bb b/packages/libogg/libogg_1.1.bb
index fde32f6551..797ef0391c 100644
--- a/packages/libogg/libogg_1.1.bb
+++ b/packages/libogg/libogg_1.1.bb
@@ -2,12 +2,13 @@ SECTION = "libs"
DESCRIPTION = "libogg is the bitstream and framing library \
for the Ogg project. It provides functions which are \
necessary to codec libraries like libvorbis."
-
LICENSE = "BSD"
+PR = "r1"
+
SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \
file://m4.patch;patch=1"
-inherit autotools
+inherit autotools pkgconfig
do_stage () {
oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
index 276902c608..6814dd6d72 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
@@ -1,6 +1,6 @@
Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc
===================================================================
---- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2005-03-02 22:24:42.713596719 +0100
+--- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-
@@ -53,8 +53,8 @@ Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc
Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-03-03 00:11:13.830189869 +0100
-@@ -0,0 +1,101 @@
++++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-03-13 18:04:59.218302232 +0100
+@@ -0,0 +1,99 @@
+/* Include the SDL main definition header */
+#include "SDL_main.h"
+#include <stdlib.h>
@@ -70,8 +70,6 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+#include <string.h>
+
+
-+static void initialize_qpe_app() __attribute__((constructor));
-+static void deinitialize_qpe_app() __attribute__((destructor));
+
+static QWidget *dummyW = 0;
+static QPEApplication *theApp = 0;
@@ -140,7 +138,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+ delete [] cmdline;
+}
+
-+static void initialize_qpe_app() {
++static void __attribute__((constructor)) initialize_qpe_app() {
+ parse_cmd_line();
+
+ theApp = new QPEApplication( size, cmdline );
@@ -148,7 +146,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+ theApp->showMainWidget(dummyW);
+}
+
-+static void deinitialize_qpe_app() {
++static void __attribute__((destructor)) deinitialize_qpe_app() {
+ free_cmd_line();
+ delete dummyW;
+ delete theApp;
@@ -158,8 +156,8 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+#endif
Index: SDL-1.2.7/src/main/Makefile.am
===================================================================
---- SDL-1.2.7.orig/src/main/Makefile.am 2005-03-02 22:24:42.714596577 +0100
-+++ SDL-1.2.7/src/main/Makefile.am 2005-03-03 00:08:55.914676851 +0100
+--- SDL-1.2.7.orig/src/main/Makefile.am 2004-02-18 18:22:01.000000000 +0100
++++ SDL-1.2.7/src/main/Makefile.am 2005-03-13 18:03:46.321636109 +0100
@@ -21,11 +21,7 @@
if TARGET_MACOSX
MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
@@ -174,8 +172,8 @@ Index: SDL-1.2.7/src/main/Makefile.am
libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS)
Index: SDL-1.2.7/src/video/qtopia/Makefile.am
===================================================================
---- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-03-02 22:24:42.714596577 +0100
-+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-03 00:08:55.915676710 +0100
+--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200
++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-13 18:03:46.322635967 +0100
@@ -15,4 +15,5 @@
SDL_syswm.cc \
SDL_syswm_c.h \
diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/autofoo.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/autofoo.patch
diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/pkgconfig.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/pkgconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.5/pkgconfig.patch
diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
diff --git a/packages/libsigc++-2.0/libsigc++-2.0-2.0.6/define_sigc_api.patch b/packages/libsigc++-2.0/libsigc++-2.0-2.0.6/define_sigc_api.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0-2.0.6/define_sigc_api.patch
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
diff --git a/packages/libsigc++/libsigc++_1.2.5.bb b/packages/libsigc++/libsigc++_1.2.5.bb
deleted file mode 100644
index fab7073e86..0000000000
--- a/packages/libsigc++/libsigc++_1.2.5.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "A library for loose coupling of C++ method calls"
-SECTION = "libs"
-PRIORITY = "optional"
-PR = "r1"
-LICENSE = "GPL LGPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \
- file://autofoo.patch;patch=1 \
- file://pkgconfig.patch;patch=1"
-
-inherit autotools pkgconfig
-
-FILES_${PN}-dev += "${libdir}/sigc++-*/"
-
-acpaths = ""
-
-do_stage() {
- install -d ${STAGING_LIBDIR}/sigc++-1.2/include
- install -m 0644 sigc++/config/sigcconfig.h ${STAGING_LIBDIR}/sigc++-1.2/include/
- oe_libinstall -so -C sigc++ libsigc-1.2 ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/sigc++-1.2/sigc++
- for f in sigc++/*.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/sigc++-1.2/sigc++/
- done
-}
-
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index fe3743d70f..68bdc9b104 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r3"
+PR = "r4"
DOSRC="http://www.do13.in-berlin.de/openzaurus"
RPSRC="http://www.rpsys.net/openzaurus/patches"
@@ -17,6 +17,12 @@ JLSRC="http://www.cs.wisc.edu/~lenz/zaurus/files/"
# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc5.bz2;patch=1 \
+# To be added after OZ 3.5.3
+# ${RPSRC}/corgi_kbd2-r0.patch;patch=1 \
+# ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \
+# ${RPSRC}/corgi_kbd3-r5.patch;patch=1 \
+# ${RPSRC}/sharp_multi_scoop-r2.patch;patch=1 \
+
# Patches submitted upstream are towards top of this list
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
@@ -28,6 +34,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/pxa_irda-r1.patch;patch=1 \
${RPSRC}/corgi_kbd1-r0.patch;patch=1 \
+ ${RPSRC}/pxaudc_susres-r0.patch;patch=1 \
${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r1.patch;patch=1 \
${RPSRC}/sharpsl_param-r3.patch;patch=1 \
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 695df70c12..0588ff40ba 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -21,11 +21,16 @@ COMPATIBLE_HOST = "arm.*-linux"
FILES_kernel = "/boot /tmp"
DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}"
+# Don't want kernel zImage in rootfs, put it into /tmp ramdisk
+FILES_kernel = ""
+ALLOW_EMPTY_kernel = "1"
+FILES_kernel-image += "/tmp/zImage"
+
do_configure_prepend() {
install -m 0644 ${S}/arch/arm/def-configs/${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
}
-pkg_postinst_kernel () {
+pkg_postinst_kernel-image () {
test -f /tmp/zImage || exit 0
cp /tmp/zImage /dev/mtdblock/1
rm /tmp/zImage
@@ -33,6 +38,9 @@ sync
cat /dev/mtdblock/1 >/dev/null
}
+pkg_postinst_kernel () {
+}
+
pkg_postinst_modules () {
if [ -n "$D" ]; then
${HOST_PREFIX}depmod -A -b $D -F $D/boot/System.map-${PV} ${KERNEL_VERSION}
diff --git a/packages/linux/openslug-kernel-2.6.11.2/defconfig b/packages/linux/openslug-kernel-2.6.11.2/defconfig
index e69de29bb2..07ec66bb9a 100644
--- a/packages/linux/openslug-kernel-2.6.11.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.11.2/defconfig
@@ -0,0 +1,1299 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.11
+# Tue Mar 8 02:00:48 2005
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=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=n
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+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 is not set
+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=y
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PXA is not set
+# 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
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+
+#
+# Intel IXP4xx Implementation Options
+#
+
+#
+# IXP4xx Platforms
+#
+# CONFIG_ARCH_AVILA is not set
+# CONFIG_ARCH_ADI_COYOTE is not set
+# CONFIG_ARCH_IXDP425 is not set
+# CONFIG_MACH_IXDPG425 is not set
+# CONFIG_MACH_IXDP465 is not set
+CONFIG_ARCH_NSLU2=y
+# CONFIG_ARCH_PRPMC1100 is not set
+# CONFIG_MACH_GTWX5715 is not set
+
+#
+# IXP4xx Options
+#
+CONFIG_IXP4XX_INDIRECT_PCI=y
+CONFIG_DMABOUNCE=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 is not set
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_XSCALE_PMU=y
+
+#
+# General setup
+#
+CONFIG_PCI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+# CONFIG_XIP_KERNEL is not set
+CONFIG_PCI_LEGACY_PROC=y
+# CONFIG_PCI_NAMES is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PC-card bridges
+#
+
+#
+# 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 is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+CONFIG_PM=y
+# CONFIG_PREEMPT is not set
+CONFIG_APM=y
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000 console=ttyS0,115200n8"
+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=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY 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=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS 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_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_IXP4XX=y
+# CONFIG_MTD_EDB7312 is not set
+# CONFIG_MTD_PCI is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD 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 is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=10240
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+# CONFIG_MD_LINEAR is not set
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+# CONFIG_MD_RAID10 is not set
+CONFIG_MD_RAID5=m
+# CONFIG_MD_RAID6 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_NETLINK_DEV=m
+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=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# 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=m
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+
+#
+# IP: Virtual Server Configuration
+#
+CONFIG_IP_VS=m
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# 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=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_NET_CLS_IND is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NETPOLL=y
+CONFIG_NETPOLL_RX=y
+CONFIG_NETPOLL_TRAP=y
+CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_HIDP is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI 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
+# CONFIG_ETHERTAP is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+CONFIG_NETCONSOLE=m
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+# CONFIG_SERIO is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IXP4XX_WATCHDOG=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_IOP3XX is not set
+# CONFIG_I2C_ISA is not set
+CONFIG_I2C_IXP4XX=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=y
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 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_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_VIA686A 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=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+CONFIG_SENSORS_X1205=y
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+
+#
+# Video Adapters
+#
+# CONFIG_VIDEO_BT848 is not set
+# 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_STRADIS is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# 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 is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+
+#
+# XFS support
+#
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# 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_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# 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 is not set
+# CONFIG_JFFS2_FS_NOR_ECC is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# 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=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# 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=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# 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 is not set
+# 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 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# Misc devices
+#
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+
+#
+# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
+#
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_RW_DETECT is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET=m
+
+#
+# USB Host-to-Host Cables
+#
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_GENESYS=y
+CONFIG_USB_NET1080=y
+CONFIG_USB_PL2301=y
+CONFIG_USB_KC2190=y
+
+#
+# Intelligent USB Devices/Gadgets
+#
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_ZAURUS=y
+CONFIG_USB_CDCETHER=y
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_AX8817X=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB ATM/DSL drivers
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# 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_DEBUG_FS 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
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb
index e69de29bb2..f61ab24748 100644
--- a/packages/linux/openslug-kernel_2.6.11.2.bb
+++ b/packages/linux/openslug-kernel_2.6.11.2.bb
@@ -0,0 +1,61 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
+
+KERNEL_SUFFIX = "openslug"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.2.tar.bz2 \
+ file://nslu2_2.6.11.patch;patch=1 \
+ file://usbnet.patch;patch=1 \
+ file://ixp4xx_copy_from.patch;patch=1 \
+ file://defconfig \
+ file://x1205-rtc.c \
+ file://nslu2-io.c \
+ file://nslu2-setup.c \
+ file://nslu2-pci.c \
+ file://nslu2-part.c \
+ file://nslu2.h"
+S = "${WORKDIR}/linux-2.6.11.2"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+inherit kernel
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+CMDLINE_CONSOLE ?= "ttyS0,115200n8"
+#CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+CMDLINE_ROOT ?= "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ install -m 0644 ${WORKDIR}/x1205-rtc.c ${S}/drivers/i2c/chips/x1205-rtc.c
+ install -m 0644 ${WORKDIR}/nslu2-io.c ${S}/arch/arm/mach-ixp4xx/nslu2-io.c
+ install -m 0644 ${WORKDIR}/nslu2-setup.c ${S}/arch/arm/mach-ixp4xx/nslu2-setup.c
+ install -m 0644 ${WORKDIR}/nslu2-pci.c ${S}/arch/arm/mach-ixp4xx/nslu2-pci.c
+ install -m 0644 ${WORKDIR}/nslu2-part.c ${S}/arch/arm/mach-ixp4xx/nslu2-part.c
+ install -m 0644 ${WORKDIR}/nslu2.h ${S}/include/asm-arm/arch-ixp4xx/nslu2.h
+ echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+ rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
+ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR}/images
+ install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
+python () {
+ # Don't build openslug kernel unless we're targeting an nslu2
+ mach = bb.data.getVar("MACHINE", d, 1)
+ dist = bb.data.getVar("DISTRO", d, 1)
+ if mach != 'nslu2' or dist != 'openslug':
+ raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
+}
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 07eceb42e8..89ca171f5c 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
IMAGE_BASENAME = "openslug"
@@ -26,7 +26,6 @@ IPKG_INSTALL = "base-files base-passwd \
cpio findutils e2fsprogs-mke2fs \
e2fsprogs-fsck e2fsprogs-e2fsck \
kernel-module-nfs kernel-module-sunrpc kernel-module-lockd \
- kernel-module-ehci-hcd \
${OPENSLUG_EXTRA_INSTALL}"
inherit image_ipk
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index 788f07f36e..bcb1c26aeb 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
-PR = "r5"
+PR = "r6"
LICENSE = "GPL"
SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
file://Makefile.patch;patch=0 \
@@ -29,7 +29,7 @@ inherit autotools
EXTRA_OECONF = " \
--prefix=/usr \
--mandir=${mandir} \
- --target=${TARGET_ARCH} \
+ --target=${TARGET_SYS} \
--enable-shared-pp \
\
--disable-win32 \
@@ -53,6 +53,7 @@ EXTRA_OECONF = " \
\
--enable-ossaudio \
\
+ --enable-rtc \
--with-extralibdir=${STAGING_LIBDIR} "
EXTRA_OECONF_append_corgi = " --enable-vidix "
diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index c1ea58ef45..23ce73e00d 100644
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -31,7 +31,7 @@ inherit autotools
EXTRA_OECONF = " \
--prefix=/usr \
--mandir=${mandir} \
- --target=${TARGET_ARCH} \
+ --target=${TARGET_SYS} \
--enable-shared-pp \
\
--disable-win32 \
@@ -56,6 +56,8 @@ EXTRA_OECONF = " \
\
--enable-ossaudio \
\
+ --enable-rtc \
+ \
--with-extralibdir=${STAGING_LIBDIR} "
EXTRA_OECONF_append_corgi = " --enable-vidix "
diff --git a/packages/mysql/mysql-4.1.10a/autofoo.patch b/packages/mysql/mysql-4.1.10a/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mysql/mysql-4.1.10a/autofoo.patch
diff --git a/packages/mysql/mysql-4.1.10a/gen_lex_hash.patch b/packages/mysql/mysql-4.1.10a/gen_lex_hash.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mysql/mysql-4.1.10a/gen_lex_hash.patch
diff --git a/packages/mysql/mysql-native_4.1.10a.bb b/packages/mysql/mysql-native_4.1.10a.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mysql/mysql-native_4.1.10a.bb
diff --git a/packages/mysql/mysql_4.1.10a.bb b/packages/mysql/mysql_4.1.10a.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mysql/mysql_4.1.10a.bb
diff --git a/packages/mysql/mysql_4.1.4a.bb b/packages/mysql/mysql_4.1.4a.bb
deleted file mode 100644
index 60e5b95d81..0000000000
--- a/packages/mysql/mysql_4.1.4a.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "The MySQL Open Source Database System"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "libs"
-DEPENDS += "ncurses mysql-native"
-PR = "r1"
-LICENSE = "GPL"
-SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}-gamma.tar.gz \
- file://autofoo.patch;patch=1 \
- file://gen_lex_hash.patch;patch=1"
-S = "${WORKDIR}/mysql-${PV}-gamma"
-
-inherit autotools
-
-EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'"
-
-do_stage() {
- autotools_stage_includes
- oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR}
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
- mv -f ${D}${libdir}/mysql/* ${D}${libdir}
- rmdir ${D}${libdir}/mysql
-}
-
-PACKAGES =+ "libmysqlclient libmysqlclient-dev"
-
-FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*"
-FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \
- ${bindir}/mysql_config"
-
diff --git a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
index 4b273cec62..15f0616838 100644
--- a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
+++ b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
@@ -1,8 +1,8 @@
SECTION = "base"
-PR = "r42"
+PR = "r43"
-UNSLUNG_VERSION = "4.3-alpha"
+UNSLUNG_VERSION = "4.4-alpha"
UNSLUNG_VARIANT ?= "standard"
DEPENDS = "nslu2-linksys-libs"
diff --git a/packages/openslug-init/openslug-init-0.10/modutils.txt b/packages/openslug-init/openslug-init-0.10/modutils.txt
index 5b4d9938c5..a73b480efe 100644
--- a/packages/openslug-init/openslug-init-0.10/modutils.txt
+++ b/packages/openslug-init/openslug-init-0.10/modutils.txt
@@ -1,2 +1 @@
# Adding modules to be automatically loaded via update-modules
-ehci-hcd
diff --git a/packages/openssh/files/scp-nossl.patch b/packages/openssh/files/scp-nossl.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssh/files/scp-nossl.patch
diff --git a/packages/openssh/openssh-4.0p1/configure.patch b/packages/openssh/openssh-4.0p1/configure.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssh/openssh-4.0p1/configure.patch
diff --git a/packages/openssh/openssh-4.0p1/sshd_config b/packages/openssh/openssh-4.0p1/sshd_config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssh/openssh-4.0p1/sshd_config
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssh/openssh_4.0p1.bb
diff --git a/packages/php/files/autotools.patch b/packages/php/files/autotools.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/php/files/autotools.patch
diff --git a/packages/php/files/pear.patch b/packages/php/files/pear.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/php/files/pear.patch
diff --git a/packages/php/php-native_4.3.10.bb b/packages/php/php-native_4.3.10.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/php/php-native_4.3.10.bb
diff --git a/packages/php/php-native_4.3.6.bb b/packages/php/php-native_4.3.6.bb
index e69de29bb2..f4089207a4 100644
--- a/packages/php/php-native_4.3.6.bb
+++ b/packages/php/php-native_4.3.6.bb
@@ -0,0 +1,5 @@
+SECTION = "console/network"
+include php_${PV}.bb
+inherit native
+FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
+DEPENDS = "zlib-native"
diff --git a/packages/php/php.inc b/packages/php/php.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/php/php.inc
diff --git a/packages/php/php_4.3.10.bb b/packages/php/php_4.3.10.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/php/php_4.3.10.bb
diff --git a/packages/php/php_4.3.6.bb b/packages/php/php_4.3.6.bb
index dddd11cd5e..496e90c78a 100644
--- a/packages/php/php_4.3.6.bb
+++ b/packages/php/php_4.3.6.bb
@@ -1,28 +1 @@
-SECTION = "console/network"
-DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-LICENSE = "PHP"
-SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
- file://${FILESDIR}/autotools.patch;patch=1 \
- file://${FILESDIR}/pear.patch;patch=1"
-S = "${WORKDIR}/php-${PV}"
-
-inherit autotools
-
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
- --with-mysql \
- --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
- --without-libpng --without-libjpeg \
- --with-config-file-path=${sysconfdir}/php4"
-
-EXTRA_OECONF += " --without-pear"
-# Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
-#DEPENDS += " php-native"
-
-acpaths = ""
-
-do_install () {
- oe_runmake 'INSTALL_ROOT=${D}' install
-}
+include php.inc
diff --git a/packages/python/python-2.4.0-manifest.inc b/packages/python/python-2.4.0-manifest.inc
index 6266632b83..85ab52c16a 100644
--- a/packages/python/python-2.4.0-manifest.inc
+++ b/packages/python/python-2.4.0-manifest.inc
@@ -1,4 +1,4 @@
-### AUTO-GENERATED by './generate-bb.py' [(C) 2002-2004 Michael Lauer] on Sat Oct 16 12:45:14 2004
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael Lauer] on Sun Mar 13 16:12:54 2005
###
### Warning: Manual edits will be lost!
###
@@ -39,7 +39,7 @@ FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* $
DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
PR_python-core="ml2"
RDEPENDS_python-core=""
-FILES_python-core="${libdir}/python2.4/__future__.* ${libdir}/python2.4/copy.* ${libdir}/python2.4/copy_reg.* ${libdir}/python2.4/ConfigParser.py ${libdir}/python2.4/getopt.* ${libdir}/python2.4/new.* ${libdir}/python2.4/os.* ${libdir}/python2.4/posixpath.* ${libdir}/python2.4/warnings.* ${libdir}/python2.4/site.* ${libdir}/python2.4/stat.* ${libdir}/python2.4/UserDict.* ${libdir}/python2.4/lib-dynload/binascii.so ${libdir}/python2.4/lib-dynload/struct.so ${libdir}/python2.4/lib-dynload/time.so ${libdir}/python2.4/lib-dynload/xreadlines.so ${libdir}/python2.4/types.* ${bindir}/python "
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
DESCRIPTION_python-io="Python Low-Level I/O"
PR_python-io="ml2"
@@ -144,7 +144,7 @@ FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/pyt
DESCRIPTION_python-pydoc="Python Interactive Help Support"
PR_python-pydoc="ml2"
RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.4/pydoc.* "
+FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
DESCRIPTION_python-xml="Python basic XML support."
PR_python-xml="ml2"
@@ -197,9 +197,9 @@ RDEPENDS_python-crypt="python-core"
FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so "
DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml2"
+PR_python-lang="ml3"
RDEPENDS_python-lang="python-core"
-FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
+FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
DESCRIPTION_python-audio="Python Audio Handling"
PR_python-audio="ml2"
diff --git a/packages/recode/recode_3.6.bb b/packages/recode/recode_3.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/recode/recode_3.6.bb
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
diff --git a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
index e69de29bb2..7175380e1a 100644
--- a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
+++ b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
@@ -0,0 +1,81 @@
+DESCRIPTION = "Allows applications compiled with 2.95 to run on a 3.x compiled \
+system by providing 2.95 libraries. To run compatible programs, use the Compat \
+Library program in the Settings menu to make them use these libraries."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+RDEPENDS = "opie-sh"
+RPROVIDES = "oz-compat"
+RCONFLICTS = "oz-compat"
+MAINTAINER = "Tim Ansell <mithro AT mithis.net>"
+LICENSE = "GPL"
+PR = "r1"
+
+EXCLUDE_FROM_WORLD = "1"
+EXCLUDE_FROM_SHLIBS = "1"
+
+SRC_URI = "http://openzaurus.org/mirror/oz-compat_0.5.tar.gz \
+ file://hentges.patch;patch=1 \
+ file://qt2310.patch;patch=1"
+
+S = "${WORKDIR}/oz-compat-0.5"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "quickexec"
+INITSCRIPT_PARAMS = "defaults 10"
+
+do_install() {
+ install -d ${D}${palmtopdir}/apps/Settings
+ install -d ${D}${palmtopdir}/bin/
+ install -d ${D}${palmtopdir}/etc/
+ install -d ${D}${palmtopdir}/pics/
+
+ install -d ${D}/opt/QtPalmtop.compat/bin
+ install -d ${D}/opt/QtPalmtop.compat/binlib
+ install -d ${D}/opt/QtPalmtop.compat/lib
+
+ install -d ${D}${sysconfdir}/init.d
+
+ install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings
+ install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}${palmtopdir}/etc/quickexec.libs
+ install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}${palmtopdir}/pics/libraries.png
+
+ install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin
+ install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib
+
+ install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}${sysconfdir}/init.d
+
+ cd ${D}${palmtopdir}/bin
+ for file in chkhinge makecompat qeserver quickexec runcompat
+ do
+ ln -s /opt/QtPalmtop.compat/bin/$file
+ done
+
+ cd ${D}/opt/QtPalmtop.compat/lib
+ ln -s libqpe.so.1.5.0 libqpe.so.1.5
+ ln -s libqpe.so.1.5.0 libqpe.so.1
+ ln -s libqpe.so.1.5.0 libqpe.so
+
+ ln -s libqte.so.2.3.7 libqte.so.2.3.2
+ ln -s libqte.so.2.3.7 libqte.so.2.3
+ ln -s libqte.so.2.3.7 libqte.so.2
+ ln -s libqte.so.2.3.7 libqte.so
+
+
+}
+
+pkg_postinst() {
+test -n "$D" && exit 1
+
+# needed for update-rc.d
+test -e /media/card/etc/init.d/quickexec && ln -s /media/card/etc/init.d/quickexec /etc/init.d/quickexec
+test -e /media/cf/etc/init.d/quickexec && ln -s /media/cf/etc/init.d/quickexec /etc/init.d/quickexec
+test -e /media/ram/etc/init.d/quickexec && ln -s /media/ram/etc/init.d/quickexec /etc/init.d/quickexec
+}
+
+pkg_postrm() {
+ test -e /etc/init.d/quickexec && rm /etc/init.d/quickexec
+}
+
+FILES_${PN} += "/opt /etc"
+LEAD_SONAME = "libqte.so.*"
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index faf088208f..64860d1377 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -7,7 +7,7 @@ PR = "r2"
RDEPENDS = "perl-native"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_1"
+SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_1"
S = "${WORKDIR}"
diff --git a/packages/vlc/files/fix-pda.patch b/packages/vlc/files/fix-pda.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vlc/files/fix-pda.patch
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vlc/vlc-gpe_0.8.1.bb