aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorMario Domenech Goulart <mario@ossystems.com.br>2012-04-24 14:20:44 -0300
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-25 13:58:56 +0200
commit882c385d25385e73e22bdad4555e5af40a1c218c (patch)
treee711ca1f2e6ce469e3729a76ce659088d1fdfee0 /meta-oe/recipes-extended
parent8d4622566114d3ed97974234c53cf4d16a3dfb51 (diff)
downloadmeta-openembedded-882c385d25385e73e22bdad4555e5af40a1c218c.tar.gz
net-snmp: split net-snmp-server
net-snmp-server has been split into two packages: net-snmp-server-snmpd and net-snmp-server-snmptrapd net-snmp-server is now a "meta-package" which depends on net-snmp-server-snmpd and net-snmp-server-snmptrapd. net-snmpd-server-systemd in no longer generated. It has been split into net-snmp-server-snmpd-systemd and net-snmp-server-snmptrapd-systemd. Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r--meta-oe/recipes-extended/net-snmp/net-snmp.inc16
-rw-r--r--meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb10
2 files changed, 17 insertions, 9 deletions
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp.inc b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
index 1a51e75c01..40ee8b5169 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp.inc
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
@@ -3,11 +3,13 @@ HOMEPAGE = "http://www.net-snmp.org/"
LICENSE = "BSD"
DEPENDS = "openssl libnl"
-RDEPENDS_${PN}-server += "net-snmp-mibs"
+RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs"
+RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd"
+RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
RDEPENDS_${PN}-client += "net-snmp-mibs"
RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
-INC_PR = "r2"
+INC_PR = "r3"
inherit autotools update-rc.d siteinfo
@@ -37,17 +39,19 @@ do_install_append() {
}
PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-staticdev net-snmp-static net-snmp-libs \
- net-snmp-mibs net-snmp-server net-snmp-client"
+ net-snmp-mibs net-snmp-server net-snmp-client net-snmp-server-snmpd net-snmp-server-snmptrapd"
+ALLOW_EMPTY_${PN}-server = "1"
FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-mibs = "${datadir}/snmp/mibs"
-FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
+FILES_${PN}-server-snmpd = "${sbindir}/snmpd ${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/init.d"
+FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd ${sysconfdir}/snmp/snmptrapd.conf"
FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
FILES_${PN}-dev += "${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update"
-CONFFILES_${PN}-server = "${sysconfdir}/snmp/snmpd.conf \
- ${sysconfdir}/snmp/snmptrapd.conf"
+CONFFILES_${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf"
+CONFFILES_${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf"
INITSCRIPT_PACKAGES = "${PN}-server"
INITSCRIPT_NAME_${PN}-server = "snmpd"
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 b2a97867f5..83df80acd1 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
@@ -17,8 +17,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no --with-systemd "
EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
-SYSTEMD_PACKAGES = "${PN}-server-systemd"
-SYSTEMD_SERVICE_${PN}-server-systemd = "snmpd.service snmptrapd.service"
+SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
+ ${PN}-server-snmptrapd-systemd"
+
+SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd = "snmptrapd.service"
do_configure_prepend() {
gnu-configize -f
@@ -35,4 +38,5 @@ CCACHE = ""
SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b"
SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f"
-RDEPENDS_${PN}-server-systemd = "${PN}-server"
+RDEPENDS_${PN}-server-snmpd-systemd = "${PN}-server-snmpd"
+RDEPENDS_${PN}-server-snmptrapd-systemd = "${PN}-server-snmptrapd"