diff options
Diffstat (limited to 'meta-oe/recipes-extended/net-snmp')
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp.inc | 56 | ||||
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb | 12 |
2 files changed, 34 insertions, 34 deletions
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp.inc b/meta-oe/recipes-extended/net-snmp/net-snmp.inc index e369ccf03c..5a6ec9f16a 100644 --- a/meta-oe/recipes-extended/net-snmp/net-snmp.inc +++ b/meta-oe/recipes-extended/net-snmp/net-snmp.inc @@ -19,26 +19,26 @@ EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" do_install () { - oe_runmake install + oe_runmake install } do_install_append() { - install -d ${D}${sysconfdir}/snmp - install -d ${D}${sysconfdir}/init.d - 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/ - install -d ${STAGING_BINDIR} - install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/ - sed -e "s@-I/usr/include@@g" \ - -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 ${STAGING_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 + install -d ${D}${sysconfdir}/snmp + install -d ${D}${sysconfdir}/init.d + 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/ + install -d ${STAGING_BINDIR} + install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/ + sed -e "s@-I/usr/include@@g" \ + -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 ${STAGING_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 } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \ @@ -48,13 +48,13 @@ ALLOW_EMPTY_${PN}-server = "1" FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" FILES_${PN}-mibs = "${datadir}/snmp/mibs" FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ - ${sysconfdir}/snmp/snmpd.conf \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/snmpd.service \ + ${sysconfdir}/snmp/snmpd.conf \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/snmpd.service \ " FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ - ${sysconfdir}/snmp/snmptrapd.conf \ - ${systemd_unitdir}/system/snmptrapd.service \ + ${sysconfdir}/snmp/snmptrapd.conf \ + ${systemd_unitdir}/system/snmptrapd.service \ " FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" @@ -86,10 +86,10 @@ RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" pkg_postrm_${PN}-server() { - if test "x$D" != "x"; then - OPT="-r $D " - else - OPT="" - /etc/init.d/snmpd stop - fi + if test "x$D" != "x"; then + OPT="-r $D " + else + OPT="" + /etc/init.d/snmpd stop + fi } diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb index 74d006c099..14c1036018 100644 --- a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb +++ b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb @@ -18,12 +18,12 @@ EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" do_configure_prepend() { - gnu-configize -f - # We better change sources and re-autoconf here, but - # required autoconf is too new for us. - sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ - -e 's/tail -1/tail -n 1/g' \ - -i configure + gnu-configize -f + # We better change sources and re-autoconf here, but + # required autoconf is too new for us. + sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ + -e 's/tail -1/tail -n 1/g' \ + -i configure } PARALLEL_MAKE = "" |