net-snmp: move systemd support from meta-systemd back to meta-oe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

6 files changed, 35 insertions, 37 deletions

diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp.inc b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
index 11b81ad15f..e369ccf03c 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp.inc
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
@@ -9,9 +9,9 @@ RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
 RDEPENDS_${PN}-client += "net-snmp-mibs"
 RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
 RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
-INC_PR = "r3"
+INC_PR = "r6"
 
-inherit autotools update-rc.d siteinfo
+inherit autotools update-rc.d siteinfo systemd
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
@@ -36,6 +36,9 @@ do_install_append() {
                 -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 \
@@ -44,8 +47,15 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-lib
 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"
-FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd ${sysconfdir}/snmp/snmptrapd.conf"
+FILES_${PN}-server-snmpd = "${sbindir}/snmpd \
+  ${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 \
+"
 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"
@@ -57,6 +67,22 @@ INITSCRIPT_PACKAGES = "${PN}-server"
 INITSCRIPT_NAME_${PN}-server = "snmpd"
 INITSCRIPT_PARAMS_${PN}-server = "defaults"
 
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}"
+
+SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
+                    ${PN}-server-snmptrapd-systemd"
+
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+
 LEAD_SONAME = "libnetsnmp.so"
 
 pkg_postrm_${PN}-server() {
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service b/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
index 10a1eb2128..10a1eb2128 100644
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service b/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
index 951f9f2707..951f9f2707 100644
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch b/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
index 18955f29ee..18955f29ee 100644
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
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 f1e42b5149..74d006c099 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
@@ -8,7 +8,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
         file://libnl-3-support.patch \
         file://init \
         file://snmpd.conf \
-        file://snmptrapd.conf"
+        file://snmptrapd.conf \
+        file://systemd-support.patch \
+        file://snmpd.service \
+        file://snmptrapd.service \
+"
 
 EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
deleted file mode 100644
index c3538b3c64..0000000000
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += " \
-        file://systemd-support.patch \
-        file://snmpd.service \
-        file://snmptrapd.service \
-"
-do_install_append() {
-        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
-}
-
-EXTRA_OECONF += "--with-systemd"
-
-SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
-                    ${PN}-server-snmptrapd-systemd"
-
-SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
-RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
-FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"