grub-doc patch problem

grub-doc patch problem

[������]

SSB3YW50IHRvIHVzZSBncnViIHRvIGJvb3QgIGZyb20gbXkgRE9DMjAwMCAoMzJNKS4gDQpBY2Nv
cmRpbmcgdG8gIiBHUlVCIG9uIERvQyBNaWxsZW5uaXVtLzIwMDAgLSBJbnN0cnVjdGlvbnMgKFJl
dmlzZWQpICINCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL3BpcGVybWFpbC9saW51eC1tdGQv
MjAwMi1PY3RvYmVyLzAwNjE2Ni5odG1sICwNCkkgdXNlIGdydWItMC45MiBhbmQgdGhlIHBhdGNo
IGZpbGUgaXMgZ3J1Yi0yMDAyLTEwLTA4LWRvYy5wYXRjaA0KYnV0IGV2ZXJ5dGltZSBJIHVzZSJw
YXRjaCAtcDAgLWkgZ3J1Yi0yMDAyLTEwLTA4LWRvYy5wYXRjaCIgLEkgd2lsbCBnZXQgdGhlIGZv
bGxvd2luZw0KIg0KcGF0Y2hpbmcgZmlsZSAuL0FVVEhPUlMNCkh1bmsgIzEgRkFJTEVEIGF0IDQy
Lg0KMSBvdXQgb2YgMSBodW5rIEZBSUxFRCAtLSBzYXZpbmcgcmVqZWN0cyB0byBmaWxlIC4vQVVU
SE9SUy5yZWoNCnBhdGNoaW5nIGZpbGUgLi9DaGFuZ2VMb2cNCkh1bmsgIzEgRkFJTEVEIGF0IDEu
DQpIdW5rICMyIEZBSUxFRCBhdCA4OC4NCjIgb3V0IG9mIDIgaHVua3MgRkFJTEVEIC0tIHNhdmlu
ZyByZWplY3RzIHRvIGZpbGUgLi9DaGFuZ2VMb2cucmVqDQpwYXRjaGluZyBmaWxlIC4vUkVBRE1F
X0Rpc2tPbkNoaXANCnBhdGNoaW5nIGZpbGUgLi9jb25maWd1cmUuaW4NCkh1bmsgIzEgc3VjY2Vl
ZGVkIGF0IDIyOCAob2Zmc2V0IC0xMyBsaW5lcykuDQpwYXRjaGluZyBmaWxlIC4vc3RhZ2UxL01h
a2VmaWxlLmFtDQpwYXRjaGluZyBmaWxlIC4vc3RhZ2UxL2RvY19zdGFnZTEuUw0KcGF0Y2hpbmcg
ZmlsZSAuL3N0YWdlMS9kb2Nfc3RhZ2UxLmgNCnBhdGNoaW5nIGZpbGUgLi9zdGFnZTEvbWFrZWNz
dW0uYw0KcGF0Y2hpbmcgZmlsZSAuL3N0YWdlMi9NYWtlZmlsZS5hbQ0KSHVuayAjMSBGQUlMRUQg
YXQgODMuDQoxIG91dCBvZiAxIGh1bmsgRkFJTEVEIC0tIHNhdmluZyByZWplY3RzIHRvIGZpbGUg
Li9zdGFnZTIvTWFrZWZpbGUuYW0ucmVqDQoiDQoNClRoZSBBVVRIT1JTIGFuZCBDSEFOR0xPRyBw
cm9ibGVtcyBoYXMgYmVlbiBwb2ludGVkIGluIHRoZSBpbnN0cnV0aW9uICxidXQgdGhlIGxhc3Qg
b25lIGhhc25vdCBiZWVuLg0Kd2h5IHRoaXMgaGFwcGVuZWQ/DQpJZiBJIGlnbm9yZSB0aGlzIGVy
cm9yICwgY29udGludWUgImFjbG9jYWwgJiYgYXV0b21ha2UgLS1hZGQtbWlzc2luZyAmJiBhdXRv
Y29uZiINCkkgd2lsbCBnZXQgdHdvIHdhcm5pbmdzOg0KY29uZmlndXJlLmluOjE3OiB3YXJuaW5n
OiBkbyBub3QgdXNlIG00X3BhdHN1YnN0OiB1c2UgcGF0c3Vic3Qgb3IgbTRfYnBhdHN1YnN0DQpj
b25maWd1cmUuaW46NjgxOiB3YXJuaW5nOiBkbyBub3QgdXNlIG00X3JlZ2V4cDogdXNlIHJlZ2V4
cCBvciBtNF9icmVnZXhwDQoNClRoZW4gDQoiLi9jb25maWd1cmUgLS1lbmFibGUtZGlza29uY2hp
cC0yMDAwIC1lbmFibGUtZGlza29uY2hpcC1jdHJsYnlwYXNzIC1lbmFibGUtZXh0MmZzICIgYW5k
ICAibWFrZSIgLA0KaXQgd2lsbCBzdG9wICxhbmQgZHVtcCB0aGUgZm9sbG93aW5nIGVycm9yIGlu
Zm9tYXRpb246DQoNCiINCnN0YWdlMi5jOiBJbiBmdW5jdGlvbiBgY21haW4nOg0Kc3RhZ2UyLmM6
MTAxOTogYGN1cnJlbnRfdGVybScgdW5kZWNsYXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVuY3Rp
b24pDQpzdGFnZTIuYzoxMDE5OiAoRWFjaCB1bmRlY2xhcmVkIGlkZW50aWZpZXIgaXMgcmVwb3J0
ZWQgb25seSBvbmNlDQpzdGFnZTIuYzoxMDE5OiBmb3IgZWFjaCBmdW5jdGlvbiBpdCBhcHBlYXJz
IGluLikNCnN0YWdlMi5jOjEwMTk6IGBURVJNX0RVTUInIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBp
biB0aGlzIGZ1bmN0aW9uKQ0KbWFrZVsyXTogKioqIFtwcmVfc3RhZ2UyX2V4ZWMtc3RhZ2UyLm9d
IEVycm9yIDENCm1ha2VbMV06ICoqKiBbYWxsLXJlY3Vyc2l2ZV0gRXJyb3IgMQ0KbWFrZTogKioq
IFthbGxdIEVycm9yIDINCiINCg0KDQp3aGF0IGlzIHdyb25nIHdpdGggbXkgc3RlcHM/IA0KQW55
dGhpbmcgSSBtaXNzZWQ/DQpIb3BlIHNvbWUga2luZCBndXlzIGNvdWxkICBnaXZlIG1lIGEgaGFu
ZCBhbmQgdGhhbmtzIGluIGFkdmFuZGNlDQogDQoNCkJUVzoNCkkgaGF2ZSB0cmllZCBncnViLTIw
MDMtMDEtMDgtZG9jLnBhdGNoICxidXQgSSBnb3QgdGhlIHNhbWUgcmVzdWx0IA0KTXkgbGludXgg
aXMgcmVkaGF0Ny4xICwga2VybmVsIGlzIDIuNC4yICwgDQpJIGhhdmUgdXNlZCBycG0gcGFja2Fn
ZSB0byB1cGRhdGUgYXV0b21ha2UgdG8gMS41IGFuZCBhdXRvY29uZiB0byAyLjUzICAgIA0K

