Skip to contentSkip to conversation

multilib fixes for some networking recipes

PATCH Superseded Aws Ismail 2 participants 7 messages Feb 11, 2013 – Feb 14, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Aws Ismail

author
#0 lore raw

cover multilib fixes for some networking recipes

Aws Ismail (3):
traceroute: resolve multilib issues
netcat-openbsd: resolve multilib issues.
accel-ppp: resolve QA warnings and satisfy multilib

 .../recipes-protocols/accel-ppp/accel-ppp_git.bb   |    7 +++++++
 .../recipes-support/netcat/netcat-openbsd_1.89.bb  |    6 +++---
 .../traceroute/traceroute_2.0.18.bb                |    8 +++++---
 3 files changed, 15 insertions(+), 6 deletions(-)
author
#1 lore raw

PATCH 1/3 traceroute: resolve multilib issues

Make recipe changes to enable successfull building when multilib is being used.

---
 .../traceroute/traceroute_2.0.18.bb                |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +5 -3
index 6eca731..f5f96b2 100644
@@ -11,6 +11,8 @@ LICENSE = "GPL-2.0 LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 
+PR = "r1"
+
 inherit update-alternatives
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
@@ -26,13 +28,13 @@ do_compile() {
 
 do_install() {
     install -d ${D}${bindir}
-    install -m755 ${PN}/${PN} ${D}${bindir}
+    install -m755 ${BPN}/${BPN} ${D}${bindir}
 
     install -m755 wrappers/tcptraceroute ${D}${bindir}
 
     install -d ${D}${mandir}
-    install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
-    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
+    install -p -m644 ${BPN}/${BPN}.8 ${D}${mandir}
+    ln -s ${PN}.8 ${D}${mandir}/${BPN}6.8
     ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8
 
 }
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [meta-networking][PATCH 1/3] traceroute: resolve multilib issues

Quoted 26 lines · [[meta-networking][PATCH 1/3] traceroute: resolve multilib issues] On…

Make recipe changes to enable successfull building when multilib is being used.

---
 .../traceroute/traceroute_2.0.18.bb                |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +2 -1
index 6eca731..f5f96b2 100644
@@ -11,6 +11,8 @@ LICENSE = "GPL-2.0 LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 
+PR = "r1"
+
 inherit update-alternatives
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
@@ -26,13 +28,13 @@ do_compile() {
 
 do_install() {
     install -d ${D}${bindir}
-    install -m755 ${PN}/${PN} ${D}${bindir}

meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb do_compile() { · line 38

Quoted 10 lines
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +3 -2
+    install -m755 ${BPN}/${BPN} ${D}${bindir}
 
     install -m755 wrappers/tcptraceroute ${D}${bindir}
 
     install -d ${D}${mandir}
-    install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
-    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
+    install -p -m644 ${BPN}/${BPN}.8 ${D}${mandir}
+    ln -s ${PN}.8 ${D}${mandir}/${BPN}6.8
     ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8

Are the targets actually installed as ${PN}.8 and not ${BPN}.8 in a multilib build scenario? What I'm asking is should the above be changed to this instead:

    ln -s ${BPN}.8 ${D}${mandir}/${BPN}6.8
    ln -s ${BPN}.8 ${D}${mandir}/tcptraceroute.8
Signature · 2 lines
-Joe MacDonald.
:wq
author
#3 lore raw

Re: [meta-networking][PATCH 1/3] traceroute: resolve multilib issues

Quoted 42 lines · Joe MacDonald
Quoted 26 lines · [[meta-networking][PATCH 1/3] traceroute: resolve multilib issues] On…

Make recipe changes to enable successfull building when multilib is being used.

---
  .../traceroute/traceroute_2.0.18.bb                |    8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +2 -1
index 6eca731..f5f96b2 100644
@@ -11,6 +11,8 @@ LICENSE = "GPL-2.0 LGPL-2.1"
  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                      file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 
+PR = "r1"
+
  inherit update-alternatives
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
@@ -26,13 +28,13 @@ do_compile() {
 
  do_install() {
      install -d ${D}${bindir}
-    install -m755 ${PN}/${PN} ${D}${bindir}

meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb do_compile() { · line 38

Quoted 10 lines
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +3 -2
+    install -m755 ${BPN}/${BPN} ${D}${bindir}
 
      install -m755 wrappers/tcptraceroute ${D}${bindir}
 
      install -d ${D}${mandir}
-    install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
-    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
+    install -p -m644 ${BPN}/${BPN}.8 ${D}${mandir}
+    ln -s ${PN}.8 ${D}${mandir}/${BPN}6.8
      ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8

Are the targets actually installed as ${PN}.8 and not ${BPN}.8 in a multilib build scenario? What I'm asking is should the above be changed to this instead:

Quoted 3 lines
     ln -s ${BPN}.8 ${D}${mandir}/${BPN}6.8
     ln -s ${BPN}.8 ${D}${mandir}/tcptraceroute.8

I think you're right. It should be like that but the odd thing is that even with ln -s ${PN}.8 no errors were seen.

Aws\

#4 lore raw

Re: [meta-networking][PATCH 1/3] traceroute: resolve multilib issues

Quoted 38 lines · [Re: [meta-networking][PATCH 1/3] traceroute: resolve multilib issues] On…
Quoted 37 lines · Joe MacDonald
Quoted 21 lines · [[meta-networking][PATCH 1/3] traceroute: resolve multilib issues] On…

Make recipe changes to enable successfull building when multilib is being used.

---
 .../traceroute/traceroute_2.0.18.bb                |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +2 -0
index 6eca731..f5f96b2 100644
@@ -11,6 +11,8 @@ LICENSE = "GPL-2.0 LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
+PR = "r1"
+
 inherit update-alternatives
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
@@ -26,13 +28,13 @@ do_compile() {
 do_install() {

meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb do_compile() { · line 35

Quoted 10 lines
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +3 -3
     install -d ${D}${bindir}
-    install -m755 ${PN}/${PN} ${D}${bindir}
+    install -m755 ${BPN}/${BPN} ${D}${bindir}
     install -m755 wrappers/tcptraceroute ${D}${bindir}
     install -d ${D}${mandir}
-    install -p -m644 ${PN}/${PN}.8 ${D}${mandir}
-    ln -s ${PN}.8 ${D}${mandir}/${PN}6.8
+    install -p -m644 ${BPN}/${BPN}.8 ${D}${mandir}
+    ln -s ${PN}.8 ${D}${mandir}/${BPN}6.8
     ln -s ${PN}.8 ${D}${mandir}/tcptraceroute.8

Are the targets actually installed as ${PN}.8 and not ${BPN}.8 in a multilib build scenario? What I'm asking is should the above be changed to this instead:

Quoted 6 lines
Quoted 3 lines
    ln -s ${BPN}.8 ${D}${mandir}/${BPN}6.8
    ln -s ${BPN}.8 ${D}${mandir}/tcptraceroute.8

I think you're right. It should be like that but the odd thing is that even with ln -s ${PN}.8 no errors were seen.

Weird. But okay.

So, so long as the BPN version is doing the right thing -- meaning it's actually creating a proper link and not a broken link, because ln is pretty happy to do whatever you tell it even if it doesn't make sense -- can you send out a revised patch set?

Signature · 2 lines
-Joe MacDonald.
:wq
author
#5 lore raw

PATCH 2/3 netcat-openbsd: resolve multilib issues.

In reply to Aws Ismail

Make recipe changes to enable successfull building when multilib is being used.

---
 .../recipes-support/netcat/netcat-openbsd_1.89.bb  |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb +3 -3
index 25cbfa6..00eec3e 100644
@@ -2,7 +2,7 @@ require netcat.inc
 DESCRIPTION = "OpenBSD Netcat"
 HOMEPAGE = "http://ftp.debian.org"
 LICENSE = "BSD-3-Clause"
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "glib-2.0"
 
@@ -14,7 +14,7 @@ SRC_URI[netcat.sha256sum] = "72e844dde8a2a7cba61971d493758dbea9ef0b164bccef15fd4
 SRC_URI[netcat-patch.md5sum] = "00c65aa22243b76998174c733cbb64cc"
 SRC_URI[netcat-patch.sha256sum] = "d5b6b2bd9788114bdcfbb71acad0263720b4fdc41529e287adf451b8610f84f1"
 
-S = "${WORKDIR}/${PN}-${PV}.orig"
+S = "${WORKDIR}/${BPN}-${PV}.orig"
 
 do_configure[noexec] = "1"
 
@@ -27,6 +27,6 @@ do_compile() {
 
 do_install() {
         install -d ${D}${bindir}
-        install -m 755 ${S}/nc ${D}${bindir}/nc.${PN}
+        install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN}
 }
 ALTERNATIVE_PRIORITY = "50"
Signature · 1 line
1.7.0.4
author
#6 lore raw

PATCH 3/3 accel-ppp: resolve QA warnings and satisfy multilib

In reply to Aws Ismail

Create -libs and -dbg splits to include .so and .debug files, respectively to resolve the QA warning:
lib64-accel-ppp rdepends on lib64-accel-ppp-dev when multilib is being used.

---
 .../recipes-protocols/accel-ppp/accel-ppp_git.bb   |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb +7 -0
index 9eb9bf8..d17cc78 100644
@@ -8,6 +8,7 @@ DEPENDS = "openssl libpcre"
 
 inherit cmake
 
+PR = "r1"
 PV = "1.7.3+git"
 
 SRCREV = "4acfa46c321a344b9a6ce4128e72d1e02828d8a0"
@@ -23,3 +24,9 @@ EXTRA_OECMAKE = " \
                  -DRADIUS=FALSE \
                  -DNETSNMP=FALSE \
                 "
+FILES_${PN}-dbg += "/usr/lib/${BPN}/.debug/*"
+
+PACKAGES =+ "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so"
+INSANE_SKIP_${PN}-libs = "dev-so"
+RDEPENDS_${PN} += "${PN}-libs"
Signature · 1 line
1.7.0.4