[uml-devel] 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[uml-devel] 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[William Stearns]

Good evening, all,
 	The uml patch tar file at 
http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar 
should apply to 2.6.16-rc2, but when I try to apply it I get:


==== Applying /usr/src/2.6.16-rc2-patches-20060208/uml-add-tls-support
patching file arch/um/include/os.h
patching file arch/um/kernel/exec_kern.c
patching file arch/um/kernel/process_kern.c
patching file arch/um/kernel/ptrace.c
patching file arch/um/kernel/skas/process_kern.c
patching file arch/um/os-Linux/Makefile
Hunk #2 FAILED at 12.
1 out of 2 hunks FAILED -- saving rejects to file 
arch/um/os-Linux/Makefile.rej
patching file arch/um/os-Linux/tls.c
patching file arch/um/sys-i386/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file 
arch/um/sys-i386/Makefile.rej
patching file arch/um/sys-i386/syscalls.c
patching file arch/um/sys-i386/tls.c
patching file arch/um/sys-x86_64/Makefile
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file 
arch/um/sys-x86_64/Makefile.rej
patching file arch/um/sys-x86_64/tls.c
patching file include/asm-um/desc.h
patching file include/asm-um/processor-i386.h
patching file include/asm-um/processor-x86_64.h
patching file include/asm-um/ptrace-generic.h
patching file include/asm-um/ptrace-i386.h
patching file include/asm-um/ptrace-x86_64.h
patching file include/asm-um/segment.h
Something went wrong with 
/usr/src/2.6.16-rc2-patches-20060208/uml-add-tls-support . Press enter 
when ready to move on.
==== Applying /usr/src/2.6.16-rc2-patches-20060208/fix-struct-compile
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|# Change a couple of instances of struct modify_ldt_ldt_s to struct 
user_desc.
|Index: linux-2.6.15/arch/um/os-Linux/tls.c
|===================================================================
|--- linux-2.6.15.orig/arch/um/os-Linux/tls.c   2006-02-06 
16:47:11.000000000 -0500
|+++ linux-2.6.15/arch/um/os-Linux/tls.c        2006-02-06 
16:48:21.000000000 -0500
--------------------------
File to patch:


 	Cheers,
 	- Bill

---------------------------------------------------------------------------
 	..all in all it's just another rule in the firewall.
 	/Ping Flood/
(Courtesy of Hirling Endre)
--------------------------------------------------------------------------
William Stearns (wstearns@pobox.com).  Mason, Buildkernel, freedups, p0f,
rsync-backup, ssh-keyinstall, dns-check, more at:   http://www.stearns.org
--------------------------------------------------------------------------


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[uml-devel] Re: 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[Jeff Dike]

On Fri, Feb 17, 2006 at 12:19:07AM -0500, William Stearns wrote:
> 	The uml patch tar file at 
> http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar 
> should apply to 2.6.16-rc2, but when I try to apply it I get:

I just tried that -
	made a rc2 tree
	grabbed my current tarball from the UML site
	applied it

I got a couple of offsets (which shouldn't have been there), but it
applied and is currently building OK.

I submit to you that perhaps your tree is not quite the cleanest
2.6.15-rc2 :-)

				Jeff


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[uml-devel] Re: 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[William Stearns]

Good afternoon, Jeff,

On Fri, 17 Feb 2006, Jeff Dike wrote:

> On Fri, Feb 17, 2006 at 12:19:07AM -0500, William Stearns wrote:
>> 	The uml patch tar file at
>> http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar
>> should apply to 2.6.16-rc2, but when I try to apply it I get:
>
> I just tried that -
> 	made a rc2 tree
> 	grabbed my current tarball from the UML site
> 	applied it
>
> I got a couple of offsets (which shouldn't have been there), but it
> applied and is currently building OK.
>
> I submit to you that perhaps your tree is not quite the cleanest
> 2.6.15-rc2 :-)

 	Ummm, 2.6._16_-rc2, I expect you meant.
 	I opened up the linux-2.6.16-rc2.tar.bz2 direct from 
ftp.kernel.org, used apply-quit-patches 
( http://www.stearns.org/apply-quilt-patches/apply-quilt-patches ) from 
the patches directory, and got those errors.
 	I'm really tied up today with a drive problem, but I'll try again 
tonight.
 	Cheers,
 	- Bill

---------------------------------------------------------------------------
 	..all in all it's just another rule in the firewall.
 	/Ping Flood/
(Courtesy of Hirling Endre)
--------------------------------------------------------------------------
William Stearns (wstearns@pobox.com).  Mason, Buildkernel, freedups, p0f,
rsync-backup, ssh-keyinstall, dns-check, more at:   http://www.stearns.org
--------------------------------------------------------------------------


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[uml-devel] Re: 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[Jeff Dike]

On Fri, Feb 17, 2006 at 12:29:58PM -0500, William Stearns wrote:
> >I submit to you that perhaps your tree is not quite the cleanest
> >2.6.15-rc2 :-)
> 
> 	Ummm, 2.6._16_-rc2, I expect you meant.

Correct, but that was still a true statement :-)

> 	I opened up the linux-2.6.16-rc2.tar.bz2 direct from 
> ftp.kernel.org, used apply-quit-patches 
> ( http://www.stearns.org/apply-quilt-patches/apply-quilt-patches ) from 
> the patches directory, and got those errors.

Well, you show me yours and I'll show you mine.  Here's mine...

~/linux/2.6/test 7876: wget http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.16-rc2.tar.bz2
--15:08:27--  http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.16-rc2.tar.bz2
           => `linux-2.6.16-rc2.tar.bz2'
Resolving www.kernel.org... 204.152.191.5, 204.152.191.37
Connecting to www.kernel.org|204.152.191.5|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 40,817,609 (39M) [application/x-bzip2]

100%[====================================>] 40,817,609   627.97K/s    ETA 00:00

15:09:33 (610.73 KB/s) - `linux-2.6.16-rc2.tar.bz2' saved [40817609/40817609]

~/linux/2.6/test 7877: wget http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar
--15:09:36--  http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar
           => `patches.tar'
Resolving user-mode-linux.sourceforge.net... 66.35.250.209
Connecting to user-mode-linux.sourceforge.net|66.35.250.209|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 737,280 (720K) [application/x-tar]

100%[====================================>] 737,280        8.01K/s    ETA 00:00

15:10:21 (16.05 KB/s) - `patches.tar' saved [737280/737280]

~/linux/2.6/test 7880: bzcat linux-2.6.16-rc2.tar.bz2 | tar xf -
~/linux/2.6/test 7881: cd linux-2.6.16-rc2/
~/linux/2.6/test/linux-2.6.16-rc2 7882: tar xf ../patches.tar 
~/linux/2.6/test/linux-2.6.16-rc2 7883: mv patches/ x
~/linux/2.6/test/linux-2.6.16-rc2 7884: quilt setup /dev/null
~/linux/2.6/test/linux-2.6.16-rc2 7885: export dir=x; for p in `cat $dir/series`; do [ ! -f $dir/$p ] && continue; quilt import $dir/$p; quilt push || break; done
Importing patch x/uaccess-warning (stored as patches/uaccess-warning)
Applying patch patches/uaccess-warning
patching file arch/um/include/skas/uaccess-skas.h
patching file arch/um/include/tt/uaccess-tt.h
patching file arch/um/include/um_uaccess.h
patching file arch/um/kernel/skas/uaccess.c
patching file arch/um/kernel/tt/uaccess.c
patching file include/asm-um/uaccess.h

...

With lots of happiness following, except for the aforementioned offsets.

				Jeff


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel