merge of 32a8152d0bee4b649384f3a9e102a4676de42023

     and b1c87d8b200c1c4fd98633961388fdd092b8e00a

19 files changed, 81 insertions, 355 deletions

diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
new file mode 100644
index 0000000000..5dcf78cb0d
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -0,0 +1,52 @@
+PR = "r0"
+
+SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
+DESCRIPTION = "A lightweight webbrowser for the GPE platform"
+LICENSE = "GPL"
+DEPENDS = "osb-nrcit"
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+	#	install -d ${D}${docdir}/gpe
+	#	install -m 0644 ${S}/gpe-mini-browser.html  ${D}${docdir}/gpe/
+		install -d ${D}/usr/share/applications
+		install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop
+		install -d ${D}/usr/share/pixmaps
+		install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
+		autotools_do_install
+}
+
+pkg_postinst_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        else
+                 echo [Help] >> /etc/gpe/gpe-help.conf
+                 echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+	fi
+}
+
+pkg_postrm_${PN}-doc () {
+        #!/bin/sh
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+                mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+}
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index a8be7757c3..84d037d330 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa
 	   file://intdriven.patch;patch=1 \
 	   file://pollcontroller.patch;patch=1 \
 	   file://mm4.patch;patch=1"
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}"
 
@@ -32,11 +32,11 @@ KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork"
 #
 #addtask ixp425_c_patch_fetch after do_fetch before do_unpack
 
-do_ixp425_c_patch_unpack () {
-	install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
-}
+#do_ixp425_c_patch_unpack () {
+#	install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
+#}
 
-addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
+#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
 
 do_pre_patch () {
 	patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 6ab8bc73b5..c8c231d302 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -36,8 +36,7 @@ inherit image_ipk
 python () {
 	# Don't build openslug images 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':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
 }
 LICENSE = MIT
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 2c2b17e717..07dc1d0080 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -34,6 +34,7 @@ OPENSLUG_DEVELOPMENT = "\
 	pciutils \
 	quilt \
 	sed \
+	strace \
 	util-linux \
 	"
 
@@ -63,8 +64,6 @@ OPENSLUG_PACKAGES = "\
 	less \
 	libusb \
 	libxml2 \
-	man \
-	man-pages \
 	miau \ 
 	microcom \
 	mt-daapd \
@@ -79,13 +78,10 @@ OPENSLUG_PACKAGES = "\
 	pcre \
 	ppp \
 	procps \
-	psmisc \
 	puppy \
 	pwc \
 	rsync \
-	screen \
 	setpwc \
-	streamripper \
 	sudo \
 	sysfsutils \
 	thttpd \
@@ -97,6 +93,7 @@ OPENSLUG_PACKAGES = "\
 	python \
 	samba \
 	sane-backends \
+	strace \
 	thttpd \
 	vlan \
 	wget \
@@ -109,19 +106,22 @@ OPENSLUG_PACKAGES = "\
 # such as sinf.)
 OPENSLUG_PACKAGES_append_linux = "\
 	bind \
+	man man-pages \
 	mgetty \
 	mpd \
 	nfs-utils \
 	libpam \
 	php \
 	postfix \
+	psmisc \
+	screen \
+	streamripper \
 	timezones \
 	xinetd \
 	yp-tools ypbind ypserv \
 	"
 
 BROKEN_PACKAGES = "\
-	strace \
 	"
 
 DEPENDS = 'openslug-image \
diff --git a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty
+++ b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty
diff --git a/packages/unionfs/unionfs-1.0.13/make.patch b/packages/unionfs/unionfs-1.0.13/make.patch
new file mode 100644
index 0000000000..e2ab28b429
--- /dev/null
+++ b/packages/unionfs/unionfs-1.0.13/make.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- unionfs-1.0.13/Makefile~make
++++ unionfs-1.0.13/Makefile
+@@ -59,7 +59,7 @@
+ unionfs2.4: ${obj-m}
+ 
+ ${obj-m}: ${unionfs-objs}
+-	ld -o ${obj-m} -r ${unionfs-objs}
++	${CC} -o ${obj-m} -r ${unionfs-objs}
+ 
+ unionctl: unionctl.c usercommon.c
+ 	${CC} -o $@ $^ ${UCFLAGS}
diff --git a/packages/unionfs/unionfs-1.0.7/make.patch b/packages/unionfs/unionfs-1.0.7/make.patch
deleted file mode 100644
index 583947e82f..0000000000
--- a/packages/unionfs/unionfs-1.0.7/make.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- unionfs-1.0.7/Makefile~make.patch
-+++ unionfs-1.0.7/Makefile
-@@ -3,10 +3,20 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
-+
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.7
- TAROPTS = czvf
- 
-@@ -22,8 +32,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -g ${EXTRACFLAGS} -O2
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -g ${EXTRACFLAGS} -O2
-@@ -35,7 +45,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -43,13 +53,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -74,15 +86,20 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- 
- release: unionfs-${VERSION}.tar.gz
diff --git a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty b/packages/unionfs/unionfs-1.0.8/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty
+++ /dev/null
diff --git a/packages/unionfs/unionfs-1.0.8/make.patch b/packages/unionfs/unionfs-1.0.8/make.patch
deleted file mode 100644
index ab77b527d5..0000000000
--- a/packages/unionfs/unionfs-1.0.8/make.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: unionfs-1.0.8/Makefile
-===================================================================
---- unionfs-1.0.8.orig/Makefile	2005-01-19 10:03:24.000000000 -0500
-+++ unionfs-1.0.8/Makefile	2005-01-19 11:30:15.372348104 -0500
-@@ -3,10 +3,20 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
-+
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.8
- TAROPTS = czvf
- UNIONFS_DEBUG_CFLAG = -g
-@@ -24,8 +34,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} 
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG}
-@@ -37,7 +47,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -45,13 +55,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -76,15 +88,20 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- 
- release: unionfs-${VERSION}.tar.gz
diff --git a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty b/packages/unionfs/unionfs-1.0.9/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty
+++ /dev/null
diff --git a/packages/unionfs/unionfs-1.0.9/make.patch b/packages/unionfs/unionfs-1.0.9/make.patch
deleted file mode 100644
index 573ae55a43..0000000000
--- a/packages/unionfs/unionfs-1.0.9/make.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: unionfs-1.0.9/Makefile
-===================================================================
---- unionfs-1.0.9.orig/Makefile	2005-02-20 16:27:43.000000000 -0600
-+++ unionfs-1.0.9/Makefile	2005-02-20 16:31:36.000000000 -0600
-@@ -3,11 +3,19 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
--MODPREFIX=
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.9
- TAROPTS = czvf
- UNIONFS_DEBUG_CFLAG = -g
-@@ -25,8 +33,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} 
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG}
-@@ -39,7 +47,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -47,13 +55,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -78,23 +88,32 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- uninstall:
--	if [ -f unionfs.ko ] ; then rm /lib/modules/`uname -r`/kernel/fs/unionfs.ko ; else rm /lib/modules/`uname -r`/kernel/fs/unionfs.o ; fi
--	rm ${PREFIX}/man/man8/unionctl.8
--	rm ${PREFIX}/man/man8/uniondbg.8
--	rm ${PREFIX}/man/man4/unionfs.4
--	rm ${PREFIX}/sbin/unionctl
--	rm ${PREFIX}/sbin/uniondbg
-+ifeq (${KERNELMAJVER},2.4)
-+	rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.o
-+else
-+	rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.ko
-+endif
-+	rm ${DESTDIR}${man8dir}/unionctl.8
-+	rm ${DESTDIR}${man8dir}/uniondbg.8
-+	rm ${DESTDIR}${man4dir}/unionfs.4
-+	rm ${DESTDIR}${sbindir}/unionctl
-+	rm ${DESTDIR}${sbindir}/uniondbg
- 
- release: unionfs-${VERSION}.tar.gz
- 
diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb
index b18aaa9ac7..8083bddf67 100644
--- a/packages/unionfs/unionfs-modules_1.0.13.bb
+++ b/packages/unionfs/unionfs-modules_1.0.13.bb
@@ -1,6 +1,3 @@
-# When mickeyl decides to check in the correct make.patch, then the following line can be removed.
-DEFAULT_PREFERENCE = "-1"
-
 PARALLEL_MAKE = ""
 
 include unionfs-modules.inc
