Re: fs patch mess? (probably discussed before?)

From: Michael T. Gilmore (mgilmore@zk3.dec.com)
Date: Tue Jun 13 2000 - 17:46:03 EST


"Kenneth C. Arnold" wrote:

> This was probably discussed before ... but even if it was, it wasn't fixed.
>
> One example of the problem I am encountering is in fs/Makefile. Note around
> line 19. Anyone experienced with diff and patch should instantly notice the
> glaring error (okay, maybe it's not _that_ obvious): if you apply more than
> one fs patch, it's likely going to botch up that line! diff and patch are
> not smart enough to realize that we want the relavant fs subdirectories to
> be in a whitespace-delimited list, and that it should just insert the new
> stuff wherever appropriate. Alternative suggestion - bloated but nice to
> patch:
>
> ALL_SUB_DIRS = # NULL
> ALL_SUB_DIRS = $(ALL_SUB_DIRS) ext2
> ALL_SUB_DIRS = $(ALL_SUB_DIRS) minix
> ALL_SUB_DIRS = $(ALL_SUB_DIRS) fat
> ...
> ALL_SUB_DIRS = $(ALL_SUB_DIRS) reiserfs
> ALL_SUB_DIRS = $(ALL_SUB_DIRS) ext3
> etc.
>

How about Alternative #2:

Where you simply add 1 or more "new" entries with "\"
after the var line or before the "end" line.

--- linux/fs/Makefile.orig Mon Jun 12 22:36:09 2000
+++ linux/fs/Makefile.new Mon Jun 12 22:36:02 2000
@@ -16,10 +16,43 @@
                $(BINFMTS) $(FILESYSTEMS)

 MOD_LIST_NAME := FS_MODULES
-ALL_SUB_DIRS = coda minix ext2 fat msdos vfat proc isofs nfs umsdos ntfs \
- hpfs sysv smbfs ncpfs ufs efs affs romfs autofs hfs lockd \
- nfsd nls devpts devfs adfs partitions qnx4 udf bfs cramfs \
- openpromfs autofs4 ramfs
+
+ALL_SUB_DIRS = coda \
+ minix \
+ ext2 \
+ fat \
+ msdos \
+ vfat \
+ proc \
+ isofs \
+ nfs \
+ umsdos \
+ ntfs \
+ hpfs \
+ sysv \
+ smbfs \
+ ncpfs \
+ ufs \
+ efs \
+ affs \
+ romfs \
+ autofs \
+ hfs \
+ lockd \
+ nfsd \
+ nls \
+ devpts \
+ devfs \
+ adfs \
+ partitions \
+ qnx4 \
+ udf \
+ bfs \
+ cramfs \
+ openpromfs \
+ autofs4 \
+ ramfs \
+ # Termination line for ALL_SUB_DIRS

SUB_DIRS :=

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jun 15 2000 - 21:00:29 EST