[PATCH] net-snmp: fix invalid paths in target net-snmp-config

[PATCH] net-snmp: fix invalid paths in target net-snmp-config

[Ovidiu Panait]

Remove build host paths form target net-snmp-config.

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index af6fd1b..9401c7e 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -116,6 +116,10 @@ do_install_append() {
     sed    -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \
         -i ${D}${bindir}/net-snmp-create-v3-user
     sed    -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \
+           -e "s@${STAGING_DIR_NATIVE}[=]*@@g" \
+           -e "s@${STAGING_DIR_HOST}[=]*@@g" \
+           -e "s@${WORKDIR}[=]*@@g" \
+           -e "s@${D}@@g" \
         -i ${D}${bindir}/net-snmp-config
 
     if [ "${HAS_PERL}" = "1" ]; then
-- 
2.10.2

Re: [PATCH] net-snmp: fix invalid paths in target net-snmp-config

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2575 bytes --]

On Wed, Mar 30, 2016 at 12:08:21PM +0300, Catalin Enache wrote:
> Only net-snmp-config used for sysroot should have sysroot
> specific paths.
> 
> Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
> ---
>  meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
> index 63e0fc7..1a50932 100644
> --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
> +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
> @@ -70,11 +70,6 @@ do_install_append() {
>      install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
>      install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
>      install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
> -    sed    -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
> -        -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
> -        -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
> -        -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
> -        -i ${D}${bindir}/net-snmp-config

What about target ${bindir}/net-snmp-config? Isn't it installed in some
net-snmp-dev package with incorrect paths?

>      install -d ${D}${systemd_unitdir}/system
>      install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
>      install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
> @@ -109,6 +104,11 @@ net_snmp_sysroot_preprocess () {
>          install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
>          install -m 755 ${D}${bindir}/net-snmp-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
>          sed -e "s@-I/usr/include@-I${STAGING_INCDIR}@g" \
> +            -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}${prefix}@g" \
> +            -e "s@^exec_prefix=.*@exec_prefix=${STAGING_EXECPREFIXDIR}@g" \
> +            -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
> +            -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
> +            -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \
>            -i  ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config
>      fi
>  }
> -- 
> 2.7.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

[PATCH] net-snmp: fix invalid paths in target net-snmp-config

[Catalin Enache]

Only net-snmp-config used for sysroot should have sysroot
specific paths.

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index 63e0fc7..1a50932 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -70,11 +70,6 @@ do_install_append() {
     install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
     install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
     install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-    sed    -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
-        -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
-        -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
-        -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
-        -i ${D}${bindir}/net-snmp-config
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
@@ -109,6 +104,11 @@ net_snmp_sysroot_preprocess () {
         install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
         install -m 755 ${D}${bindir}/net-snmp-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
         sed -e "s@-I/usr/include@-I${STAGING_INCDIR}@g" \
+            -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}${prefix}@g" \
+            -e "s@^exec_prefix=.*@exec_prefix=${STAGING_EXECPREFIXDIR}@g" \
+            -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
+            -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
+            -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \
           -i  ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config
     fi
 }
-- 
2.7.4