@@ -8,5 +5,6 @@ include unionfs-modules.inc
 KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}"
 
 do_compile() {
+	unset LDFLAGS
 	oe_runmake unionfs${KERNEL_MAJMIN}
 }
diff --git a/packages/unionfs/unionfs-modules_1.0.7.bb b/packages/unionfs/unionfs-modules_1.0.7.bb
deleted file mode 100644
index ff5e37819a..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-modules_1.0.8.bb b/packages/unionfs/unionfs-modules_1.0.8.bb
deleted file mode 100644
index ff5e37819a..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.8.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-modules_1.0.9.bb b/packages/unionfs/unionfs-modules_1.0.9.bb
deleted file mode 100644
index 5858b7994f..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
diff --git a/packages/unionfs/unionfs-utils_1.0.13.bb b/packages/unionfs/unionfs-utils_1.0.13.bb
index c7565e2364..be08882810 100644
--- a/packages/unionfs/unionfs-utils_1.0.13.bb
+++ b/packages/unionfs/unionfs-utils_1.0.13.bb
@@ -1,5 +1,2 @@
-# When mickeyl decides to check in the correct make.patch, then the following line can be removed.
-DEFAULT_PREFERENCE = "-1"
-
 include unionfs-utils.inc
 
diff --git a/packages/unionfs/unionfs-utils_1.0.7.bb b/packages/unionfs/unionfs-utils_1.0.7.bb
deleted file mode 100644
index 8d97fc7466..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-utils_1.0.8.bb b/packages/unionfs/unionfs-utils_1.0.8.bb
deleted file mode 100644
index 8d97fc7466..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.8.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-utils_1.0.9.bb b/packages/unionfs/unionfs-utils_1.0.9.bb
deleted file mode 100644
index bbca67a3b7..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc