[oe-commits] org.oe.dev merge of '0cb718c4b71b8cd025b681dd7861a927c49006f9'

[oe commit]

merge of '0cb718c4b71b8cd025b681dd7861a927c49006f9'
     and '678aafb268a6d6220e4ccfcf905231ac20a5b722'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2db4e9cef88c3ec05f6df40ed5af176f05ff53f2
ViewMTN: http://monotone.openembedded.org/revision/info/2db4e9cef88c3ec05f6df40ed5af176f05ff53f2
Files:
1
packages/kobodeluxe/files/buildfix.patch
packages/kobodeluxe/kobodeluxe_0.5.1.bb
packages/fuse/fuse-module-2.5.3
packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch
packages/fuse/fuse-module_2.5.3.bb
packages/meta/slugos-packages.bb
packages/tasks/task-slugos.bb
Diffs:

#
# mt diff -r0cb718c4b71b8cd025b681dd7861a927c49006f9 -r2db4e9cef88c3ec05f6df40ed5af176f05ff53f2
#
# 
# 
# add_file "packages/kobodeluxe/files/buildfix.patch"
#  content [2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e]
# 
# patch "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
#  from [6f71e3405f6607ff54f63f6cd5e55312b2cfdc58]
#    to [86d0cc4ba30bab1bfdef84b4944a8f2df96cdac3]
# 
============================================================
--- 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/kobodeluxe_0.5.1.bb	6f71e3405f6607ff54f63f6cd5e55312b2cfdc58
+++ packages/kobodeluxe/kobodeluxe_0.5.1.bb	86d0cc4ba30bab1bfdef84b4944a8f2df96cdac3
@@ -5,20 +5,25 @@ HOMEPAGE = "http://olofson.net/kobodl"
 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
 
-EXTRA_OECONF = "--disable-sdltest"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
+EXTRA_OECONF = "--disable-opengl --disable-sdltest"
+
 PACKAGES += "${PN}-data"
 
 FILES_${PN}-data = "${datadir}"


#
# mt diff -r678aafb268a6d6220e4ccfcf905231ac20a5b722 -r2db4e9cef88c3ec05f6df40ed5af176f05ff53f2
#
# 
# 
# add_dir "packages/fuse/fuse-module-2.5.3"
# 
# 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]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [49ebdfc64be77f73c5822ee9dab75bd89fe8cb25]
#    to [49adce7cb34d7e6a32ed9df247b8e7b2aad23bba]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [1a313f3e4a3e8303d0d5961ed5f57295673414d6]
#    to [17a889149bf02e7e6c1b412a448bf3d09cb0e4be]
# 
============================================================
--- 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/meta/slugos-packages.bb	49ebdfc64be77f73c5822ee9dab75bd89fe8cb25
+++ packages/meta/slugos-packages.bb	49adce7cb34d7e6a32ed9df247b8e7b2aad23bba
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r45"
+PR = "r46"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -101,6 +101,7 @@ SLUGOS_PACKAGES = "\
 	gzip \
 	hdparm \
 	ifupdown \
+	inetutils \
 	iperf \
 	ipkg-utils \
 	iptables \
@@ -108,6 +109,7 @@ SLUGOS_PACKAGES = "\
 	irssi \
 	joe \
 	jpeg \
+	kexec-tools \
 	lcdproc \
 	less \
 	libao \
@@ -192,6 +194,7 @@ SLUGOS_PACKAGES = "\
 	reiserfsprogs reiser4progs \
 	rng-tools \
 	rsync \
+	rtorrent \
 	samba \
 	sane-backends \
 	screen \
============================================================
--- packages/tasks/task-slugos.bb	1a313f3e4a3e8303d0d5961ed5f57295673414d6
+++ packages/tasks/task-slugos.bb	17a889149bf02e7e6c1b412a448bf3d09cb0e4be
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -67,6 +67,7 @@ kernel-module-nls-utf8 \
 kernel-module-vfat \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
+kernel-module-nfs \
 "
 
 # Add daemon required for HW RNG support
@@ -102,7 +103,6 @@ kernel-module-via-velocity \
 #
 # portmap \
 # kexec-tools \
-# kernel-module-nfs \
 # kernel-module-isofs \
 # kernel-module-udf \
 # kernel-module-loop \