Well, time will solve all.
I tested your patch on two commits but failed on both.
I attached you the build-logs.
There is no rush. I can wait ...
On Sunday 24 October 2010 06:44:59 you wrote:
> Phil Miller:
> > Thx for the patch J.R. but it didn't work out:
> > patching file fs/aufs/branch.c
> > Hunk #1 FAILED at 858.
>
> There seems to be other patches in my git repository which are necessary
> before the patch I sent.
> Until I have enough time, I won't be able to merge them.
> As you might know, it is equivalent to create a full patch to support
> 2.6.36.
>
>
> J. R. Okajima
commit: 247e6ec31397094ee7b0a71472642c5b8561bab6
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ ../makepkg
==> Making package: aufs2.1 2.6.36_20100820-1 (Sun Oct 24 11:20:52 UTC 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found aufs2.1-2.6.36_20100820.tar.gz
-> Found a.patch
==> Validating source files with md5sums...
aufs2.1-2.6.36_20100820.tar.gz ... Passed
a.patch ... Passed
==> Extracting Sources...
-> Extracting aufs2.1-2.6.36_20100820.tar.gz with bsdtar
==> Removing existing pkg/ directory...
==> Entering fakeroot environment...
==> Starting build()...
patching file fs/aufs/branch.c
Hunk #1 FAILED at 858.
Hunk #2 succeeded at 897 (offset -5 lines).
1 out of 2 hunks FAILED -- saving rejects to file fs/aufs/branch.c.rej
patching file fs/aufs/debug.c
patching file fs/aufs/debug.h
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file fs/aufs/debug.h.rej
patching file fs/aufs/dir.c
Hunk #1 FAILED at 213.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/dir.c.rej
patching file fs/aufs/export.c
Hunk #1 FAILED at 278.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/export.c.rej
patching file fs/aufs/f_op.c
Hunk #1 FAILED at 82.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/f_op.c.rej
patching file fs/aufs/sysrq.c
Hunk #1 FAILED at 56.
Hunk #2 succeeded at 73 with fuzz 2 (offset -3 lines).
1 out of 2 hunks FAILED -- saving rejects to file fs/aufs/sysrq.c.rej
patching file fs/aufs/vfsub.c
patching file fs/aufs/vfsub.h
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/vfsub.h.rej
can't find file to patch at input line 216
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/fs/file_table.c b/fs/file_table.c
|index 44abf87..4081dda 100644
|--- a/fs/file_table.c
|+++ b/fs/file_table.c
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
Aborting...
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ rm -R src
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ ../makepkg
==> Making package: aufs2.1 2.6.36_20100820-1 (Sun Oct 24 11:21:48 UTC 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found aufs2.1-2.6.36_20100820.tar.gz
-> Found a.patch
==> Validating source files with md5sums...
aufs2.1-2.6.36_20100820.tar.gz ... Passed
a.patch ... Passed
==> Extracting Sources...
-> Extracting aufs2.1-2.6.36_20100820.tar.gz with bsdtar
==> Removing existing pkg/ directory...
==> Entering fakeroot environment...
==> Starting build()...
==> start config
-I/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/include
-DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127
-DCONFIG_AUFS_HNOTIFY -DCONFIG_AUFS_HFSNOTIFY -DCONFIG_AUFS_EXPORT
-DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP
make -C /usr/src/linux-2.6.36-CHAKRA
M=/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs
EXTRA_CFLAGS="-I/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/include
-DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127
-DCONFIG_AUFS_HNOTIFY -DCONFIG_AUFS_HFSNOTIFY -DCONFIG_AUFS_EXPORT
-DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP" modules
make[1]: Entering directory `/usr/src/linux-2.6.36-CHAKRA'
CC [M]
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/module.o
In file included from
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/dynop.h:32:0,
from
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/branch.h:31,
from
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/aufs.h:38,
from
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/module.c:25:
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/inode.h:38:29:
error: field 'hn_entry' has incomplete type
make[2]: ***
[/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs/module.o]
Error 1
make[1]: ***
[_module_/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-247e6ec/fs/aufs]
Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.36-CHAKRA'
make: *** [fs/aufs/aufs.ko] Error 2
Aborting...
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ rm -R src
commit: 35c9de03d765d93d9d88e403637c1424d38cddf5
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ ../makepkg
==> Making package: aufs2.1 2.6.36_20100826-1 (Sun Oct 24 11:27:51 UTC 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found aufs2.1-2.6.36_20100826.tar.gz
-> Found a.patch
==> Validating source files with md5sums...
aufs2.1-2.6.36_20100826.tar.gz ... Passed
a.patch ... Passed
==> Extracting Sources...
-> Extracting aufs2.1-2.6.36_20100826.tar.gz with bsdtar
==> Removing existing pkg/ directory...
==> Entering fakeroot environment...
==> Starting build()...
patching file fs/aufs/branch.c
Hunk #1 FAILED at 858.
Hunk #2 succeeded at 897 (offset -5 lines).
1 out of 2 hunks FAILED -- saving rejects to file fs/aufs/branch.c.rej
patching file fs/aufs/debug.c
patching file fs/aufs/debug.h
Hunk #1 succeeded at 34 with fuzz 1.
Hunk #2 succeeded at 227 (offset -1 lines).
patching file fs/aufs/dir.c
Hunk #1 FAILED at 213.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/dir.c.rej
patching file fs/aufs/export.c
Hunk #1 FAILED at 278.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/export.c.rej
patching file fs/aufs/f_op.c
Hunk #1 FAILED at 82.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/f_op.c.rej
patching file fs/aufs/sysrq.c
Hunk #1 FAILED at 56.
Hunk #2 succeeded at 73 with fuzz 2 (offset -3 lines).
1 out of 2 hunks FAILED -- saving rejects to file fs/aufs/sysrq.c.rej
patching file fs/aufs/vfsub.c
patching file fs/aufs/vfsub.h
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/vfsub.h.rej
can't find file to patch at input line 216
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/fs/file_table.c b/fs/file_table.c
|index 44abf87..4081dda 100644
|--- a/fs/file_table.c
|+++ b/fs/file_table.c
--------------------------
File to patch: ^C
==> ERROR: Aborted by user! Exiting...
p...@[chroot]:~/buildroot/core-testing/aufs2.1$ ../makepkg
==> Making package: aufs2.1 2.6.36_20100826-1 (Sun Oct 24 11:28:32 UTC 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found aufs2.1-2.6.36_20100826.tar.gz
-> Found a.patch
==> Validating source files with md5sums...
aufs2.1-2.6.36_20100826.tar.gz ... Passed
a.patch ... Passed
==> Extracting Sources...
-> Extracting aufs2.1-2.6.36_20100826.tar.gz with bsdtar
==> Removing existing pkg/ directory...
==> Entering fakeroot environment...
==> Starting build()...
==> start config
-I/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/include
-DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127
-DCONFIG_AUFS_HNOTIFY -DCONFIG_AUFS_HFSNOTIFY -DCONFIG_AUFS_EXPORT
-DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP
make -C /usr/src/linux-2.6.36-CHAKRA
M=/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs
EXTRA_CFLAGS="-I/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/include
-DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127
-DCONFIG_AUFS_HNOTIFY -DCONFIG_AUFS_HFSNOTIFY -DCONFIG_AUFS_EXPORT
-DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP" modules
make[1]: Entering directory `/usr/src/linux-2.6.36-CHAKRA'
CC [M]
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/module.o
CC [M]
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/sbinfo.o
CC [M]
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/super.o
CC [M]
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/branch.o
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/branch.c:
In function 'au_br_mod_files_ro':
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/branch.c:859:2:
error: request for member 'next' in something not a structure or union
/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/branch.c:859:2:
warning: comparison of distinct pointer types lacks a cast
make[2]: ***
[/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs/branch.o]
Error 1
make[1]: ***
[_module_/home/phil/buildroot/core-testing/aufs2.1/src/aufs2-standalone-35c9de0/fs/aufs]
Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.36-CHAKRA'
make: *** [fs/aufs/aufs.ko] Error 2
Aborting...
p...@[chroot]:~/buildroot/core-testing/aufs2.1$
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
