Skip to contentSkip to conversation

inetutils: fix compile error when PATH_PROCNET_DEV is undefined

PATCH Superseded Eric Bénard 3 participants 5 messages Dec 18, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 inetutils: fix compile error when PATH_PROCNET_DEV is undefined

patch taken from :
http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/inetutils-1.9-PATH_PROCNET_DEV.patch

---
 .../inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch   | 14 ++++++++++++++
 .../recipes-connectivity/inetutils/inetutils_1.9.1.bb      |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch
meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch new file +14 -0
new file mode 100644
index 0000000..54733be
@@ -0,0 +1,14 @@
+diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c
+--- inetutils-1.9.orig/ifconfig/system/linux.c	2012-01-04 16:31:36.000000000 -0500
++++ inetutils-1.9/ifconfig/system/linux.c	2012-01-04 16:40:53.000000000 -0500
+@@ -49,6 +49,10 @@
+ #include "../ifconfig.h"
+ 
+ 
++#ifndef PATH_PROCNET_DEV
++  #define PATH_PROCNET_DEV "/proc/net/dev"
++#endif
++
+ /* ARPHRD stuff.  */
+ 
+ static void
meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb +1 -0
index d12ad39..97fc6a1 100644
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
            file://rsh.xinetd.inetutils \
            file://telnet.xinetd.inetutils \
            file://tftpd.xinetd.inetutils \
+           file://inetutils-1.9-PATH_PROCNET_DEV.patch \
 "
 
 SRC_URI[md5sum] = "944f7196a2b3dba2d400e9088576000c"
Signature · 1 line
1.8.5.1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Eric Bénard schreef op 18-12-13 16:20:

Quoted 2 lines

patch taken from :
http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/inetutils-1.9-PATH_PROCNET_DEV.patch

Put

Quoted 1 line

that in the patch itself please and also add an Upstream-Status tag.

Quoted 12 lines

.../inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch | 14
++++++++++++++ .../recipes-connectivity/inetutils/inetutils_1.9.1.bb
| 1 + 2 files changed, 15 insertions(+) create mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch

diff --git
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch

new file mode 100644

Quoted 4 lines

index 0000000..54733be --- /dev/null +++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch

@@ -0,0 +1,14 @@

Quoted 17 lines

+diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c +---
inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000
-0500 ++++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04
16:40:53.000000000 -0500 +@@ -49,6 +49,10 @@ + #include "../ifconfig.h" +
+ ++#ifndef PATH_PROCNET_DEV ++ #define PATH_PROCNET_DEV "/proc/net/dev" ++#endif ++ + /* ARPHRD stuff. */ + + static void diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb index d12ad39..97fc6a1 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb @@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ file://rsh.xinetd.inetutils \ file://telnet.xinetd.inetutils \
file://tftpd.xinetd.inetutils \ + file://inetutils-1.9-PATH_PROCNET_DEV.patch \ "

Quoted 2 lines

SRC_URI[md5sum] = "944f7196a2b3dba2d400e9088576000c"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSscBEMkyGM64RGpERAjjTAJ49RWAG1QHY+6fBcrK/NrxvnfYT8ACbBn1O W8nFexfgdpBRidfeDadBvrU=
=meB2
-----END PGP SIGNATURE-----

#3 lore raw

Op 18 dec. 2013, om 17:36 heeft Eric Bénard <[email protected]> het volgende geschreven:

Quoted 8 lines

Hi Koen,

Quoted 4 lines · Koen Kooi

Eric Bénard schreef op 18-12-13 16:20:

Quoted 2 lines

patch taken from :
http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/inetutils-1.9-PATH_PROCNET_DEV.patch

Quoted 6 lines
Quoted 4 lines

Put

Quoted 1 line

that in the patch itself please and also add an Upstream-Status tag.

I don't know which status to put there as it's not upstream : which one is appropriate ?

I put in "Unknown" in that case, but that's not a valid option for OE-core recipes.

#4 lore raw
Quoted 8 lines · On Wednesday 18 December 2013 17:37:24 Koen Kooi wrote:

Op 18 dec. 2013, om 17:36 heeft Eric Bénard <[email protected]> het volgende geschreven:

Quoted 6 lines
Quoted 4 lines · Koen Kooi

Eric Bénard schreef op 18-12-13 16:20:

Quoted 3 lines

patch taken from :
http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ine
tutils-1.9-PATH_PROCNET_DEV.patch>>

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Put that in the patch itself please and also add an Upstream-Status tag.

I don't know which status to put there as it's not upstream : which one is appropriate ?

I put in "Unknown" in that case, but that's not a valid option for OE-core recipes.

The valid list, as agreed by the TSC some time ago, is part of the document we have here:

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre