summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-08-18 18:53:48 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-22 15:56:28 +0200
commit289217bbc3c5c53f486ab5615a6d6196e3c12cf2 (patch)
treef9551306e700a0ba0218177f3ec417f76d1f5759 /meta-oe/recipes-connectivity
parentf2bec07b87b3f1118aa1d1f194d230920f1afe01 (diff)
downloadmeta-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')
-rw-r--r--meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb5
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb2
-rw-r--r--meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb10
-rw-r--r--meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb40
-rw-r--r--meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb7
-rw-r--r--meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb18
-rw-r--r--meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb2
-rw-r--r--meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb31
-rw-r--r--meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb12
9 files changed, 66 insertions, 61 deletions
diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
index f789dfd2a..2de547a70 100644
--- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
+++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
@@ -24,8 +24,9 @@ EXTRA_OECONF = "--disable-smsd"
24 24
25FILES_${PN} = "${bindir} ${sbindir}" 25FILES_${PN} = "${bindir} ${sbindir}"
26FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ 26FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
27 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ 27 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
28 /lib/*.a /lib/*.o ${datadir}/aclocal" 28 /lib/*.a /lib/*.o ${datadir}/aclocal \
29"
29FILES_${PN}-dev = "" 30FILES_${PN}-dev = ""
30FILES_libgnokii = "${libdir}/libgnokii.so.*" 31FILES_libgnokii = "${libdir}/libgnokii.so.*"
31 32
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb
index 254b855f3..0939d17f9 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb
@@ -9,7 +9,7 @@ SRC_URI[md5sum] = "6aa15d83f5a35f1fd076ba9adc4e7285"
9SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" 9SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c"
10 10
11EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ 11EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
12 EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'" 12 EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
13 13
14do_install () { 14do_install () {
15 install -d ${D}/${bindir} 15 install -d ${D}/${bindir}
diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb
index 16e2a7dca..4bf238d28 100644
--- a/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb
+++ b/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb
@@ -25,11 +25,11 @@ PACKAGE_BEFORE_PN += "${PN}-server"
25FILES_${PN}-server = "${bindir}/mosh-server" 25FILES_${PN}-server = "${bindir}/mosh-server"
26 26
27NEEDED_PERL_MODULES = "\ 27NEEDED_PERL_MODULES = "\
28 perl-module-socket \ 28 perl-module-socket \
29 perl-module-getopt-long \ 29 perl-module-getopt-long \
30 perl-module-errno \ 30 perl-module-errno \
31 perl-module-io-socket-inet \ 31 perl-module-io-socket-inet \
32 perl-module-posix \ 32 perl-module-posix \
33" 33"
34 34
35# mosh uses SSH to authenticate and the client uses OpenSSH-specific features 35# mosh uses SSH to authenticate and the client uses OpenSSH-specific features
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
index 95adecdf9..b8a9d4a23 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
@@ -22,25 +22,25 @@ INITSCRIPT_PARAMS = "defaults"
22inherit update-rc.d 22inherit update-rc.d
23 23
24do_install () { 24do_install () {
25 25
26 install -d ${D}${bindir} 26 install -d ${D}${bindir}
27 install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" 27 install -m 755 ${S}/src/smsd "${D}${bindir}/smsd"
28 28
29 install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" 29 install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms"
30 install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" 30 install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html"
31 install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" 31 install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode"
32 install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" 32 install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms"
33 33
34 install -d ${D}${sysconfdir} 34 install -d ${D}${sysconfdir}
35 install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" 35 install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf"
36 36
37 install -d "${D}${localstatedir}/spool" 37 install -d "${D}${localstatedir}/spool"
38 install -d "${D}${localstatedir}/spool/sms" 38 install -d "${D}${localstatedir}/spool/sms"
39 install -d "${D}${localstatedir}/spool/sms/incoming" 39 install -d "${D}${localstatedir}/spool/sms/incoming"
40 install -d "${D}${localstatedir}/spool/sms/outgoing" 40 install -d "${D}${localstatedir}/spool/sms/outgoing"
41 install -d "${D}${localstatedir}/spool/sms/checked" 41 install -d "${D}${localstatedir}/spool/sms/checked"
42 42
43 install -d ${D}${sysconfdir}/init.d 43 install -d ${D}${sysconfdir}/init.d
44 install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" 44 install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}"
45 45
46} 46}
diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
index f13e7093c..c398dc15a 100644
--- a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
+++ b/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
@@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
11PR = "r5" 11PR = "r5"
12 12
13SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ 13SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
14 file://prefer_python_2.5.patch \ 14 file://prefer_python_2.5.patch \
15 file://doublefix.patch" 15 file://doublefix.patch \
16"
16 17
17SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" 18SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370"
18SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" 19SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878"
@@ -20,4 +21,4 @@ SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed
20inherit autotools pkgconfig pythonnative 21inherit autotools pkgconfig pythonnative
21 22
22FILES_${PN} += "${datadir}/telepathy \ 23FILES_${PN} += "${datadir}/telepathy \
23 ${datadir}/dbus-1" 24 ${datadir}/dbus-1"
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb
index 9ae68ddea..582783c9d 100644
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb
+++ b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb
@@ -23,15 +23,15 @@ PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman"
23PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" 23PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"
24 24
25PACKAGES =+ " \ 25PACKAGES =+ " \
26 libmissioncontrol \ 26 libmissioncontrol \
27 libmissioncontrol-config \ 27 libmissioncontrol-config \
28 libmissioncontrol-server \ 28 libmissioncontrol-server \
29 libmissioncontrol-dev \ 29 libmissioncontrol-dev \
30 libmissioncontrol-config-dev \ 30 libmissioncontrol-config-dev \
31 libmissioncontrol-server-dev \ 31 libmissioncontrol-server-dev \
32 libmissioncontrol-dbg \ 32 libmissioncontrol-dbg \
33 libmissioncontrol-config-dbg \ 33 libmissioncontrol-config-dbg \
34 libmissioncontrol-server-dbg \ 34 libmissioncontrol-server-dbg \
35" 35"
36 36
37FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas" 37FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas"
diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
index e1413b0d5..ce0b49263 100644
--- a/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
+++ b/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
@@ -30,7 +30,7 @@ EXTRA_OECMAKE_class-nativesdk = "-DWITH_QT4=OFF -DWITH_QT5=OFF \
30 -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_PYTHON=OFF" 30 -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_PYTHON=OFF"
31 31
32do_install_append () { 32do_install_append () {
33 ln -sf thrift ${D}/${bindir}/thrift-compiler 33 ln -sf thrift ${D}/${bindir}/thrift-compiler
34} 34}
35 35
36# http://errors.yoctoproject.org/Errors/Details/68622/ 36# http://errors.yoctoproject.org/Errors/Details/68622/
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"
24PACKAGE_ARCH = "${MACHINE_ARCH}" 24PACKAGE_ARCH = "${MACHINE_ARCH}"
25 25
26SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ 26SRC_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
30SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78" 31SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78"
31SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da" 32SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da"
@@ -39,20 +40,22 @@ SYSTEMD_AUTO_ENABLE = "enable"
39USERADD_PACKAGES = "${PN}" 40USERADD_PACKAGES = "${PN}"
40GROUPADD_PARAM_${PN} = "-r zabbix" 41GROUPADD_PARAM_${PN} = "-r zabbix"
41USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ 42USERADD_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
44KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" 46KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}"
45 47
46EXTRA_OECONF = '--enable-dependency-tracking \ 48EXTRA_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"
56CFLAGS_append = " -lldap -llber" 59CFLAGS_append = " -lldap -llber"
57 60
58do_configure_prepend() { 61do_configure_prepend() {
@@ -62,7 +65,7 @@ do_configure_prepend() {
62do_install_append() { 65do_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}
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb
index 34749d0b4..8da86746b 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb
@@ -7,8 +7,8 @@ PACKAGECONFIG ??= "libsodium"
7PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium" 7PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium"
8 8
9SRC_URI = "http://github.com/zeromq/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \ 9SRC_URI = "http://github.com/zeromq/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \
10 file://run-ptest \ 10 file://run-ptest \
11 " 11"
12SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac" 12SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac"
13SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf" 13SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf"
14 14
@@ -22,11 +22,11 @@ S = "${WORKDIR}/zeromq-${PV}"
22inherit autotools ptest pkgconfig 22inherit autotools ptest pkgconfig
23 23
24do_compile_ptest () { 24do_compile_ptest () {
25 echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile 25 echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile
26 oe_runmake buildtest-TESTS 26 oe_runmake buildtest-TESTS
27} 27}
28 28
29do_install_ptest () { 29do_install_ptest () {
30 install -d ${D}${PTEST_PATH}/tests 30 install -d ${D}${PTEST_PATH}/tests
31 install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests 31 install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests
32} 32}