diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-18 18:53:48 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-22 15:56:28 +0200 |
commit | 289217bbc3c5c53f486ab5615a6d6196e3c12cf2 (patch) | |
tree | f9551306e700a0ba0218177f3ec417f76d1f5759 /meta-oe/recipes-connectivity/zabbix | |
parent | f2bec07b87b3f1118aa1d1f194d230920f1afe01 (diff) | |
download | meta-openembedded-289217bbc3c5c53f486ab5615a6d6196e3c12cf2.tar.gz |
meta-oe: fix indentation
* remove tabs which sneaked in since last cleanup
* meta-oe layers are using consistent indentation with 4 spaces, see
http://www.openembedded.org/wiki/Styleguide
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity/zabbix')
-rw-r--r-- | meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb index 03bad313c..8b9c4b844 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb | |||
@@ -24,8 +24,9 @@ DEPENDS = "openldap virtual/libiconv" | |||
24 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 24 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
25 | 25 | ||
26 | SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ | 26 | SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ |
27 | file://0001-Fix-configure.ac.patch \ | 27 | file://0001-Fix-configure.ac.patch \ |
28 | file://zabbix-agent.service" | 28 | file://zabbix-agent.service \ |
29 | " | ||
29 | 30 | ||
30 | SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78" | 31 | SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78" |
31 | SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da" | 32 | SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da" |
@@ -39,20 +40,22 @@ SYSTEMD_AUTO_ENABLE = "enable" | |||
39 | USERADD_PACKAGES = "${PN}" | 40 | USERADD_PACKAGES = "${PN}" |
40 | GROUPADD_PARAM_${PN} = "-r zabbix" | 41 | GROUPADD_PARAM_${PN} = "-r zabbix" |
41 | USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ | 42 | USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ |
42 | -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix" | 43 | -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ |
44 | " | ||
43 | 45 | ||
44 | KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" | 46 | KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" |
45 | 47 | ||
46 | EXTRA_OECONF = '--enable-dependency-tracking \ | 48 | EXTRA_OECONF = " \ |
47 | --enable-agent \ | 49 | --enable-dependency-tracking \ |
48 | --enable-ipv6 \ | 50 | --enable-agent \ |
49 | --with-net-snmp \ | 51 | --enable-ipv6 \ |
50 | --with-ldap=${STAGING_EXECPREFIXDIR} \ | 52 | --with-net-snmp \ |
51 | --with-jabber \ | 53 | --with-ldap=${STAGING_EXECPREFIXDIR} \ |
52 | --with-unixodbc \ | 54 | --with-jabber \ |
53 | --with-ssh2 \ | 55 | --with-unixodbc \ |
54 | --with-sqlite3 \ | 56 | --with-ssh2 \ |
55 | ' | 57 | --with-sqlite3 \ |
58 | " | ||
56 | CFLAGS_append = " -lldap -llber" | 59 | CFLAGS_append = " -lldap -llber" |
57 | 60 | ||
58 | do_configure_prepend() { | 61 | do_configure_prepend() { |
@@ -62,7 +65,7 @@ do_configure_prepend() { | |||
62 | do_install_append() { | 65 | do_install_append() { |
63 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 66 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
64 | install -d ${D}${systemd_unitdir}/system | 67 | install -d ${D}${systemd_unitdir}/system |
65 | install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ | 68 | install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ |
66 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service | 69 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service |
67 | fi | 70 | fi |
68 | } | 71 | } |