3 things to reduce the diff of my debian package: 1. Why not simply apply vserver.patch? The patch only takes action if vserver is activated and else does nothing. I do this in the Debian package for some time now and there were no problems.
2. Could you change the pathes in lhash-2.6.22.patch, so we can use it with patch -p0 (like the other patches)? See patch-level.patch 3. There were problems some time ago with kernel 2.6.23 and SquashFS options. (aufs from 2007-09-24) Build Log: http://grml.org/tmp/aufs_2.6.23.txt Config: http://hg.grml.org/grml-kernel/raw-file/f9acc63cae13/config/config-2.6.23-grml "Patch": See attachment (aufs-grml.patch) Could you take a look at it? Has this already been fixed? Some other suggestions: 1. Move patches for the kernel into a subdirectory (like patches/) Julian Andres Klode
+diff -urNad --exclude=.bzr --exclude='a.diff~' aufs-0+20070924~/fs/aufs/branch.c aufs-0+20070924/fs/aufs/branch.c
+--- aufs-0+20070924~/fs/aufs/branch.c 2007-09-24 22:21:38.000000000 +0200
++++ aufs-0+20070924/fs/aufs/branch.c 2007-09-24 22:21:55.204779776 +0200
+@@ -91,7 +91,7 @@
+ int au_is_def_rr(struct super_block *h_sb)
+ {
+ switch (h_sb->s_magic) {
+-#ifdef CONFIG_AUFS_RR_SQUASHFS
++#if defined(CONFIG_AUFS_RR_SQUASHFS) && defined(SQUASHFS_MAGIC_LZMA) && defined(SQUASHFS_MAGIC) && defined(SQUASHFS_MAGIC_LZMA_SWAP) && defined(SQUASHFS_MAGIC_SWAP)
+ case SQUASHFS_MAGIC_LZMA:
+ case SQUASHFS_MAGIC:
+ case SQUASHFS_MAGIC_LZMA_SWAP:
+diff -urNad --exclude=.bzr --exclude='*~' aufs-0+20070806~/lhash-2.6.22.patch aufs-0+20070806/lhash-2.6.22.patch +--- aufs-0+20070806~/lhash-2.6.22.patch 2007-07-15 22:08:18.000000000 +0200 ++++ aufs-0+20070806/lhash-2.6.22.patch 2007-08-06 15:48:18.074227638 +0200 +@@ -1,11 +1,11 @@ +-Index: linux-2.6.22/fs/namei.c ++Index: fs/namei.c + =================================================================== + RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/fs/namei.c,v + retrieving revision 1.1 + retrieving revision 1.3 + diff -u -p -r1.1 -r1.3 +---- linux-2.6.22/fs/namei.c 12 Jul 2007 02:55:19 -0000 1.1 +-+++ linux-2.6.22/fs/namei.c 12 Jul 2007 03:00:50 -0000 1.3 ++--- fs/namei.c 12 Jul 2007 02:55:19 -0000 1.1 +++++ fs/namei.c 12 Jul 2007 03:00:50 -0000 1.3 + @@ -1280,7 +1280,7 @@ out: + * needs parent already locked. Doesn't follow mounts. + * SMP-safe. +@@ -23,14 +23,14 @@ + EXPORT_SYMBOL(lookup_one_len); + EXPORT_SYMBOL(page_follow_link_light); + EXPORT_SYMBOL(page_put_link); +-Index: linux-2.6.22/include/linux/namei.h ++Index: include/linux/namei.h + =================================================================== + RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/include/linux/namei.h,v + retrieving revision 1.1 + retrieving revision 1.2 + diff -u -p -r1.1 -r1.2 +---- linux-2.6.22/include/linux/namei.h 12 Jul 2007 02:55:19 -0000 1.1 +-+++ linux-2.6.22/include/linux/namei.h 12 Jul 2007 02:55:20 -0000 1.2 ++--- include/linux/namei.h 12 Jul 2007 02:55:19 -0000 1.1 +++++ include/linux/namei.h 12 Jul 2007 02:55:20 -0000 1.2 + @@ -81,6 +81,7 @@ extern struct file *lookup_instantiate_f + extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); + extern void release_open_intent(struct nameidata *);
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
