[PATCH] jffs2 super.o for 2.6.0-test1

[PATCH] jffs2 super.o for 2.6.0-test1

[Jamey Hicks]

Trivial patch to reenable jffs2 for 2.6.0-test1.

-Jamey



diff -ur linux-2.6.0-test1/fs/jffs2/Makefile
linux-2.6.0-test1-rmk0-hh0/fs/jffs2/Makefile
--- linux-2.6.0-test1/fs/jffs2/Makefile 2003-06-22 14:32:37.000000000
-0400
+++ linux-2.6.0-test1-rmk0-hh0/fs/jffs2/Makefile        2003-07-14
09:42:27.000000000 -0400
@@ -13,6 +13,7 @@
 
 LINUX_OBJS-24  := super-v24.o crc32.o
 LINUX_OBJS-25  := super.o
+LINUX_OBJS-26  := super.o
 
 NAND_OBJS-$(CONFIG_JFFS2_FS_NAND)      := wbuf.o
 

Re: [PATCH] jffs2 super.o for 2.6.0-test1

[Ben Collins]

On Mon, Jul 14, 2003 at 10:54:58AM -0400, Jamey Hicks wrote:
> 
> Trivial patch to reenable jffs2 for 2.6.0-test1.

Seems this might be better, to keep it from being a re-occuring
problem.


Index: linux-2.6/fs/jffs2/Makefile
===================================================================
--- linux-2.6/fs/jffs2/Makefile	(revision 11779)
+++ linux-2.6/fs/jffs2/Makefile	(working copy)
@@ -11,10 +11,13 @@
 	read.o nodemgmt.o readinode.o write.o scan.o gc.o \
 	symlink.o build.o erase.o background.o fs.o writev.o
 
-LINUX_OBJS-24	:= super-v24.o crc32.o
-LINUX_OBJS-25	:= super.o
+ifeq ($(VERSION)$(PATCHLEVEL),2.4)
+LINUX_OBJS	:= super-v24.o crc32.o
+else
+LINUX_OBJS	:= super.o
+endif
 
 NAND_OBJS-$(CONFIG_JFFS2_FS_NAND)	:= wbuf.o
 
 jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
-	      $(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
+	      $(LINUX_OBJS)

-- 
Debian     - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo       - http://www.deqo.com/

Re: [PATCH] jffs2 super.o for 2.6.0-test1

[David Woodhouse]

On Mon, 2003-07-14 at 16:10, Ben Collins wrote:
> On Mon, Jul 14, 2003 at 10:54:58AM -0400, Jamey Hicks wrote:
> > 
> > Trivial patch to reenable jffs2 for 2.6.0-test1.
> 
> Seems this might be better, to keep it from being a re-occuring
> problem.

I'm as happy just to ditch all pretence of compatibility in the
Makefile; it isn't a problem for merging because I can just ignore it on
updates or do it by hand on the _rare_ occasion that I add a new file.

I thought I'd already done that, to be honest.

-- 
dwmw2