unionfs: add make.patch for 1.0.13 and remove a couple of obsolete versions

diff --git a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty
similarity index 100%
rename from packages/unionfs/unionfs-1.0.7/.mtn2git_empty
rename to 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 (file)
index 0000000..e2ab28b
--- /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 (file)
index 583947e..0000000
--- 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 (file)
index e69de29..0000000

diff --git a/packages/unionfs/unionfs-1.0.8/make.patch b/packages/unionfs/unionfs-1.0.8/make.patch
deleted file mode 100644 (file)
index ab77b52..0000000
--- 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 (file)
index e69de29..0000000

diff --git a/packages/unionfs/unionfs-1.0.9/make.patch b/packages/unionfs/unionfs-1.0.9/make.patch
deleted file mode 100644 (file)
index 573ae55..0000000
--- 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 b18aaa9..8083bdd 100644 (file)
--- 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 (file)
index ff5e378..0000000
--- 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 (file)
index ff5e378..0000000
--- 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 (file)
index 5858b79..0000000
--- 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 c7565e2..be08882 100644 (file)
--- 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 (file)
index 8d97fc7..0000000
--- 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 (file)
index 8d97fc7..0000000
--- 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 (file)
index bbca67a..0000000
--- a/packages/unionfs/unionfs-utils_1.0.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc