diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:38:19 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:04 +0200 |
commit | ca1f7c0399905206be0bc5f36fc0c881b915e4f0 (patch) | |
tree | 78b2f2ed5eef102fb61c478e9b89983f24a003dc | |
parent | 05c8eb4393f77314246b41b0465305f95e979df0 (diff) | |
download | meta-openembedded-ca1f7c0399905206be0bc5f36fc0c881b915e4f0.tar.gz |
net-snmp: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp.inc | 34 | ||||
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service (renamed from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service (renamed from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch (renamed from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb | 6 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend | 32 |
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 11b81ad15..e369ccf03 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" | |||
9 | RDEPENDS_${PN}-client += "net-snmp-mibs" | 9 | RDEPENDS_${PN}-client += "net-snmp-mibs" |
10 | RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" | 10 | RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" |
11 | RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" | 11 | RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" |
12 | INC_PR = "r3" | 12 | INC_PR = "r6" |
13 | 13 | ||
14 | inherit autotools update-rc.d siteinfo | 14 | inherit autotools update-rc.d siteinfo systemd |
15 | 15 | ||
16 | TARGET_CC_ARCH += "${LDFLAGS}" | 16 | TARGET_CC_ARCH += "${LDFLAGS}" |
17 | 17 | ||
@@ -36,6 +36,9 @@ do_install_append() { | |||
36 | -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ | 36 | -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ |
37 | -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ | 37 | -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ |
38 | -i ${STAGING_BINDIR}/net-snmp-config | 38 | -i ${STAGING_BINDIR}/net-snmp-config |
39 | install -d ${D}${systemd_unitdir}/system | ||
40 | install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system | ||
41 | install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system | ||
39 | } | 42 | } |
40 | 43 | ||
41 | PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \ | 44 | 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 | |||
44 | ALLOW_EMPTY_${PN}-server = "1" | 47 | ALLOW_EMPTY_${PN}-server = "1" |
45 | FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" | 48 | FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" |
46 | FILES_${PN}-mibs = "${datadir}/snmp/mibs" | 49 | FILES_${PN}-mibs = "${datadir}/snmp/mibs" |
47 | FILES_${PN}-server-snmpd = "${sbindir}/snmpd ${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/init.d" | 50 | FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ |
48 | FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd ${sysconfdir}/snmp/snmptrapd.conf" | 51 | ${sysconfdir}/snmp/snmpd.conf \ |
52 | ${sysconfdir}/init.d \ | ||
53 | ${systemd_unitdir}/system/snmpd.service \ | ||
54 | " | ||
55 | FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ | ||
56 | ${sysconfdir}/snmp/snmptrapd.conf \ | ||
57 | ${systemd_unitdir}/system/snmptrapd.service \ | ||
58 | " | ||
49 | FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" | 59 | FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" |
50 | FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" | 60 | FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" |
51 | FILES_${PN}-dev += "${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update" | 61 | FILES_${PN}-dev += "${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update" |
@@ -57,6 +67,22 @@ INITSCRIPT_PACKAGES = "${PN}-server" | |||
57 | INITSCRIPT_NAME_${PN}-server = "snmpd" | 67 | INITSCRIPT_NAME_${PN}-server = "snmpd" |
58 | INITSCRIPT_PARAMS_${PN}-server = "defaults" | 68 | INITSCRIPT_PARAMS_${PN}-server = "defaults" |
59 | 69 | ||
70 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" | ||
71 | |||
72 | SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ | ||
73 | ${PN}-server-snmptrapd-systemd" | ||
74 | |||
75 | SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" | ||
76 | SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" | ||
77 | |||
78 | RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
79 | RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
80 | RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
81 | |||
82 | RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
83 | RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
84 | RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
85 | |||
60 | LEAD_SONAME = "libnetsnmp.so" | 86 | LEAD_SONAME = "libnetsnmp.so" |
61 | 87 | ||
62 | pkg_postrm_${PN}-server() { | 88 | 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 10a1eb212..10a1eb212 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 951f9f270..951f9f270 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 18955f29e..18955f29e 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 f1e42b514..74d006c09 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 \ | |||
8 | file://libnl-3-support.patch \ | 8 | file://libnl-3-support.patch \ |
9 | file://init \ | 9 | file://init \ |
10 | file://snmpd.conf \ | 10 | file://snmpd.conf \ |
11 | file://snmptrapd.conf" | 11 | file://snmptrapd.conf \ |
12 | file://systemd-support.patch \ | ||
13 | file://snmpd.service \ | ||
14 | file://snmptrapd.service \ | ||
15 | " | ||
12 | 16 | ||
13 | EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" | 17 | EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" |
14 | EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" | 18 | 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 c3538b3c6..000000000 --- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 2}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += " \ | ||
8 | file://systemd-support.patch \ | ||
9 | file://snmpd.service \ | ||
10 | file://snmptrapd.service \ | ||
11 | " | ||
12 | do_install_append() { | ||
13 | install -d ${D}${systemd_unitdir}/system | ||
14 | install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system | ||
15 | install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system | ||
16 | } | ||
17 | |||
18 | EXTRA_OECONF += "--with-systemd" | ||
19 | |||
20 | SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ | ||
21 | ${PN}-server-snmptrapd-systemd" | ||
22 | |||
23 | SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" | ||
24 | SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" | ||
25 | RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
26 | RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
27 | RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" | ||
28 | RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
29 | RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
30 | RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" | ||
31 | FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service" | ||
32 | FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service" | ||