Hi all,
I'm trying to patch VDE just as suggested in [1] but I'm having trouble. I've downloaded VDE 2.3.2 from here [2] and the patches from here [1].
I'm doing the following:
lucas@test:~/batman-adv/ script/vde$ tar zxvf vde2-2.3.2.tar.gz lucas@test:~/batman-adv/script/vde$ patch vde2-2.3.2/src/vde_switch/port.c < vde2-2.3.2_colour.patch patching file vde2-2.3.2/src/vde_switch/port.c patching file vde2-2.3.2/src/vde_switch/port.c Hunk #1 FAILED at 68. 1 out of 1 hunk FAILED -- saving rejects to file vde2-2.3.2/src/vde_switch/port.c.rej
What is it that I'm doing wrong?
Any hint is appreciated ...
Regards!
Lucas
[1] - http://www.open-mesh.org/projects/open-mesh/wiki/Emulation [2] - http://sourceforge.net/projects/vde/files/vde2/2.3.2/
On 24/11/14 19:18, Lucas Aimaretto wrote:
Hi all,
I'm trying to patch VDE just as suggested in [1] but I'm having trouble. I've downloaded VDE 2.3.2 from here [2] and the patches from here [1].
The patch is for vde-2.3.1, so either you download that version of the software or you "fix" the patch to work with vde-2.3.2.
Cheers,
On 24/11/14 19:23, Antonio Quartulli wrote:
On 24/11/14 19:18, Lucas Aimaretto wrote:
Hi all,
I'm trying to patch VDE just as suggested in [1] but I'm having trouble. I've downloaded VDE 2.3.2 from here [2] and the patches from here [1].
The patch is for vde-2.3.1, so either you download that version of the software or you "fix" the patch to work with vde-2.3.2.
Sorry Lucas,
I just realized that we have that patch on the wikipage (http://www.open-mesh.org/attachments/download/152/vde2-2.3.2_colour.patch).
Did you use this one? It was at the very bottom (attachments section)
On Mon, Nov 24, 2014 at 5:11 PM, Antonio Quartulli antonio@meshcoding.com wrote:
On 24/11/14 19:23, Antonio Quartulli wrote:
On 24/11/14 19:18, Lucas Aimaretto wrote:
Hi all,
I'm trying to patch VDE just as suggested in [1] but I'm having trouble. I've downloaded VDE 2.3.2 from here [2] and the patches from here [1].
The patch is for vde-2.3.1, so either you download that version of the software or you "fix" the patch to work with vde-2.3.2.
Sorry Lucas,
I just realized that we have that patch on the wikipage (http://www.open-mesh.org/attachments/download/152/vde2-2.3.2_colour.patch).
Did you use this one? It was at the very bottom (attachments section)
Ciao Antonio,
Indeed, I've used the patch that's located at the bottom of the page. As said, I've used that patch version 2.3.2 (from the bottom of the page [1]) with the source code from [2].
When using those two together, patching does not work. But, after digging into the patch itself, I've removed the bottom of it (look below):
diff -urp vde2-2.3.2-orig/src/vde_switch/port.h vde2-2.3.2/src/vde_switch/port.h --- vde2-2.3.2-orig/src/vde_switch/port.h 2011-11-23 17:41:17.000000000 +0100 +++ vde2-2.3.2/src/vde_switch/port.h 2012-01-11 09:57:54.080058808 +0100 @@ -68,6 +68,7 @@ int portflag(int op, int f); #define P_CLRFLAG 3
#define HUB_TAG 0x1 +#define COLOURFUL_TAG 0x2
void port_init(int numports);
After removing the content relative to patching port.h, then patching port.c works ok! (I have not patched port.h: since it's only a line that needs to be included, I did it manually).
So I think that doing a patch for each file (one for port.h and a different one for port.c) will work.
Thanks in any case for your feedback!
Regards!
Lucas
[1] - http://www.open-mesh.org/attachments/download/152/vde2-2.3.2_colour.patch [2] - http://sourceforge.net/projects/vde/files/vde2/2.3.2/
A long time ago, I updated the patch to vde-2.3.2, and fortunately still have it lying around...
Good luck!
// Martin
On 2014-11-24 19:18, Lucas Aimaretto wrote:
Hi all,
I'm trying to patch VDE just as suggested in [1] but I'm having trouble. I've downloaded VDE 2.3.2 from here [2] and the patches from here [1].
I'm doing the following:
lucas@test:~/batman-adv/ script/vde$ tar zxvf vde2-2.3.2.tar.gz lucas@test:~/batman-adv/script/vde$ patch vde2-2.3.2/src/vde_switch/port.c < vde2-2.3.2_colour.patch patching file vde2-2.3.2/src/vde_switch/port.c patching file vde2-2.3.2/src/vde_switch/port.c Hunk #1 FAILED at 68. 1 out of 1 hunk FAILED -- saving rejects to file vde2-2.3.2/src/vde_switch/port.c.rej
What is it that I'm doing wrong?
Any hint is appreciated ...
Regards!
Lucas
[1] - http://www.open-mesh.org/projects/open-mesh/wiki/Emulation [2] - http://sourceforge.net/projects/vde/files/vde2/2.3.2/
b.a.t.m.a.n@lists.open-mesh.org