[oe-commits] org.oe.dev merge of '2db4e9cef88c3ec05f6df40ed5af176f05ff53f2'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Feb 10 07:06:26 UTC 2008
merge of '2db4e9cef88c3ec05f6df40ed5af176f05ff53f2'
and 'ff65599591bcdfa3d446b1ea051a1d78970b2a0e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b7a3bc32d91c2107e8c37a27d9407cc8617ef6bb
ViewMTN: http://monotone.openembedded.org/revision/info/b7a3bc32d91c2107e8c37a27d9407cc8617ef6bb
Files:
1
packages/fuse/fuse-2.7.2
packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
packages/fuse/fuse-module_2.7.2.bb
packages/fuse/fuse_2.7.2.bb
packages/fuse/fuse-module-2.5.3
packages/kobodeluxe
packages/kobodeluxe/files
packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch
packages/fuse/fuse-module_2.5.3.bb
packages/kobodeluxe/files/buildfix.patch
packages/kobodeluxe/files/debian-kobo.patch
packages/kobodeluxe/kobodeluxe_0.5.1.bb
packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot
packages/udev/files/slugos/mount.sh
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
MAINTAINERS
packages/dbus-java/dbus-java_2.3.bb
packages/libmatthew/libmatthew_0.5.bb
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx_2.6.24.bb
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/meta/slugos-packages.bb
packages/netbase/netbase_4.21.bb
packages/rxtx/rxtx_2.1-7r2.bb
packages/slugos-init/files/boot/network
packages/slugos-init/slugos-init_4.8.bb
packages/tasks/task-slugos.bb
packages/udev/udev_100.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:
#
# mt diff -r2db4e9cef88c3ec05f6df40ed5af176f05ff53f2 -rb7a3bc32d91c2107e8c37a27d9407cc8617ef6bb
#
#
#
# add_dir "packages/fuse/fuse-2.7.2"
#
# add_file "packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch"
# content [87f674d617d4471de42092a0ddef939de1626716]
#
# add_file "packages/fuse/fuse-module_2.7.2.bb"
# content [18508e3a2ef6dcff4b6e5195c41b8b231e169cf7]
#
# add_file "packages/fuse/fuse_2.7.2.bb"
# content [558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd]
#
============================================================
--- packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch 87f674d617d4471de42092a0ddef939de1626716
+++ packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch 87f674d617d4471de42092a0ddef939de1626716
@@ -0,0 +1,15 @@
+Index: fuse-2.7.2/util/Makefile.am
+===================================================================
+--- fuse-2.7.2.orig/util/Makefile.am 2007-04-26 01:36:47.000000000 +0930
++++ fuse-2.7.2/util/Makefile.am 2008-02-10 16:43:19.000000000 +1030
+@@ -33,10 +33,6 @@
+ $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+- @if test -x /usr/sbin/update-rc.d; then \
+- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+- fi
+
+ install-data-local:
+ $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
============================================================
--- packages/fuse/fuse-module_2.7.2.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
+++ packages/fuse/fuse-module_2.7.2.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
@@ -0,0 +1,29 @@
+require fuse.inc
+
+RRECOMMENDS = "fuse"
+PR = "r0"
+
+S = "${WORKDIR}/fuse-${PV}"
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
+EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+ cd ${S} ; oe_runconf
+}
+
+do_compile(){
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake
+}
+
+fakeroot do_install() {
+ LDFLAGS=""
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+ cd ${S}/kernel
+ oe_runmake install DESTDIR=${D}
+}
+
============================================================
--- packages/fuse/fuse_2.7.2.bb 558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
+++ packages/fuse/fuse_2.7.2.bb 558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
@@ -0,0 +1,27 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+fakeroot do_stage() {
+ autotools_stage_all
+}
+
+
#
# mt diff -rff65599591bcdfa3d446b1ea051a1d78970b2a0e -rb7a3bc32d91c2107e8c37a27d9407cc8617ef6bb
#
#
#
# add_dir "packages/fuse/fuse-module-2.5.3"
#
# add_dir "packages/kobodeluxe"
#
# add_dir "packages/kobodeluxe/files"
#
# add_file "packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch"
# content [58653fb90ef7157df5508a85b4c9df3c805dfc09]
#
# add_file "packages/fuse/fuse-module_2.5.3.bb"
# content [496f6d970646c70b509c66d2f3b2d963418af819]
#
# add_file "packages/kobodeluxe/files/buildfix.patch"
# content [2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e]
#
# add_file "packages/kobodeluxe/files/debian-kobo.patch"
# content [1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a]
#
# add_file "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
# content [86d0cc4ba30bab1bfdef84b4944a8f2df96cdac3]
#
# add_file "packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot"
# content [225fbcdfa332608a2c8f1360fc922261f28ba694]
#
# add_file "packages/udev/files/slugos/mount.sh"
# content [9e59c21651fc2f3094b4be636f3d58bf29c2b0c7]
#
# add_file "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
# content [e5e3556e1bceb28bc0993ea107c09a15d5f6b215]
#
# patch "MAINTAINERS"
# from [b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02]
# to [42e1fd8bf852c29ab5e08a51152c446726334145]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [0f364694e12942f190ab3353a87700e5ae39ac26]
# to [17764905d124799a8edd17b918d5840fb5165cb9]
#
# patch "packages/libmatthew/libmatthew_0.5.bb"
# from [23e5bf387eae5233d4fd7f2f2ec8be582756bac2]
# to [4d5017a96ee835a24017a6f101e47e55243c6816]
#
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# from [ad1b8632676bd6456ca0ae5a7fbfe7125fe01fb9]
# to [2358fe351f97ad015b3e58e2534dd17058c60d52]
#
# patch "packages/linux/linux-ixp4xx_2.6.24.bb"
# from [8c6ec0c27876836cdbb7b4bef1f61641fe013dd7]
# to [6df87e421ee2408a059092ec0b63b1393e0c03ce]
#
# patch "packages/logic-analyzer/logic-analyzer_0.8.bb"
# from [1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad]
# to [6d578bf0553be1e28b4a10f6b80b958df29d68c8]
#
# patch "packages/meta/slugos-packages.bb"
# from [49ebdfc64be77f73c5822ee9dab75bd89fe8cb25]
# to [49adce7cb34d7e6a32ed9df247b8e7b2aad23bba]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [af669d9b9d58a59681b0445de61ca6198bb991e1]
# to [e8599c2f3bf24aaaf6db4afc8fb1f79a74ba059b]
#
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
# from [3974ebf631b2b9bafd21186daeaaa81409ba5eec]
# to [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
#
# patch "packages/slugos-init/files/boot/network"
# from [4fe9fe097faa17da41a09d209399c67df115768c]
# to [24a86887b19822c0276b0b4206959bddae2cd3c3]
#
# patch "packages/slugos-init/slugos-init_4.8.bb"
# from [5c3b2fe18a30d3510095f7868b4e32f248080492]
# to [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
#
# patch "packages/tasks/task-slugos.bb"
# from [1a313f3e4a3e8303d0d5961ed5f57295673414d6]
# to [17a889149bf02e7e6c1b412a448bf3d09cb0e4be]
#
# patch "packages/udev/udev_100.bb"
# from [ba7ba1e986f3e6a91b52b018b80113898d5f8cab]
# to [72309dab97aeccd4e512bd8d643d6467df4340e8]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [ab6b7713f6a5d17b7c19e07445de40a86cc924e5]
# to [4b5d3af5cb182cae469a03c02b833de42df211ed]
#
============================================================
--- packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch 58653fb90ef7157df5508a85b4c9df3c805dfc09
+++ packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch 58653fb90ef7157df5508a85b4c9df3c805dfc09
@@ -0,0 +1,11 @@
+--- fuse-2.5.3/kernel/Makefile.in.orig 2008-01-05 20:43:00.000000000 -0600
++++ fuse-2.5.3/kernel/Makefile.in 2008-01-05 20:43:25.000000000 -0600
+@@ -54,8 +54,6 @@
+
+ ifeq ($(majver), 2.4)
+
+-CC = gcc
+-LD = ld
+ CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe @KERNELCFLAGS@
+ CPPFLAGS = -I at kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@
+
============================================================
--- packages/fuse/fuse-module_2.5.3.bb 496f6d970646c70b509c66d2f3b2d963418af819
+++ packages/fuse/fuse-module_2.5.3.bb 496f6d970646c70b509c66d2f3b2d963418af819
@@ -0,0 +1,31 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://preserve_CC_with_2_4_kernel.patch;patch=1"
+
+S = "${WORKDIR}/fuse-${PV}"
+
+FILES_${PN} = "${base_libdir}/modules"
+
+EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+ cd ${S}
+ oe_runconf
+}
+
+do_compile(){
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake
+}
+
+fakeroot do_install() {
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake install DESTDIR=${D}
+}
+
============================================================
--- packages/kobodeluxe/files/buildfix.patch 2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e
+++ packages/kobodeluxe/files/buildfix.patch 2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e
@@ -0,0 +1,21 @@
+Index: kobodeluxe-0.5.1/graphics/gfxengine.cpp
+===================================================================
+--- kobodeluxe-0.5.1.orig/graphics/gfxengine.cpp 2008-02-10 03:02:29.000000000 +0100
++++ kobodeluxe-0.5.1/graphics/gfxengine.cpp 2008-02-10 03:03:45.000000000 +0100
+@@ -25,6 +25,7 @@
+
+ #include <string.h>
+ #include <math.h>
++#include <stdlib.h>
+
+ #include "gfxengine.h"
+ #include "filters.h"
+@@ -765,7 +766,7 @@
+ return 0;
+
+ if(_centered && !_fullscreen)
+- SDL_putenv((char *)"SDL_VIDEO_CENTERED=1");
++ putenv((char *)"SDL_VIDEO_CENTERED=1");
+
+ log_printf(DLOG, "Opening screen...\n");
+ if(!SDL_WasInit(SDL_INIT_VIDEO))
============================================================
--- packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
+++ packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
@@ -0,0 +1,72 @@
+--- kobodeluxe-0.5.1.orig/kobo.cpp
++++ kobodeluxe-0.5.1/kobo.cpp
+@@ -141,21 +141,21 @@
+ * Graphics data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("GFX", "./data/gfx");
++ //fmap->addpath("GFX", "./data/gfx");
+ /* Real data dir */
+ fmap->addpath("GFX", "DATA>>gfx");
+ /* Current dir */
+- fmap->addpath("GFX", "./gfx");
++ //fmap->addpath("GFX", "./gfx");
+
+ /*
+ * Sound data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("SFX", "./data/sfx");
++ //fmap->addpath("SFX", "./data/sfx");
+ /* Real data dir */
+ fmap->addpath("SFX", "DATA>>sfx");
+ /* Current dir */
+- fmap->addpath("SFX", "./sfx");
++ //fmap->addpath("SFX", "./sfx");
+
+ /*
+ * Score files (user and global)
+@@ -173,7 +173,7 @@
+ /* System local */
+ fmap->addpath("CONFIG", SYSCONF_DIR);
+ /* In current dir (last resort) */
+- fmap->addpath("CONFIG", "./");
++ //fmap->addpath("CONFIG", "./");
+ }
+
+
+--- kobodeluxe-0.5.1.orig/graphics/window.cpp
++++ kobodeluxe-0.5.1/graphics/window.cpp
+@@ -331,7 +331,7 @@
+ }
+
+
+-void window_t::center_token(int _x, int _y, const char *txt, char token)
++void window_t::center_token(int _x, int _y, const char *txt, signed char token)
+ {
+ center_token_fxp(PIXEL2CS(_x), PIXEL2CS(_y), txt, token);
+ }
+@@ -374,7 +374,7 @@
+ }
+
+
+-void window_t::center_token_fxp(int _x, int _y, const char *txt, char token)
++void window_t::center_token_fxp(int _x, int _y, const char *txt, signed char token)
+ {
+ _x = CS2PIXEL((_x * xs + 128) >> 8);
+ _y = CS2PIXEL((_y * ys + 128) >> 8);
+--- kobodeluxe-0.5.1.orig/graphics/window.h
++++ kobodeluxe-0.5.1/graphics/window.h
+@@ -265,10 +265,10 @@
+ void font(int fnt);
+ void string(int _x, int _y, const char *txt);
+ void center(int _y, const char *txt);
+- void center_token(int _x, int _y, const char *txt, char token = 0);
++ void center_token(int _x, int _y, const char *txt, signed char token = 0);
+ void string_fxp(int _x, int _y, const char *txt);
+ void center_fxp(int _y, const char *txt);
+- void center_token_fxp(int _x, int _y, const char *txt, char token = 0);
++ void center_token_fxp(int _x, int _y, const char *txt, signed char token = 0);
+ int textwidth(const char *txt, int min = 0, int max = 255);
+ int textwidth_fxp(const char *txt, int min = 0, int max = 255);
+ int fontheight();
============================================================
--- packages/kobodeluxe/kobodeluxe_0.5.1.bb 86d0cc4ba30bab1bfdef84b4944a8f2df96cdac3
+++ packages/kobodeluxe/kobodeluxe_0.5.1.bb 86d0cc4ba30bab1bfdef84b4944a8f2df96cdac3
@@ -0,0 +1,31 @@
+DESCRIPTION = "Fast-paced 2D top-down shooter where you have to destroy space station"
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "David Olofson <david at olofson.net>"
+HOMEPAGE = "http://olofson.net/kobodl"
+
+PR = "r1"
+
+DEPENDS = "libsdl-image virtual/libsdl"
+
+RDEPENDS_${PN} = "${PN}-data"
+
+SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
+ file://debian-kobo.patch;patch=1 \
+ file://buildfix.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/KoboDeluxe-${PV}"
+
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+EXTRA_OECONF = "--disable-opengl --disable-sdltest"
+
+PACKAGES += "${PN}-data"
+
+FILES_${PN}-data = "${datadir}"
+
+PACKAGE_ARCH_${PN}-data = "all"
============================================================
--- packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot 225fbcdfa332608a2c8f1360fc922261f28ba694
+++ packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot 225fbcdfa332608a2c8f1360fc922261f28ba694
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+if [ X"$IFACE" == "Xeth0" ] ; then
+ nfsroot=`grep ' / nfs ' /proc/mounts`
+ if [ -n "$nfsroot" ]; then
+ echo "WARNING: Refusing to ifup eth0 when booted to a nfs-mounted rootfs."
+ exit 1
+ fi
+fi
+exit 0
============================================================
--- packages/udev/files/slugos/mount.sh 9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
+++ packages/udev/files/slugos/mount.sh 9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Called from udev
+# Attemp to mount any added block devices
+# and remove any removed devices
+#
+
+MOUNT="/bin/mount"
+PMOUNT="/usr/bin/pmount"
+UMOUNT="/bin/umount"
+name="`basename "$DEVNAME"`"
+
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+ if ( echo "$DEVNAME" | grep -q "$line" )
+ then
+ logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+ exit 0
+ fi
+done
+
+automount() {
+ ! test -d "/media/$name" && mkdir -p "/media/$name"
+
+ if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+ then
+ #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
+ rm_dir "/media/$name"
+ else
+ logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
+ touch "/tmp/.automount-$name"
+ fi
+}
+
+rm_dir() {
+ # We do not want to rm -r populated directories
+ if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
+ then
+ ! test -z "$1" && rm -r "$1"
+ else
+ logger "mount.sh/automount" "Not removing non-empty directory [$1]"
+ fi
+}
+
+if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
+ # SlugOS: we pivot to the rootfs based on UUID, not on fstab -- so the fstab may not
+ # be correct at this point in the boot. So we must not let udev mount devices based
+ # soley on the fstab, lest we mount overtop the real rootfs. For now we just comment
+ # out the logic below and let the automount logic (far below) deal with all udev mount
+ # operations.
+ #if [ -x "$PMOUNT" ]; then
+ # $PMOUNT $DEVNAME 2> /dev/null
+ #elif [ -x $MOUNT ]; then
+ # $MOUNT $DEVNAME 2> /dev/null
+ #fi
+
+ # If the device isn't mounted at this point, it isn't configured in fstab
+ # 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
+ # its true device name so this would break. If the rootfs is mounted on two places
+ # during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
+ # to /etc/udev/mount.blacklist via postinst
+
+ cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount
+
+fi
+
+
+
+if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
+ for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+ do
+ $UMOUNT $mnt
+ done
+
+ # Remove empty directories from auto-mounter
+ test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
+fi
============================================================
--- packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch e5e3556e1bceb28bc0993ea107c09a15d5f6b215
+++ packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch e5e3556e1bceb28bc0993ea107c09a15d5f6b215
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
============================================================
--- MAINTAINERS b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02
+++ MAINTAINERS 42e1fd8bf852c29ab5e08a51152c446726334145
@@ -264,3 +264,14 @@ Recipes: avahi, libgsmd
Distros: Ångström
Machines: hx4700, magician
Recipes: avahi, libgsmd
+
+Person: Robert Schuster 'thebohemian'
+Mail: robert.schuster at tarent.de, thebohemian at gmx.net
+Website: http://fsfe.org/en/fellows/robertschuster/weblog
+Interests: free software, java, games
+Distros: chinook-compat
+Recipes: jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native
+Recipes: classpath*, cacao*, jamvm*
+Recipes: swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull
+Recipes: midpath*, logic-analyze
+Recipes: kobodeluxe
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 0f364694e12942f190ab3353a87700e5ae39ac26
+++ packages/dbus-java/dbus-java_2.3.bb 17764905d124799a8edd17b918d5840fb5165cb9
@@ -1,10 +1,9 @@ SECTION = "libs"
DESCRIPTION = "A pure Java D-Bus Implementation"
DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
LICENSE = "GPLv2 AFL"
SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester at tarent.de>"
HOMEPAGE = "http://jalimo.org"
AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
============================================================
--- packages/libmatthew/libmatthew_0.5.bb 23e5bf387eae5233d4fd7f2f2ec8be582756bac2
+++ packages/libmatthew/libmatthew_0.5.bb 4d5017a96ee835a24017a6f101e47e55243c6816
@@ -1,7 +1,6 @@ SECTION = "libs"
DESCRIPTION = "Unix socket, debug and hexdump libraries"
LICENSE = "LGPL"
SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester at tarent.de>"
HOMEPAGE = "http://jalimo.org"
AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
============================================================
--- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 ad1b8632676bd6456ca0ae5a7fbfe7125fe01fb9
+++ packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 2358fe351f97ad015b3e58e2534dd17058c60d52
@@ -243,6 +243,7 @@ CONFIG_KEXEC=y
CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8"
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
#
# Floating point emulation
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.bb 8c6ec0c27876836cdbb7b4bef1f61641fe013dd7
+++ packages/linux/linux-ixp4xx_2.6.24.bb 6df87e421ee2408a059092ec0b63b1393e0c03ce
@@ -11,7 +11,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
============================================================
--- packages/logic-analyzer/logic-analyzer_0.8.bb 1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad
+++ packages/logic-analyzer/logic-analyzer_0.8.bb 6d578bf0553be1e28b4a10f6b80b958df29d68c8
@@ -1,6 +1,5 @@ LICENSE = "GPL"
DESCRIPTION = "A Java-based logical analyzer for hom%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list