merge of '12b22f976a76556942fa1ed3a18167d5e59a261c'

     and '890201ff9b740ceb2b02680d2dede9da64858c14'

42 files changed, 477 insertions, 170 deletions

diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index aac4688c3a..619b0f4339 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -17,7 +17,7 @@ PREFERRED_VERSION_linux = "2.6.20"
 
 # We want udev support in the image
 udevdir = "/dev"
-N2100_SUPPORT ?= "cpio uboot-utils udev"
+N2100_SUPPORT ?= "cpio udev"
 BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 EXTRA_IMAGECMD_jffs2 += " --little-endian"
 
diff --git a/packages/dtc/.mtn2git_empty b/packages/dtc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dtc/.mtn2git_empty
diff --git a/packages/dtc/dtc-native_20070216.bb b/packages/dtc/dtc-native_20070216.bb
new file mode 100644
index 0000000000..8d8cf517a0
--- /dev/null
+++ b/packages/dtc/dtc-native_20070216.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "dtc tool"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz"
+
+S = "${WORKDIR}/dtc"
+
+inherit autotools native
+
+do_stage() {
+	install -m 755 dtc ${STAGING_BINDIR}/dtc
+}
diff --git a/packages/dtc/dtc-native_git.bb b/packages/dtc/dtc-native_git.bb
new file mode 100644
index 0000000000..9ef9292e92
--- /dev/null
+++ b/packages/dtc/dtc-native_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "dtc tool"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools native
+
+do_stage() {
+	install -m 755 dtc ${STAGING_BINDIR}/dtc
+}
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc
index 1deaf3d94a..82bf78db80 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package.inc
@@ -67,6 +67,12 @@ FILES_${PN}-doc = "${infodir} \
 		   ${mandir} \
 		   ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
 
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
 
 do_install () {
 	autotools_do_install
diff --git a/packages/gd/gd_2.0.33.bb b/packages/gd/gd_2.0.33.bb
index 78500bbcbd..7c1f7c3d19 100644
--- a/packages/gd/gd_2.0.33.bb
+++ b/packages/gd/gd_2.0.33.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
 DEPENDS = "libpng jpeg zlib"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
 S = "${WORKDIR}/gd-${PV}"
@@ -12,6 +12,8 @@ inherit autotools binconfig gettext
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
                   --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
+                  --without-freetype \
+                  --without-fontconfig \
                   --without-xpm \
                   --without-x"
 
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 4cad10fd73..5783ab1fcf 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -40,7 +40,7 @@ FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
 FILES_nscd = "${sbindir}/nscd*"
 FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_glibc-gconv = "${libdir}/gconv/*"
-FILES_${PN}-dbg += " ${libdir}/gconv/.debug"
+FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug"
 FILES_catchsegv = "${bindir}/catchsegv"
 RDEPENDS_catchsegv = "libsegfault"
 FILES_glibc-pcprofile = "/lib/libpcprofile.so"
diff --git a/packages/gpe-clock/gpe-clock.inc b/packages/gpe-clock/gpe-clock.inc
new file mode 100644
index 0000000000..34f628dcea
--- /dev/null
+++ b/packages/gpe-clock/gpe-clock.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "GPE panel clock"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
+RDEPENDS = "gpe-announce atd"
+
+inherit gpe
diff --git a/packages/gpe-clock/gpe-clock_0.14.bb b/packages/gpe-clock/gpe-clock_0.14.bb
index 9dcb7a6fcb..8b888f5126 100644
--- a/packages/gpe-clock/gpe-clock_0.14.bb
+++ b/packages/gpe-clock/gpe-clock_0.14.bb
@@ -1,11 +1,5 @@
-inherit gpe
+require gpe-clock.inc
 
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
diff --git a/packages/gpe-clock/gpe-clock_0.20.bb b/packages/gpe-clock/gpe-clock_0.20.bb
index 121db0c807..3ef23edcb2 100644
--- a/packages/gpe-clock/gpe-clock_0.20.bb
+++ b/packages/gpe-clock/gpe-clock_0.20.bb
@@ -1,10 +1,3 @@
-inherit gpe
-
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require gpe-clock.inc
 
 SRC_URI += "file://default-time-24hrs.patch;patch=1"
diff --git a/packages/gpe-clock/gpe-clock_0.21.bb b/packages/gpe-clock/gpe-clock_0.21.bb
index 51b001208b..de509fda40 100644
--- a/packages/gpe-clock/gpe-clock_0.21.bb
+++ b/packages/gpe-clock/gpe-clock_0.21.bb
@@ -1,9 +1 @@
-inherit gpe
-
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
+require gpe-clock.inc
diff --git a/packages/gpe-clock/gpe-clock_0.23.bb b/packages/gpe-clock/gpe-clock_0.23.bb
index 51b001208b..de509fda40 100644
--- a/packages/gpe-clock/gpe-clock_0.23.bb
+++ b/packages/gpe-clock/gpe-clock_0.23.bb
@@ -1,9 +1 @@
-inherit gpe
-
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
+require gpe-clock.inc
diff --git a/packages/gpe-clock/gpe-clock_0.24.bb b/packages/gpe-clock/gpe-clock_0.24.bb
index 51b001208b..de509fda40 100644
--- a/packages/gpe-clock/gpe-clock_0.24.bb
+++ b/packages/gpe-clock/gpe-clock_0.24.bb
@@ -1,9 +1 @@
-inherit gpe
-
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
+require gpe-clock.inc
diff --git a/packages/gpe-clock/gpe-clock_0.25.bb b/packages/gpe-clock/gpe-clock_0.25.bb
index 51b001208b..de509fda40 100644
--- a/packages/gpe-clock/gpe-clock_0.25.bb
+++ b/packages/gpe-clock/gpe-clock_0.25.bb
@@ -1,9 +1 @@
-inherit gpe
-
-DESCRIPTION = "GPE panel clock"
-DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
-RDEPENDS = "gpe-announce atd"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
+require gpe-clock.inc
diff --git a/packages/gpe-nmf/gpe-nmf.inc b/packages/gpe-nmf/gpe-nmf.inc
new file mode 100644
index 0000000000..d3b39abdcf
--- /dev/null
+++ b/packages/gpe-nmf/gpe-nmf.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "GPE audio player"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
+RDEPENDS = "esd gst-plugins gst-plugin-audio gst-plugin-audioconvert gst-plugin-audiofile gst-plugin-esd gst-plugin-typefindfunctions gst-plugin-volume"
+RRECOMMENDS = "gst-plugin-mad gst-plugin-tagedit"
+
+inherit gpe pkgconfig
+
+
+PARALLEL_MAKE=""
diff --git a/packages/gpe-nmf/gpe-nmf_0.17.bb b/packages/gpe-nmf/gpe-nmf_0.17.bb
index bf45dc5d56..93fd043e63 100644
--- a/packages/gpe-nmf/gpe-nmf_0.17.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.17.bb
@@ -1,9 +1,6 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
+require gpe-nmf.inc
 
-DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
-SECTION = "gpe"
-PRIORITY = "optional"
+RDEPENDS = ""
+RRECOMMENDS = ""
 
 SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/packages/gpe-nmf/gpe-nmf_0.19.bb b/packages/gpe-nmf/gpe-nmf_0.19.bb
index 9f87e6abdc..6ee24032e0 100644
--- a/packages/gpe-nmf/gpe-nmf_0.19.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.19.bb
@@ -1,20 +1,3 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
+require gpe-nmf.inc
 
-DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
-RDEPENDS = "esd \
-	gst-plugins \
-	gst-plugin-audio \
-	gst-plugin-audioconvert \
-	gst-plugin-audiofile \
-	gst-plugin-esd \
-	gst-plugin-typefindfunctions \
-	gst-plugin-volume"
-RRECOMMENDS = "gst-plugin-mad \
-	gst-plugin-tagedit"
-SECTION = "gpe"
-PRIORITY = "optional"
 PR = "r4"
-
-PARALLEL_MAKE=""
diff --git a/packages/gpe-nmf/gpe-nmf_0.20.bb b/packages/gpe-nmf/gpe-nmf_0.20.bb
index 875c38f950..bfbb7a487c 100644
--- a/packages/gpe-nmf/gpe-nmf_0.20.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.20.bb
@@ -1,21 +1,4 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
+require gpe-nmf.inc
 
-DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
-RDEPENDS = "esd \
-	gst-plugins \
-	gst-plugin-audio \
-	gst-plugin-audioconvert \
-	gst-plugin-audiofile \
-	gst-plugin-esd \
-	gst-plugin-typefindfunctions \
-	gst-plugin-volume"
-RRECOMMENDS = "gst-plugin-mad \
-	gst-plugin-tagedit \
-	gst-plugin-tcp"
-SECTION = "gpe"
-PRIORITY = "optional"
+RRECOMMENDS += "gst-plugin-tcp"
 PR = "r1"
-
-PARALLEL_MAKE=""
diff --git a/packages/gpe-nmf/gpe-nmf_0.21.bb b/packages/gpe-nmf/gpe-nmf_0.21.bb
index 4501cdf55d..f1292b93e2 100644
--- a/packages/gpe-nmf/gpe-nmf_0.21.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.21.bb
@@ -1,21 +1,3 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
+require gpe-nmf.inc
 
-DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
-RDEPENDS = "esd \
-	gst-plugins \
-	gst-plugin-audio \
-	gst-plugin-audioconvert \
-	gst-plugin-audiofile \
-	gst-plugin-esd \
-	gst-plugin-typefindfunctions \
-	gst-plugin-volume"
-RRECOMMENDS = "gst-plugin-mad \
-	gst-plugin-tagedit \
-	gst-plugin-tcp"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-PARALLEL_MAKE=""
+RRECOMMENDS += "gst-plugin-tcp"
diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb
index c4b2ae7c2c..8b70d83c6b 100644
--- a/packages/gpe-nmf/gpe-nmf_0.22.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.22.bb
@@ -1,31 +1,12 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
+require gpe-nmf.inc
 
-DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
-RDEPENDS = "esd \
-	gst-plugins \
-	gst-plugin-audio \
-	gst-plugin-audioconvert \
-	gst-plugin-audiofile \
-	gst-plugin-esd \
-	gst-plugin-typefindfunctions \
-        gst-plugin-decodebin \
-	gst-plugin-volume"
-RRECOMMENDS = "gst-plugin-mad \
-	gst-plugin-tagedit \
-	gst-plugin-ivorbis \
-	gst-plugin-tcp"
+RDEPENDS += "gst-plugin-decodebin"
+RRECOMMENDS += "gst-plugin-ivorbis gst-plugin-tcp"
+PR = "r2"
 
 SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \
              file://fix-includepath.patch;patch=1"
 
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r2"
-
-PARALLEL_MAKE=""
-
 do_compile() {
         oe_runmake PREFIX=${prefix} GST_VERSION="0.8"
 }
diff --git a/packages/hfsplusutils/.mtn2git_empty b/packages/hfsplusutils/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hfsplusutils/.mtn2git_empty
diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty b/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty
diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch
new file mode 100644
index 0000000000..c9caeb4208
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch
@@ -0,0 +1,19 @@
+diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
+--- hfsplus.orig/src/hpmkdir.c	2003-03-30 20:09:59.000000000 +0200
++++ hfsplus-1.0.4/src/hpmkdir.c	2003-03-30 20:11:15.000000000 +0200
+@@ -46,8 +46,9 @@
+ # include <string.h>
+ # include <time.h>
+ # include <ctype.h>
+-# include <errno.h>
+ */
++# include <errno.h>
++
+ # include <stdio.h>
+ # include <stdlib.h>
+ 
+@@ -164,3 +165,4 @@
+     hfsputil_perrorp(argv0);
+     return -1;
+ }
++
diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch
new file mode 100644
index 0000000000..04724440dd
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch
@@ -0,0 +1,132 @@
+--- hfsplus-1.0.4/libhfsp/src/btree.c~	2002-03-05 19:50:28.000000000 +0000
++++ hfsplus-1.0.4/libhfsp/src/btree.c	2005-04-30 12:48:48.000000000 +0100
+@@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume*
+ 	{
+ 	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
+ 		 HFSP_EXTENT_DATA, bt->cnid);
+-	    ((char*) p) += HEADER_RESERVEDOFFSET; // skip header
++	    p += HEADER_RESERVEDOFFSET; // skip header
+ 	}
+ 	
+ 	bt->alloc_bits = malloc(alloc_size);
+--- hfsplus-1.0.4/libhfsp/src/swab.h~	2002-03-05 19:50:29.000000000 +0000
++++ hfsplus-1.0.4/libhfsp/src/swab.h	2005-04-30 12:48:05.000000000 +0100
+@@ -36,28 +36,28 @@
+ 
+ #define bswabU16(val) bswap_16(val)
+ 
+-#define bswabU16_inc(ptr) bswap_16(*((UInt16*) (ptr))++)
+-#define bswabU32_inc(ptr) bswap_32(*((UInt32*) (ptr))++)
+-#define bswabU64_inc(ptr) bswap_64(*((UInt64*) (ptr))++)
+-
+-#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = bswap_16(val)
+-#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = bswap_32(val)
+-#define bstoreU64_inc(ptr, val) (*((UInt64*) (ptr))++) = bswap_64(val)
++#define bswabU16_inc(ptr) bswap_16(*(*((UInt16**) (void *)(&ptr)))++)
++#define bswabU32_inc(ptr) bswap_32(*(*((UInt32**) (void *)(&ptr)))++)
++#define bswabU64_inc(ptr) bswap_64(*(*((UInt64**) (void *)(&ptr)))++)
++
++#define bstoreU16_inc(ptr, val) (*(*((UInt16**) (void *)(&ptr)))++) = bswap_16(val)
++#define bstoreU32_inc(ptr, val) (*(*((UInt32**) (void *)(&ptr)))++) = bswap_32(val)
++#define bstoreU64_inc(ptr, val) (*(*((UInt64**) (void *)(&ptr)))++) = bswap_64(val)
+ 
+ #else // BYTE_ORDER == BIG_ENDIAN
+ 
+ #define bswabU16(val) val
+ 
+-#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++)
+-#define bswabU32_inc(ptr) (*((UInt32*) (ptr))++)
+-#define bswabU64_inc(ptr) (*((UInt64*) (ptr))++)
+-
+-#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = val
+-#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = val
+-#define bstoreU64_inc(ptr, val) (*((UInt64*) (ptr))++) = val
++#define bswabU16_inc(ptr) (*(*((UInt16**) (void *)(&ptr)))++)
++#define bswabU32_inc(ptr) (*(*((UInt32**) (void *)(&ptr)))++)
++#define bswabU64_inc(ptr) (*(*((UInt64**) (void *)(&ptr)))++)
++
++#define bstoreU16_inc(ptr, val) (*(*((UInt16**) (void *)(&ptr)))++) = val
++#define bstoreU32_inc(ptr, val) (*(*((UInt32**) (void *)(&ptr)))++) = val
++#define bstoreU64_inc(ptr, val) (*(*((UInt64**) (void *)(&ptr)))++) = val
+ 
+ #endif
+ 
+ /* for the sake of compleetness and readability */
+-#define bswabU8_inc(ptr)	(*((UInt8*) (ptr))++)
+-#define bstoreU8_inc(ptr,val)	(*((UInt8*) (ptr))++) = val
++#define bswabU8_inc(ptr)	(*(*((UInt8**) (void *)(&ptr)))++)
++#define bstoreU8_inc(ptr,val)	(*(*((UInt8**) (void *)(&ptr)))++) = val
+--- hfsplus-1.0.4/libhfsp/src/btreecheck.c~	2002-03-05 19:50:29.000000000 +0000
++++ hfsplus-1.0.4/libhfsp/src/btreecheck.c	2005-04-30 12:49:22.000000000 +0100
+@@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt,
+ 	{
+ 	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
+ 		 HFSP_EXTENT_DATA, bt->cnid);
+-	    ((char*) p) += HEADER_RESERVEDOFFSET; // skip header
++	    p += HEADER_RESERVEDOFFSET; // skip header
+ 	}
+ 	
+ 	bt->alloc_bits = malloc(alloc_size);
+--- hfsplus-1.0.4/libhfsp/src/fscheck.c~	2002-03-25 15:48:37.000000000 +0000
++++ hfsplus-1.0.4/libhfsp/src/fscheck.c	2005-04-30 12:50:26.000000000 +0100
+@@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume
+     vh->write_count	= bswabU32_inc(p);
+     vh->encodings_bmp	= bswabU64_inc(p);
+     memcpy(vh->finder_info, p, 32); 
+-    ((char*) p) += 32; // So finderinfo must be swapped later, ***
++    p += 32; // So finderinfo must be swapped later, ***
+     p = volume_readfork(p, &vh->alloc_file );
+     p = volume_readfork(p, &vh->ext_file   );
+     p = volume_readfork(p, &vh->cat_file   );
+@@ -277,12 +277,12 @@ static int fscheck_read_wrapper(volume *
+ 	    printf("Volume is wrapped in HFS volume "
+ 		   " (use hfsck to check this)\n");
+ 
+-	((char*) p) += 0x12;		/* skip unneded HFS vol fields */
++	p += 0x12;		/* skip unneded HFS vol fields */
+ 	drAlBlkSiz = bswabU32_inc(p);	/* offset 0x14 */
+-	((char*) p) += 0x4;		/* skip unneded HFS vol fields */
++	p += 0x4;		/* skip unneded HFS vol fields */
+ 	drAlBlSt    = bswabU16_inc(p);	/* offset 0x1C */
+ 	
+-	((char*) p) += 0x5E;		/* skip unneded HFS vol fields */
++	p += 0x5E;		/* skip unneded HFS vol fields */
+ 	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
+ 	if (signature != HFSP_VOLHEAD_SIG)
+ 	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
+--- hfsplus-1.0.4/libhfsp/src/volume.c~	2002-03-26 18:00:29.000000000 +0000
++++ hfsplus-1.0.4/libhfsp/src/volume.c	2005-04-30 12:51:41.000000000 +0100
+@@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v
+     vh->write_count	= bswabU32_inc(p);
+     vh->encodings_bmp	= bswabU64_inc(p);
+     memcpy(vh->finder_info, p, 32); 
+-    ((char*) p) += 32; // finderinfo is not used by now
++    p += 32; // finderinfo is not used by now
+     p = volume_readfork(p, &vh->alloc_file );
+     p = volume_readfork(p, &vh->ext_file   );
+     p = volume_readfork(p, &vh->cat_file   );
+@@ -381,7 +381,7 @@ static int volume_writebuf(hfsp_vh* vh, 
+     bstoreU32_inc(p, vh->write_count	);
+     bstoreU64_inc(p, vh->encodings_bmp	);
+     memcpy(p, vh->finder_info, 32); 
+-    ((char*) p) += 32; // finderinfo is not used by now
++    p += 32; // finderinfo is not used by now
+     p = volume_writefork(p, &vh->alloc_file );
+     p = volume_writefork(p, &vh->ext_file   );
+     p = volume_writefork(p, &vh->cat_file   );
+@@ -417,12 +417,12 @@ static int volume_read_wrapper(volume * 
+   
+ 	UInt16	embeds, embedl;		/* Start/lenght of embedded area in blocks */
+ 	
+-	((char*) p) += 0x12;		/* skip unneeded HFS vol fields */
++	p += 0x12;		/* skip unneeded HFS vol fields */
+ 	drAlBlkSiz = bswabU32_inc(p);	/* offset 0x14 */
+-	((char*) p) += 0x4;		/* skip unneeded HFS vol fields */
++	p += 0x4;		/* skip unneeded HFS vol fields */
+ 	drAlBlSt    = bswabU16_inc(p);	/* offset 0x1C */
+ 	
+-	((char*) p) += 0x5E;		/* skip unneeded HFS vol fields */
++	p += 0x5E;		/* skip unneeded HFS vol fields */
+ 	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
+ 	if (signature != HFSP_VOLHEAD_SIG)
+ 	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch
new file mode 100644
index 0000000000..5b0333e642
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch
@@ -0,0 +1,12 @@
+--- hfsplus-1.0.4/src/glob.c.orig	2002-10-09 08:02:31.000000000 -0500
++++ hfsplus-1.0.4/src/glob.c	2002-10-09 08:02:46.000000000 -0500
+@@ -48,7 +48,7 @@
+ 
+ 	switch (*pat)
+ 	{
+-	    case NULL:	// pattern at end
++	    case '\0':	// pattern at end
+ 		return (!*str); // String at end ?
+ 
+ 	    case '*':  // match all
+
diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch
new file mode 100644
index 0000000000..5eaf32806a
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch
@@ -0,0 +1,11 @@
+--- hfsplus-1.0.4/libhfsp/src/unicode.c.bak	2007-01-08 17:14:44.000000000 -0500
++++ hfsplus-1.0.4/libhfsp/src/unicode.c	2007-01-08 17:14:52.000000000 -0500
+@@ -16,7 +16,7 @@
+ #include <stdlib.h>
+ #include <endian.h>
+ #include <byteswap.h>
+-#include <linux/string.h>
++#include <string.h>
+ 
+ #define __USE_GNU
+     /* need wcsrtomb */
diff --git a/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb
new file mode 100644
index 0000000000..43037573f4
--- /dev/null
+++ b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "HFS plus file system utilities"
+SECTION = "base"
+LICENSE = "GPL"
+PR = "r1"
+
+S="${WORKDIR}/${P}"
+
+inherit kernel-arch autotools pkgconfig
+
+DEPENDS = " rpm2cpio-native"
+
+SRC_URI = "http://penguinppc.org/historical/hfsplus/hfsplusutils-1.0.4-4.src.rpm \
+	   file://hfsplusutils-1.0.4-errno.patch;patch=1 \
+	   file://hfsplusutils-1.0.4-gcc4.patch;patch=1 \
+	   file://hfsplusutils-1.0.4-glob.patch;patch=1 \
+	   file://hfsplusutils-1.0.4-string.patch;patch=1 \
+		"
+
+do_unpack() {
+        if ! test -f hfsplus.tz2 ; then
+                rpm2cpio.pl ${DL_DIR}/${P}.src.rpm | cpio -i --make-directories
+                bunzip2 hfsplus.tz2
+		tar -xf hfsplus.tz2.out
+		mv hfsplus ${P}
+        fi
+}
diff --git a/packages/hfsutils/hfsutils_3.2.6.bb b/packages/hfsutils/hfsutils_3.2.6.bb
index 981c79351b..5292ac386c 100644
--- a/packages/hfsutils/hfsutils_3.2.6.bb
+++ b/packages/hfsutils/hfsutils_3.2.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "HFS file system utilities"