diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:46 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:06 +0200 |
commit | 9f2dd8c0ae46507989f4cb8f24edc87ed91bebac (patch) | |
tree | 27e05485570bde22e2b770971c34b7fc0e5d44b7 | |
parent | 46acf9d3b53f45faedf4991bb8320f89d589157a (diff) | |
download | meta-openembedded-9f2dd8c0ae46507989f4cb8f24edc87ed91bebac.tar.gz |
net-snmp: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r-- | meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb | 17 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service (renamed from meta-oe/recipes-extended/net-snmp/files/snmpd.service) | 0 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service (renamed from meta-oe/recipes-extended/net-snmp/files/snmptrapd.service) | 0 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch (renamed from meta-oe/recipes-extended/net-snmp/files/systemd-support.patch) | 0 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend | 19 |
5 files changed, 21 insertions, 15 deletions
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 83df80acd..f1e42b514 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 | |||
@@ -1,28 +1,18 @@ | |||
1 | require net-snmp.inc | 1 | require net-snmp.inc |
2 | inherit systemd | ||
3 | 2 | ||
4 | PR = "${INC_PR}.3" | 3 | PR = "${INC_PR}.4" |
5 | LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e" | 4 | LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e" |
6 | 5 | ||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ |
8 | file://sync-with-5.7-branch.patch \ | 7 | file://sync-with-5.7-branch.patch \ |
9 | file://libnl-3-support.patch \ | 8 | file://libnl-3-support.patch \ |
10 | file://systemd-support.patch \ | ||
11 | file://snmpd.service \ | ||
12 | file://snmptrapd.service \ | ||
13 | file://init \ | 9 | file://init \ |
14 | file://snmpd.conf \ | 10 | file://snmpd.conf \ |
15 | file://snmptrapd.conf" | 11 | file://snmptrapd.conf" |
16 | 12 | ||
17 | EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no --with-systemd " | 13 | EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" |
18 | EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" | 14 | EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" |
19 | 15 | ||
20 | SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ | ||
21 | ${PN}-server-snmptrapd-systemd" | ||
22 | |||
23 | SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service" | ||
24 | SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd = "snmptrapd.service" | ||
25 | |||
26 | do_configure_prepend() { | 16 | do_configure_prepend() { |
27 | gnu-configize -f | 17 | gnu-configize -f |
28 | # We better change sources and re-autoconf here, but | 18 | # We better change sources and re-autoconf here, but |
@@ -37,6 +27,3 @@ CCACHE = "" | |||
37 | 27 | ||
38 | SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b" | 28 | SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b" |
39 | SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f" | 29 | SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f" |
40 | |||
41 | RDEPENDS_${PN}-server-snmpd-systemd = "${PN}-server-snmpd" | ||
42 | RDEPENDS_${PN}-server-snmptrapd-systemd = "${PN}-server-snmptrapd" | ||
diff --git a/meta-oe/recipes-extended/net-snmp/files/snmpd.service b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service index 10a1eb212..10a1eb212 100644 --- a/meta-oe/recipes-extended/net-snmp/files/snmpd.service +++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service | |||
diff --git a/meta-oe/recipes-extended/net-snmp/files/snmptrapd.service b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service index 951f9f270..951f9f270 100644 --- a/meta-oe/recipes-extended/net-snmp/files/snmptrapd.service +++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service | |||
diff --git a/meta-oe/recipes-extended/net-snmp/files/systemd-support.patch b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch index 18955f29e..18955f29e 100644 --- a/meta-oe/recipes-extended/net-snmp/files/systemd-support.patch +++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch | |||
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 new file mode 100644 index 000000000..f221c1d7d --- /dev/null +++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend | |||
@@ -0,0 +1,19 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 1}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += " \ | ||
8 | file://systemd-support.patch \ | ||
9 | file://snmpd.service \ | ||
10 | file://snmptrapd.service \ | ||
11 | " | ||
12 | |||
13 | EXTRA_OECONF += "--with-systemd" | ||
14 | |||
15 | SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ | ||
16 | ${PN}-server-snmptrapd-systemd" | ||
17 | |||
18 | SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service" | ||
19 | SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd = "snmptrapd.service" | ||