grub-doc patch problem

[tony Tong]

sorry , because the previous two letters is unreadable
,I have to change a emailaddress to resend it.

I want to use grub to boot  from my DOC2000 (32M). 
According to " GRUB on DoC Millennium/2000 -
Instructions (Revised) "
http://lists.infradead.org/pipermail/linux-mtd/2002-October/006166.html
,
I use grub-0.92 and the patch file is
grub-2002-10-08-doc.patch
but everytime I use"patch -p0 -i
grub-2002-10-08-doc.patch" ,I will get the following
"
patching file ./AUTHORS
Hunk #1 FAILED at 42.
1 out of 1 hunk FAILED -- saving rejects to file
./AUTHORS.rej
patching file ./ChangeLog
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 88.
2 out of 2 hunks FAILED -- saving rejects to file
./ChangeLog.rej
patching file ./README_DiskOnChip
patching file ./configure.in
Hunk #1 succeeded at 228 (offset -13 lines).
patching file ./stage1/Makefile.am
patching file ./stage1/doc_stage1.S
patching file ./stage1/doc_stage1.h
patching file ./stage1/makecsum.c
patching file ./stage2/Makefile.am
Hunk #1 FAILED at 83.
1 out of 1 hunk FAILED -- saving rejects to file
./stage2/Makefile.am.rej
"

The AUTHORS and CHANGLOG problems has been pointed in
the instrution ,but the last one hasnot been.
why this happened?
If I ignore this error , continue "aclocal && automake
--add-missing && autoconf"
I will get two warnings:
configure.in:17: warning: do not use m4_patsubst: use
patsubst or m4_bpatsubst
configure.in:681: warning: do not use m4_regexp: use
regexp or m4_bregexp

Then 
"./configure --enable-diskonchip-2000
-enable-diskonchip-ctrlbypass -enable-ext2fs " and 
"make" ,
it will stop ,and dump the following error infomation:

