diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-31 18:24:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-31 18:24:53 +0000 |
| commit | ca43479849ba2ff96836ff20ad398e65bc9da755 (patch) | |
| tree | fe4b0fa4ecd7e99de3a5fda886916eb25f035afe /packages/unionfs/unionfs-1.0.7/make.patch | |
| parent | fa59397aa283c6e6995a1cc8769ea8e29a46ce60 (diff) | |
| parent | 2c5f531835e67995fabd0dec7f77b44afb6f4168 (diff) | |
propagate from branch 'org.openembedded.dev' (head ba788d2a3a02c778c4ebf930f757e20a54f2b642)
to branch 'org.openembedded.nslu2-linux' (head 174865e1a8d25de392e872a17add8d09431285ba)
Diffstat (limited to 'packages/unionfs/unionfs-1.0.7/make.patch')
| -rw-r--r-- | packages/unionfs/unionfs-1.0.7/make.patch | 98 |
1 files changed, 0 insertions, 98 deletions
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 |