From 31684cb3119a4bc5db679066ecff6891ea317686 Mon Sep 17 00:00:00 2001 From: Catalin Enache Date: Wed, 30 Mar 2016 12:08:21 +0300 Subject: net-snmp: fix invalid paths in target net-snmp-config Only net-snmp-config used for sysroot should have sysroot specific paths. Signed-off-by: Catalin Enache Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald Signed-off-by: Armin Kuster --- 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 06f3707009..5ea51b803f 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 @@ -105,6 +100,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 } -- cgit 1.2.3-korg