"
stage2.c: In function `cmain':
stage2.c:1019: `current_term' undeclared (first use in
this function)
stage2.c:1019: (Each undeclared identifier is reported
only once
stage2.c:1019: for each function it appears in.)
stage2.c:1019: `TERM_DUMB' undeclared (first use in
this function)
make[2]: *** [pre_stage2_exec-stage2.o] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2
"


what is wrong with my steps? 
Anything I missed?
Hope some kind guys could  give me a hand and thanks
in advandce
 

BTW:
I have tried grub-2003-01-08-doc.patch ,but I got the
same result 
My linux is redhat7.1 , kernel is 2.4.2 , 
I have used rpm package to update automake to 1.5 and
autoconf to 2.53







 

__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

grub-doc patch problem

[Mark Meade]

On Friday 07 February 2003 04:11 am, tony Tong wrote:
> I use grub-0.92 and the patch file is
> grub-2002-10-08-doc.patch
> but everytime I use"patch -p0 -i
> grub-2002-10-08-doc.patch" ,I will get the following

The 10-08 patch was intended to be used with Grub from CVS (not 0.92).  You 
may want to try again with the CVS version.

grub-doc patch problem

[tony Tong]

but now the newest cvs version get more error when
using 10-08.patch 

Must I need 10-08snapshot of grub ?

> The 10-08 patch was intended to be used with Grub
> from CVS (not 0.92).  You 
> may want to try again with the CVS version.


__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

grub-doc patch problem

[Mark Meade]

On Saturday 08 February 2003 06:24 am, tony Tong wrote:
> but now the newest cvs version get more error when
> using 10-08.patch

Use the grub-2003-01-08-doc.patch with the latest GRUB cvs.  You will get 
errors when patching ChangeLog, but those don't matter. 

I tested this combination today, and the patch worked, as well as the 
aclocal/automake/autoconf, configure, and make steps.  The grub_firmware 
output was installed on a 32MB DiskOnChip 2000, and it boots as expected.

Make sure you use automake version 1.5 and autoconf version 2.53.  On some 
systems, this can be specified by exporting WANT_AUTOMAKE_1_5=1 and 
WANT_AUTOCONF_2_5=1. 

See http://lakeshoremicro.com/diskonchip-grub-howto.html for updated 
instructions, but use the 2003-01-08 patch instead of 2002-10-08.




>From Kentropy  Sat Feb  8 13:17:39 2003
From: Kentropy (Kentropy)
Date: Sat, 8 Feb 2003 19:17:39 +0100
Subject: hang into genprobe_ident_chips
Message-ID: <00ed01c2cf9e$5e45a480$0200a8c0@ester>

Hi,
I have problems using an Intel flash TE28F320-C3BC90
My kernel hangs into (gen_probe.c, 125), genprobe_ident_chips( )
Could someone please suggest me what do I have to do to solve this ?
Do I need to add a new flash type in jedec_probe.c ?
TIA


Uncompressing Linux........................................ done, booting the kernel.
Linux version 2.4.19-rmk4-ds2
CPU: Intel XScale-80200 revision 1
<snip>
JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB.
FLASH virtual address: 0xc4810000
TRACE (cfi_probe.c, 81), cfi_probe_chip: a00
TRACE (cfi_probe.c, 89), cfi_probe_chip: a11
TRACE (cfi_probe.c, 164), cfi_chip_setup: b1
Number of erase regions: 2
TRACE (cfi_probe.c, 173), cfi_chip_setup: b1
TRACE (cfi_probe.c, 181), cfi_chip_setup: b2
TRACE (cfi_probe.c, 193), cfi_chip_setup: b3
TRACE (cfi_probe.c, 204), cfi_chip_setup: b4
Primary Vendor Command Set: 0003 (Intel/Sharp Standard)
Primary Algorithm Table at 0035
Alternative Vendor Command Set: 0000 (None)
No Alternate Algorithm Table
Vcc Minimum: 2.7 V
Vcc Maximum: 3.6 V
Vpp Minimum: b.4 V
Vpp Maximum: c.6 V
Typical byte/word write timeout: 32 5s
Maximum byte/word write timeout: 512 5s
Full buffer write not supported
Typical block erase timeout: 1024 ms
Maximum block erase timeout: 8192 ms
Chip erase not supported
Device size: 0x400000 bytes (4 MiB)
Flash Device Interface description: 0x0001
  - x16-only asynchronous interface
Max. bytes in buffer write: 0x1
Number of Erase Block Regions: 2
TRACE (cfi_probe.c, 211), cfi_chip_setup: b5
TRACE (cfi_probe.c, 216), cfi_chip_setup: b6
  Erase Region #0: BlockSize 0x2000 bytes, 8 blocks
TRACE (cfi_probe.c, 216), cfi_chip_setup: b6
  Erase Region #1: BlockSize 0x10000 bytes, 63 blocks
TRACE (cfi_probe.c, 225), cfi_chip_setup: b7
TRACE (cfi_probe.c, 230), cfi_chip_setup: b8
TRACE (gen_probe.c, 125), genprobe_ident_chips: GPa1

Unable to handle kernel paging request at virtual address c5810000

grub-doc patch problem

[tony Tong]

The problem still stands!! The result dejected me so
much .
I have tested the combination of 2003-0108.patch and
Grub from CVS by Wincvs tool .
The patch still cannot pass without errors.
The  following is my all steps :
1:use "rpm -Uvh " to update automake 1.5 autoconf
autoconf 2.53
2:use Wincvs to get grub directory from CVS
use winrar  to get grub.zip
3.copy grub.zip to linux platform 
and use "unzip grub.zip"
4.from ftp.uk.linux.org ,I get the 0208 snapshot of
mtd
5."bunzip -d  mtd.tar.bz2 " 
  tar xvf mtd.tar
6.cd grub
7."patch -p0 -i
../mtd/patches/grub-2003-01-08-doc.patch " 
then I get the following output:
"patching file ./AUTHORS
Hunk #1 FAILED at 45.
1 out of 1 hunk FAILED -- saving rejects to file
./AUTHORS.rej
patching file ./ChangeLog
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 197.
Hunk #3 FAILED at 287.
3 out of 3 hunks FAILED -- saving rejects to file
./ChangeLog.rej
patching file ./README_DiskOnChip
patching file ./configure.in
Hunk #1 FAILED at 247.
1 out of 1 hunk FAILED -- saving rejects to file
./configure.in.rej
patching file ./stage1/Makefile.am
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 53.
2 out of 2 hunks FAILED -- saving rejects to file
./stage1/Makefile.am.rej
patching file ./stage1/doc_stage1.S
patching file ./stage1/doc_stage1.h
patching file ./stage1/makecsum.c
patching file ./stage2/Makefile.am
Hunk #1 FAILED at 83.
1 out of 1 hunk FAILED -- saving rejects to file
./stage2/Makefile.am.rej
patching file ./stage2/asm.S
Hunk #1 FAILED at 133.
Hunk #2 FAILED at 2331.
2 out of 2 hunks FAILED -- saving rejects to file
./stage2/asm.S.rej
patching file ./stage2/bdev_diskonchip.c
patching file ./stage2/bios.c
Hunk #1 FAILED at 129.
Hunk #2 FAILED at 226.
2 out of 2 hunks FAILED -- saving rejects to file
./stage2/bios.c.rej
patching file ./stage2/boot.c
Hunk #1 FAILED at 61.
1 out of 1 hunk FAILED -- saving rejects to file
./stage2/boot.c.rej
patching file ./stage2/builtins.c
Hunk #1 FAILED at 1322.
Hunk #2 FAILED at 3062.
2 out of 2 hunks FAILED -- saving rejects to file
./stage2/builtins.c.rej
patching file ./stage2/char_io.c
Hunk #1 FAILED at 1170.
Hunk #2 FAILED at 1195.
Hunk #3 FAILED at 1257.
3 out of 3 hunks FAILED -- saving rejects to file
./stage2/char_io.c.rej
patching file ./stage2/disk_io.c
Hunk #1 FAILED at 126.
Hunk #2 FAILED at 319.
Hunk #3 FAILED at 396.
Hunk #4 FAILED at 655.
Hunk #5 FAILED at 737.
Hunk #6 FAILED at 997.
Hunk #7 FAILED at 1024.
Hunk #8 FAILED at 1136.
Hunk #9 FAILED at 1227.
Hunk #10 FAILED at 1261.
Hunk #11 FAILED at 1646.
11 out of 11 hunks FAILED -- saving rejects to file
./stage2/disk_io.c.rej
patching file ./stage2/shared.h
Hunk #1 FAILED at 27.
Hunk #2 FAILED at 188.
Hunk #3 FAILED at 982.
3 out of 3 hunks FAILED -- saving rejects to file
./stage2/shared.h.rej
patching file ./stage2/stage2.c
Hunk #1 FAILED at 824.
Hunk #2 FAILED at 907.
2 out of 2 hunks FAILED -- saving rejects to file
./stage2/stage2.c.rej"

Why this happen ? 
It seems to have nothing to do with automake or
autoconf because the patch process doesnot need it .
Can you mail me your grub cvs version ?
For some reasons ,our country limit our access to
website of foreign countries . I have to use proxy but
when using Wincvs ,proxy often cannot work.
I guess maybe the grub cvs version is the key .










-- Mark Meade <mark@lakeshoremicro.com> wrote:
> Use the grub-2003-01-08-doc.patch with the latest
> GRUB cvs.  You will get 
> errors when patching ChangeLog, but those don't
> matter. 


__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

grub-doc patch problem

[David Woodhouse]

On Sun, 2003-02-09 at 02:40, tony Tong wrote:
> I have tested the combination of 2003-0108.patch and
> Grub from CVS by Wincvs tool .
> The patch still cannot pass without errors.

I think I know the problem now. But you're top-posting so I don't want
to answer you. Show me you can send a _correct_ reply, containing _only_
the part of the original message which you actually need as context, and
with your own test _below_ that, and I'll tell you what I think might be
the problem.

-- 
dwmw2

grub-doc patch problem

[David Woodhouse]

On Sun, 2003-02-09 at 08:33, David Woodhouse wrote:
> I think I know the problem now. But you're top-posting so I don't want
> to answer you. Show me you can send a _correct_ reply, containing _only_
> the part of the original message which you actually need as context, and
> with your own test _below_ that,

s/test/text/

-- 
dwmw2

grub-doc patch problem

[tony Tong]

--- Mark Meade <mark@lakeshoremicro.com> wrote:
> Use the grub-2003-01-08-doc.patch with the latest
> GRUB cvs.  You will get 
> errors when patching ChangeLog, but those don't
> matter. 
Today I have used grub-2003-01-08-doc.patch to patch
the GRUB cvs version . But I get more than one errors
,the following is selected from  my patch output
result :
1 out of 1 hunk FAILED -- saving rejects to file
./AUTHORS.rej
3 out of 3 hunks FAILED -- saving rejects to file
./ChangeLog.rej
1 out of 1 hunk FAILED -- saving rejects to file
./configure.in.rej
2 out of 2 hunks FAILED -- saving rejects to file
./stage1/Makefile.am.rej
1 out of 1 hunk FAILED -- saving rejects to file
./stage2/Makefile.am.rej
2 out of 2 hunks FAILED -- saving rejects to file
./stage2/asm.S.rej
......................
.......................

> I tested this combination today, and the patch
> worked, as well as the 
> aclocal/automake/autoconf, configure, and make
> steps.

Because patch cannot pass ,these steps are untested  

> Make sure you use automake version 1.5 and autoconf
> version 2.53.  On some 
> systems, this can be specified by exporting
> WANT_AUTOMAKE_1_5=1 and 
> WANT_AUTOCONF_2_5=1. 

I am sure I have the proper version of automake and
autoconf.
"automake --version" and "rpm -q automake" both tell
me I have the right version. The same as autoconf.
And I also do "export WANT_AUTOMAKE_1_5=1" and "export
WANT_AUTOCONF_2_5=1".

Even after these efforts  ,I still cannot make the
combination of 03-01-08.patch and GRUB cvs work.
what important  did  I miss ?

__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

grub-doc patch problem

[David Woodhouse]

On Sun, 2003-02-09 at 12:52, tony Tong wrote:

> Today I have used grub-2003-01-08-doc.patch to patch
> the GRUB cvs version . But I get more than one errors
> ,the following is selected from  my patch output
> result :

You mentioned that you are using WinCVS. I believe that when you check
out a file with CVS, it automatically 'fixes' the linefeeds to match the
system on which you're checking it out. So all the Unix linefeeds will
have been converted to CRLF to make Windows happy. 

However, that means that patch isn't happy, because it's looking for
lines that _don't_ end in a carriage return.

Try the '-l' option to patch, or running 'dos2unix' on the offending
files, or running CVS on a real box, or configuring CVS not to convert. 

-- 
dwmw2

grub-doc patch problem

[tony Tong]

--- David Woodhouse <dwmw2@infradead.org> wrote:
> You mentioned that you are using WinCVS. I believe
> that when you check
> out a file with CVS, it automatically 'fixes' the
> linefeeds to match the
> system on which you're checking it out. So all the
> Unix linefeeds will
> have been converted to CRLF to make Windows happy. 

Thank you ,David!
Thank you very very much!!
The wincvs is the right key ! It does  convert the
linefeeds to windows style by default.
I have managed it to check out with unix LF
successfully .
Thanks, without your help , I will be still in the
nightmare now .
:)

Besides, thanks to Mark Meade for providing me so
detailed Howto Document .

 


__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com