diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /unionfs | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'unionfs')
-rw-r--r-- | unionfs/unionfs-1.0.3/gcc2-hack.patch | 28 | ||||
-rw-r--r-- | unionfs/unionfs-1.0.3/make.patch | 124 | ||||
-rw-r--r-- | unionfs/unionfs-modules_1.0.3.bb | 0 | ||||
-rw-r--r-- | unionfs/unionfs-utils_1.0.3.bb | 0 | ||||
-rw-r--r-- | unionfs/unionfs_1.0.3.inc | 0 |
5 files changed, 0 insertions, 152 deletions
diff --git a/unionfs/unionfs-1.0.3/gcc2-hack.patch b/unionfs/unionfs-1.0.3/gcc2-hack.patch deleted file mode 100644 index 7c1f4dd32e..0000000000 --- a/unionfs/unionfs-1.0.3/gcc2-hack.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- unionfs-1.0.3/fist.h~gcc2 2004-11-10 09:38:58.000000000 -0500 -+++ unionfs-1.0.3/fist.h 2004-11-14 05:11:47.601022344 -0500 -@@ -212,11 +212,20 @@ - } while (0) - - /* Call if you encounter a bug. */ -+ -+#if __GNUC__ < 3 -+#define FISTBUG(arg...) \ -+do { \ -+ printk("<0>FISTBUG " ##arg); \ -+ (*((char *)0))=0; \ -+} while (0) -+#else - #define FISTBUG(fmt, args...) \ - do { \ - printk("<0>FISTBUG at %s:%s:%d " fmt, __FILE__, __FUNCTION__, __LINE__, ##args); \ - (*((char *)0))=0; \ - } while (0); -+#endif - - /* The if (0 ...) is so that we can make sure that you don't pass this - * define a non-pointer. gcc should optimize it away. */ diff --git a/unionfs/unionfs-1.0.3/make.patch b/unionfs/unionfs-1.0.3/make.patch deleted file mode 100644 index dc3faf981a..0000000000 --- a/unionfs/unionfs-1.0.3/make.patch +++ /dev/null @@ -1,124 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- unionfs-1.0.3/Makefile~make.patch 2004-11-10 09:38:58.000000000 -0500 -+++ unionfs-1.0.3/Makefile 2004-11-14 02:41:12.812518968 -0500 -@@ -3,20 +3,32 @@ - # - - # this should point to where your kernel headers are --TOPINC = -I/lib/modules/`uname -r`/build/include -+KERNELVER = $(shell uname -r) -+KERNELINC = -I/lib/modules/$(KERNELVER)/build/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.3 - --# allow custmom override of TOPINC for fistgen developers -+# allow custmom override of KERNELINC for fistgen developers - -include fistdev.mk - --CC = gcc --CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -g ${EXTRACFLAGS} -O2 --UCFLAGS = -DFISTGEN -I. ${TOPINC} -g -O2 -Wall -Wno-unused -Werror ${EXTRAUCFLAGS} -+CC = gcc -+LD = ld -+R_CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. -+CFLAGS = $(KERNELINC) -Wall -Wno-unused-label -Werror -g $(EXTRACFLAGS) -O2 -+R_UCFLAGS = -DFISTGEN -I. -+UCFLAGS = $(KERNELINC) -g -O2 -Wall -Wno-unused -Werror $(EXTRAUCFLAGS) - - O_TARGET := unionfs.o --ADD_M_SRC = -+ADD_M_SRC = - # vm_area.o is not needed if we use generic_file_mmap - # mmap.o and attach.o are optionally added - O_OBJS := subr.o dentry.o file.o inode.o main.o super.o print.o \ -@@ -27,16 +39,19 @@ - - BINS := unionctl uniondbg - --all: ${O_TARGET} ${BINS} -+all: $(O_TARGET) $(BINS) - --${O_TARGET}: ${O_OBJS} -- ld -o ${O_TARGET} -r ${O_OBJS} -+$(O_TARGET): $(O_OBJS) -+ $(LD) -o $(O_TARGET) -r $(O_OBJS) -+ -+%.o: %.c -+ $(CC) -c -o $@ $< $(R_CFLAGS) $(CFLAGS) - - unionctl: unionctl.c -- ${CC} -o $@ $? ${UCFLAGS} -+ $(CC) -o $@ $? $(R_UCFLAGS) $(UCFLAGS) - - uniondbg: uniondbg.c -- ${CC} -o $@ $? ${UCFLAGS} -+ $(CC) -o $@ $? $(R_UCFLAGS) $(UCFLAGS) - - memtest: - perl match-malloc.pl log.txt -@@ -48,29 +63,30 @@ - ctags *.[ch] - - clean: -- rm -f ${O_TARGET} ${O_OBJS} *.d .*.flags \#* *~ -- rm -f ${BINS} TAGS tags -- rm -f unionfs-${VERSION}.tar.gz -+ rm -f $(O_TARGET) $(O_OBJS) *.d .*.flags \#* *~ -+ rm -f $(BINS) TAGS tags -+ rm -f unionfs-$(VERSION).tar.gz - --${O_OBJS}: unionfs.h fist.h -+$(O_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 -- cp unionfs.o /lib/modules/`uname -r`/kernel/fs -+ 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 -+ cp unionfs.o $(DESTDIR)$(moduledir)/kernel/fs - --release: unionfs-${VERSION}.tar.gz -+release: unionfs-$(VERSION).tar.gz - --unionfs-${VERSION}.tar.gz: -- mkdir unionfs-${VERSION} -- cp COPYING README NEWS doit.sh undoit.sh *.pl Makefile *.[ch] misc/snapmerge unionfs-${VERSION} -- mkdir unionfs-${VERSION}/man -- cp man/*.[0-9] unionfs-${VERSION}/man -- tar czvf unionfs-${VERSION}.tar.gz unionfs-${VERSION} -- rm -rf unionfs-${VERSION} -+unionfs-$(VERSION).tar.gz: -+ mkdir unionfs-$(VERSION) -+ cp COPYING README NEWS doit.sh undoit.sh *.pl Makefile *.[ch] misc/snapmerge unionfs-$(VERSION) -+ mkdir unionfs-$(VERSION)/man -+ cp man/*.[0-9] unionfs-$(VERSION)/man -+ tar czvf unionfs-$(VERSION).tar.gz unionfs-$(VERSION) -+ rm -rf unionfs-$(VERSION) diff --git a/unionfs/unionfs-modules_1.0.3.bb b/unionfs/unionfs-modules_1.0.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/unionfs/unionfs-modules_1.0.3.bb +++ /dev/null diff --git a/unionfs/unionfs-utils_1.0.3.bb b/unionfs/unionfs-utils_1.0.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/unionfs/unionfs-utils_1.0.3.bb +++ /dev/null diff --git a/unionfs/unionfs_1.0.3.inc b/unionfs/unionfs_1.0.3.inc deleted file mode 100644 index e69de29bb2..0000000000 --- a/unionfs/unionfs_1.0.3.inc +++ /dev/null |