Ian Brown wrote:
Thanks;
I did the following test now , after probing a bit; I DON'T get errors now, but something
is strange and I have a question I hope someone can answer.
I unzipped onnv43 to usr
I had changed the lines in the diff-u.txt which included the source files path
in this way:
It was:
Index: usr/src/cmd/devfsadm/misc_link.c
*** /net/ephron.prc/export/onnv43/usr/src/cmd/devfsadm/misc_link.c
and now it is , instead ,
*** usr/src/cmd/devfsadm/misc_link.c
I did it to all files under *** /net//ephron.prc/export/onnv43/usr/
now I cd to usr (the onnv43 unzipp created it)
And I ran :
gpatch -p1 < ../diffs-u.txt
It doesn'y generate errors (complete full log is down next)
what is strange to me is that it creates a folder named workspaces under usr
and pfh-gate-prc folder below it.
so in fact I have for example : /usr/workspaces/pfh-gate-prc/usr/src/uts/common/io/hook.c
/usr/workspaces/pfh-gate-prc/usr/src/uts/common/io/hook.conf
/usr/workspaces/pfh-gate-prc/usr/src/uts/common/io/neti.c
(there are some more files generated under /usr/workspaces/pfh-gate-prc/usr/...)
I looked a bit at the diif-u.txt file and I see that , in the case of neti.c,
the corrseponding lines are:
*** /dev/null Wed Jul 19 20:39:38 2006
--- /workspaces/pfh-gate-prc/usr/src/uts/common/io/neti.c Thu Jul 6
15:14***************
As I understand this line is because neti.c does not exist in current unpatched version of
onnv43. (and this is the reason for /dev/null ).
So my question is : what am I doing wrong ? I suppose that workspaces should
not be
created and neti.c should be created under usr/src/uts/common/io.
Is there some switch I should add to the gpatch command to avoid creating files
under /usr/workspaces/pfh-gate-prc/usr/...?
...
patching file
workspaces/pfh-gate-prc/usr/src/cmd/mdb/common/modules/hook/hook.cpatching file
workspaces/pfh-gate-prc/usr/src/cmd/mdb/common/modules/neti/neti.cpatching file
workspaces/pfh-gate-prc/usr/src/cmd/mdb/intel/amd64/hook/Makefile
patching file workspaces/pfh-gate-prc/usr/src/cmd/mdb/intel/amd64/neti/Makefile
...
I think the thing to do, since you have started doing some editting
of the text patch file, is to keep with it and delete the text
"/workspaces/pfh-gate-prc/" from each line where it occurs.
But at this point, I think it would be better for you to do this:
# cd /usr/workspaces/pfh-gate-prc/usr/src
# pax -r -w -pe . /path-to-onnv43/usr/src
(you might want to verify that pax has copied all of the new source
files before going the next step to delete all of this.)
# cd /usr
# rm -rf workspaces
Darren
_______________________________________________
networking-discuss mailing list
[email protected]
