aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Enache <catalin.enache@windriver.com>2016-03-30 12:08:21 +0300
committerDaniel McGregor <daniel.mcgregor@vecima.com>2016-04-26 13:28:15 -0600
commite50c71186aa93e1338ae0dcfa3ee29938b4f3144 (patch)
tree0fc7c84074c0ee0884e059fdb5d68383df703691
parent80812641bf73d2a74a8e7fd29572d4cef6f0bd94 (diff)
downloadmeta-openembedded-contrib-e50c71186aa93e1338ae0dcfa3ee29938b4f3144.tar.gz
meta-openembedded-contrib-e50c71186aa93e1338ae0dcfa3ee29938b4f3144.tar.bz2
meta-openembedded-contrib-e50c71186aa93e1338ae0dcfa3ee29938b4f3144.zip
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 <catalin.enache@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb10
1 files 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 e8df06c84a..eb800ff9a4 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
}