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 | |
| parent | f2bec07b87b3f1118aa1d1f194d230920f1afe01 (diff) | |
| download | meta-openembedded-contrib-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')
48 files changed, 382 insertions, 367 deletions
diff --git a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb b/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb index afbaaba0780..8888b226780 100644 --- a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb +++ b/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb @@ -22,8 +22,8 @@ SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" S = "${WORKDIR}/git" do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README + install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py + install -Dm 0644 README ${D}${docdir}/analyze-suspend/README } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb index 5acfbf1bb55..aab64a354da 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb @@ -13,23 +13,23 @@ S = "${WORKDIR}/phoronix-test-suite" inherit systemd allarch do_install() { - DESTDIR=${D} ./install-sh ${exec_prefix} + DESTDIR=${D} ./install-sh ${exec_prefix} - if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then - install -d ${D}/${systemd_unitdir}/system/ - mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ - rm -rf ${D}/usr/lib/ - fi + if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then + install -d ${D}/${systemd_unitdir}/system/ + mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ + rm -rf ${D}/usr/lib/ + fi } SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" RDEPENDS_${PN} += "bash python php-cli" FILES_${PN} += " \ - ${datadir}/phoronix-test-suite \ - ${datadir}/appdata/phoronix-test-suite.appdata.xml \ - ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ - ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ - ${datadir}/mime/packages/openbenchmarking-mime.xml \ - ${systemd_unitdir}/* \ + ${datadir}/phoronix-test-suite \ + ${datadir}/appdata/phoronix-test-suite.appdata.xml \ + ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ + ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ + ${datadir}/mime/packages/openbenchmarking-mime.xml \ + ${systemd_unitdir}/* \ " 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 f789dfd2a3a..2de547a7096 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" FILES_${PN} = "${bindir} ${sbindir}" FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ - /lib/*.a /lib/*.o ${datadir}/aclocal" + ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ + /lib/*.a /lib/*.o ${datadir}/aclocal \ +" FILES_${PN}-dev = "" FILES_libgnokii = "${libdir}/libgnokii.so.*" diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb index 254b855f3d5..0939d17f9a5 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" SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'" + EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'" do_install () { 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 16e2a7dca12..4bf238d28aa 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" FILES_${PN}-server = "${bindir}/mosh-server" NEEDED_PERL_MODULES = "\ - perl-module-socket \ - perl-module-getopt-long \ - perl-module-errno \ - perl-module-io-socket-inet \ - perl-module-posix \ + perl-module-socket \ + perl-module-getopt-long \ + perl-module-errno \ + perl-module-io-socket-inet \ + perl-module-posix \ " # 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 95adecdf967..b8a9d4a2356 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" inherit update-rc.d do_install () { - - install -d ${D}${bindir} - install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" - - install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" - install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" - install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" - install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" - - install -d ${D}${sysconfdir} - install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" - - install -d "${D}${localstatedir}/spool" - install -d "${D}${localstatedir}/spool/sms" - install -d "${D}${localstatedir}/spool/sms/incoming" - install -d "${D}${localstatedir}/spool/sms/outgoing" - install -d "${D}${localstatedir}/spool/sms/checked" - - install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" + + install -d ${D}${bindir} + install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" + + install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" + install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" + install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" + install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" + + install -d ${D}${sysconfdir} + install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" + + install -d "${D}${localstatedir}/spool" + install -d "${D}${localstatedir}/spool/sms" + install -d "${D}${localstatedir}/spool/sms/incoming" + install -d "${D}${localstatedir}/spool/sms/outgoing" + install -d "${D}${localstatedir}/spool/sms/checked" + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" } 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 f13e7093c81..c398dc15a21 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 \ PR = "r5" SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch \ - file://doublefix.patch" + file://prefer_python_2.5.patch \ + file://doublefix.patch \ +" SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" @@ -20,4 +21,4 @@ SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed inherit autotools pkgconfig pythonnative FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" + ${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 9ae68ddea98..582783c9d6a 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" PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" PACKAGES =+ " \ - libmissioncontrol \ - libmissioncontrol-config \ - libmissioncontrol-server \ - libmissioncontrol-dev \ - libmissioncontrol-config-dev \ - libmissioncontrol-server-dev \ - libmissioncontrol-dbg \ - libmissioncontrol-config-dbg \ - libmissioncontrol-server-dbg \ + libmissioncontrol \ + libmissioncontrol-config \ + libmissioncontrol-server \ + libmissioncontrol-dev \ + libmissioncontrol-config-dev \ + libmissioncontrol-server-dev \ + libmissioncontrol-dbg \ + libmissioncontrol-config-dbg \ + libmissioncontrol-server-dbg \ " FILES_${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 e1413b0d5c7..ce0b492635a 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 \ -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_PYTHON=OFF" do_install_append () { - ln -sf thrift ${D}/${bindir}/thrift-compiler + ln -sf thrift ${D}/${bindir}/thrift-compiler } # 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 03bad313c1a..8b9c4b844d5 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" PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-configure.ac.patch \ - file://zabbix-agent.service" + file://0001-Fix-configure.ac.patch \ + file://zabbix-agent.service \ +" SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78" SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da" @@ -39,20 +40,22 @@ SYSTEMD_AUTO_ENABLE = "enable" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r zabbix" USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ - -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix" + -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ +" KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" -EXTRA_OECONF = '--enable-dependency-tracking \ - --enable-agent \ - --enable-ipv6 \ - --with-net-snmp \ - --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ - --with-unixodbc \ - --with-ssh2 \ - --with-sqlite3 \ - ' +EXTRA_OECONF = " \ + --enable-dependency-tracking \ + --enable-agent \ + --enable-ipv6 \ + --with-net-snmp \ + --with-ldap=${STAGING_EXECPREFIXDIR} \ + --with-jabber \ + --with-unixodbc \ + --with-ssh2 \ + --with-sqlite3 \ +" CFLAGS_append = " -lldap -llber" do_configure_prepend() { @@ -62,7 +65,7 @@ do_configure_prepend() { do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service fi } 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 34749d0b47a..8da86746be4 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" PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium" SRC_URI = "http://github.com/zeromq/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \ - file://run-ptest \ - " + file://run-ptest \ +" SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac" SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf" @@ -22,11 +22,11 @@ S = "${WORKDIR}/zeromq-${PV}" inherit autotools ptest pkgconfig do_compile_ptest () { - echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile - oe_runmake buildtest-TESTS + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile + oe_runmake buildtest-TESTS } do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests } diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb index de23dcd5b90..1c1a02d0bf1 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb @@ -1,8 +1,9 @@ SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ - (even before the root filesystem is mounted!) that provides a \ - graphical boot animation while the boot process happens in the background." + (even before the root filesystem is mounted!) that provides a \ + graphical boot animation while the boot process happens in the background. \ +" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" SECTION = "base" @@ -19,10 +20,10 @@ SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.ta SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" -EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation\ - --with-logo=${LOGO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install', '', d)} \ - " +EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ + --with-logo=${LOGO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install', '', d)} \ +" PACKAGECONFIG ??= "pango initrd" PACKAGECONFIG_append_x86 = " drm" @@ -38,15 +39,15 @@ LOGO ??= "${datadir}/plymouth/bizcom.png" inherit autotools pkgconfig systemd do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/*.service ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/systemd-ask-password-plymouth.path ${D}${systemd_unitdir}/system - # Remove /var/run from package as plymouth will populate it on startup - rm -fr "${D}${localstatedir}/run" - - if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then - rm -rf "${D}${libexecdir}" - fi + install -d ${D}${systemd_unitdir}/system + install -m 644 ${B}/systemd-units/*.service ${D}${systemd_unitdir}/system + install -m 644 ${B}/systemd-units/systemd-ask-password-plymouth.path ${D}${systemd_unitdir}/system + # Remove /var/run from package as plymouth will populate it on startup + rm -fr "${D}${localstatedir}/run" + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + rm -rf "${D}${libexecdir}" + fi } PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" diff --git a/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-oe/recipes-core/usleep/usleep_1.0.bb index 2ef4b7c024c..403c6b7fed1 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.0.bb @@ -9,18 +9,18 @@ S = "${WORKDIR}" DEPENDS = "popt" SRC_URI = "file://usleep.c \ - file://usleep.1 \ - file://GPLv2.patch \ + file://usleep.1 \ + file://GPLv2.patch \ " do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} usleep.c -o usleep -lpopt + ${CC} ${CFLAGS} ${LDFLAGS} usleep.c -o usleep -lpopt } do_install() { - install -d ${D}${base_bindir} - install -d ${D}${mandir}/man1 + install -d ${D}${base_bindir} + install -d ${D}${mandir}/man1 - install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} - install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 + install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} + install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 } diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index c27e21dc893..8ae01850317 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -28,5 +28,5 @@ PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" do_configure_prepend () { - ( cd ${S}; ./autogen.sh ) + ( cd ${S}; ./autogen.sh ) } diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb b/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb index 7d009068d8d..ead1f615c5c 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2106f0435056f3dd9349747a766e5816" SRC_URI = " \ - http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ + http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ " SRC_URI[md5sum] = "40dc408b1e03cc36d80209baaa2d32b7" @@ -18,14 +18,15 @@ RDEPENDS_${PN} += "bash perl libxml2" S = "${WORKDIR}/${BP}" EXTRA_OECONF = "--enable-debuginfo \ - --enable-fast \ - --enable-shared \ - --with-pm=gforker \ - --disable-rpath \ - --disable-f77 \ - --disable-fc \ - --disable-fortran \ - --disable-cxx" + --enable-fast \ + --enable-shared \ + --with-pm=gforker \ + --disable-rpath \ + --disable-f77 \ + --disable-fc \ + --disable-fortran \ + --disable-cxx \ +" inherit autotools-brokensep gettext diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 22ed8e2ff1a..94fc736b572 100644 --- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "This is a small collection of power management \ - test and investigation tools" + test and investigation tools" HOMEPAGE = "http://lesswatts.org/projects/acpi" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" @@ -17,13 +17,13 @@ S = "${WORKDIR}/git" do_configure[noexec] = "1" do_compile() { - oe_runmake + oe_runmake } do_install() { - install -d ${D}${bindir} ${D}${docdir} - install -m 755 ${S}/acpidump/acpidump ${D}${bindir} - install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir} - install -m 755 ${S}/madt/madt ${D}${bindir} - install -m 644 ${S}/README ${D}${docdir} + install -d ${D}${bindir} ${D}${docdir} + install -m 755 ${S}/acpidump/acpidump ${D}${bindir} + install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir} + install -m 755 ${S}/madt/madt ${D}${bindir} + install -m 644 ${S}/README ${D}${docdir} } diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb index 40612e5df52..f5d056e00c7 100644 --- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb +++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb @@ -20,25 +20,26 @@ PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR},--with-curl=no,curl" PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR},--with-icu=no,icu" do_install_prepend () { - sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc + sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc } PACKAGES = "libxerces-c \ - libxerces-c-dbg \ - libxerces-c-dev \ - xerces-c-samples \ - xerces-c-samples-dbg \ - libxerces-c-staticdev \ - " + libxerces-c-dbg \ + libxerces-c-dev \ + xerces-c-samples \ + xerces-c-samples-dbg \ + libxerces-c-staticdev \ +" FILES_libxerces-c = "${libdir}/libxerces-c-3.1.so" FILES_libxerces-c-dbg = "${libdir}/.debug \ - ${prefix}/src/debug " + ${prefix}/src/debug \ +" FILES_libxerces-c-dev = "${libdir}/lib*.la \ - ${libdir}/libxerces-c.so \ - ${libdir}/pkgconfig/xerces-c.pc \ - ${includedir}/xercesc \ - " + ${libdir}/libxerces-c.so \ + ${libdir}/pkgconfig/xerces-c.pc \ + ${includedir}/xercesc \ +" FILES_xerces-c-samples = "${bindir}/*" FILES_xerces-c-samples-dbg = "${bindir}/.debug/" FILES_libxerces-c-staticdev = "${libdir}/lib*.a" diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb index 0bd5f32425b..68a15f89744 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb @@ -49,23 +49,23 @@ PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl," EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet" do_install_append() { - install -d ${D}${localstatedir}/${BPN}/bin - for f in `ls ${D}${bindir}`; do - ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/ - done + install -d ${D}${localstatedir}/${BPN}/bin + for f in `ls ${D}${bindir}`; do + ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/ + done - install -d ${D}${sysconfdir}/default - cat << EOF > ${D}${sysconfdir}/default/cfengine3 + install -d ${D}${sysconfdir}/default + cat << EOF > ${D}${sysconfdir}/default/cfengine3 RUN_CF_SERVERD=1 RUN_CF_EXECD=1 RUN_CF_MONITORD=1 RUN_CF_HUB=0 EOF - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3 - sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service - fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3 + sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service + fi } RDEPENDS_${PN} += "${BPN}-masterfiles" diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb index 50897f004ea..a213a2726a4 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb @@ -48,7 +48,7 @@ do_install_append() { sed -i -e 's,@INITWRAPPERSDIR@,${sysconfdir}/init.d,g' ${D}${systemd_unitdir}/system/corosync.service sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/corosync-notifyd.service sed -i -e 's,@SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/corosync-notifyd.service - fi + fi } RDEPENDS_${PN} += "bash" diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb index fbd1992d639..0fc62897303 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb @@ -6,8 +6,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \ - file://remove-systemd-unit-503.patch \ - " + file://remove-systemd-unit-503.patch \ +" SRC_URI[md5sum] = "015ff58cd10607db0e0de60aeca2f5f8" SRC_URI[sha256sum] = "9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715" @@ -17,16 +17,16 @@ PR = "r0" inherit autotools systemd EXTRA_OECONF = "\ - --enable-init=service.redhat \ - --enable-nistest=yes \ - --enable-olt=yes \ - --enable-threads=no \ - " + --enable-init=service.redhat \ + --enable-nistest=yes \ + --enable-olt=yes \ + --enable-threads=no \ +" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "haveged.service" - + do_install_append() { - mkdir -p ${D}${systemd_unitdir}/system - install -p -m644 ${B}/init.d/haveged.service ${D}${systemd_unitdir}/system + mkdir -p ${D}${systemd_unitdir}/system + install -p -m644 ${B}/init.d/haveged.service ${D}${systemd_unitdir}/system } diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index 9c6af16cf74..cce35289218 100644 --- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb @@ -9,9 +9,9 @@ SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec" PV = "0.8.0+git${SRCPV}" SRC_URI = "git://github.com/GNOME/gtkmathview.git \ - file://use_hostcxx.patch \ - file://0001-include-cstdio-to-get-printf-definitions.patch \ - " + file://use_hostcxx.patch \ + file://0001-include-cstdio-to-get-printf-definitions.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index fdd198a61da..daafaf5c840 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb @@ -19,8 +19,8 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ - file://0001-make-netgroup-support-configurable.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://0001-make-netgroup-support-configurable.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ " SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6 EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages" do_compile_prepend () { - export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" } PACKAGES =+ "${PN}-examples" diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb index 13f93cc6d0f..edf84c1baeb 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb @@ -9,8 +9,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=687ea108478d26152ae46eb29d9d1545" PR = "r0" -SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz \ - " +SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz" SRC_URI[md5sum] = "2d775111b62e2dfc1960a722f5fda211" SRC_URI[sha256sum] = "38d2c6c9b04a2c594e528927b950754f94c0522718d17c78e6589ba778339bf8" diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb index 86e6d9ee618..fce50e5bdd2 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb @@ -13,14 +13,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ - file://initd.smartd \ - file://smartmontools.default \ - file://smartd.service \ - " + file://initd.smartd \ + file://smartmontools.default \ + file://smartd.service \ +" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ +" PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" @@ -33,19 +33,19 @@ SYSTEMD_SERVICE_${PN} = "smartd.service" SYSTEMD_AUTO_ENABLE = "disable" do_install_append () { - #install the init.d/smartd - install -d ${D}${sysconfdir}/init.d - install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd - install -d ${D}${sysconfdir}/default - install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools - - #install systemd service file - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/smartd.service + #install the init.d/smartd + install -d ${D}${sysconfdir}/init.d + install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd + install -d ${D}${sysconfdir}/default + install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools + + #install systemd service file + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/smartd.service } INITSCRIPT_NAME = "smartd" diff --git a/meta-oe/recipes-extended/wipe/wipe_git.bb b/meta-oe/recipes-extended/wipe/wipe_git.bb index dd4995881bb..9a8101621bd 100644 --- a/meta-oe/recipes-extended/wipe/wipe_git.bb +++ b/meta-oe/recipes-extended/wipe/wipe_git.bb @@ -10,9 +10,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://github.com/berke/wipe.git;branch=master \ - file://support-cross-compile-for-linux.patch \ - file://makefile-add-ldflags.patch \ - " + file://support-cross-compile-for-linux.patch \ + file://makefile-add-ldflags.patch \ +" SRCREV = "d9c100c9cd0b1cbbe4359e4d6c9a035d11e7597c" PV = "0.23+git${SRCPV}" @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = "linux" do_install() { - make install DESTDIR=${D} + make install DESTDIR=${D} } do_configure[noexec] = "1" diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index 3d13e5a94a5..be3a41f390d 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -4,11 +4,11 @@ HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ - " + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ +" SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb index 235b17e6c0c..387202bee7e 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb @@ -11,9 +11,9 @@ RDEPENDS_${PN} += "libpng gtk+ libgcrypt" inherit autotools binconfig pkgconfig SRC_URI = "\ - ${DEBIAN_MIRROR}/main/libv/libvncserver/libvncserver_0.9.10+dfsg.orig.tar.xz \ - file://0001-remove-webclients-build.patch \ - file://0002-common-add-sha1.patch \ + ${DEBIAN_MIRROR}/main/libv/libvncserver/libvncserver_0.9.10+dfsg.orig.tar.xz \ + file://0001-remove-webclients-build.patch \ + file://0002-common-add-sha1.patch \ " SRC_URI[md5sum] = "e883b6c7bd339a5e1c48645051abe5c4" diff --git a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb b/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb index 6852fd32c1b..d060c4747cf 100755 --- a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb +++ b/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb @@ -26,7 +26,7 @@ PACKAGECONFIG[elementary] = "--enable-efl-tests,--disable-efl-tests,elementary" PACKAGECONFIG[gtk+3] = "--enable-gtk-tests,--disable-gtk-tests,gtk+3" do_install_append() { - rm -f ${D}/${libdir}/weston/*.la + rm -f ${D}/${libdir}/weston/*.la } FILES_${PN} += "${bindir}/wfits ${libdir}/weston/*.so" diff --git a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb index 158416b0842..45e3f7b5927 100644 --- a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb +++ b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb @@ -6,9 +6,9 @@ inherit packagegroup distro_features_check REQUIRED_DISTRO_FEATURES = "x11" RDEPENDS_${PN} = "\ - font-adobe-100dpi \ - font-adobe-utopia-100dpi \ - font-bh-100dpi \ - font-bh-lucidatypewriter-100dpi \ - font-bitstream-100dpi \ + font-adobe-100dpi \ + font-adobe-utopia-100dpi \ + font-bh-100dpi \ + font-bh-lucidatypewriter-100dpi \ + font-bitstream-100dpi \ " diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.0.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.0.bb index be859a2d4b1..c9a22703aac 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.0.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.0.bb @@ -1,10 +1,10 @@ SUMMARY = "VMcore extraction tool" DESCRIPTION = "\ - This program is used to extract a subset of the memory available either \ - via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ - images without extra uneeded information (zero pages, userspace programs, \ - etc). \ - " + This program is used to extract a subset of the memory available either \ + via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ + images without extra uneeded information (zero pages, userspace programs, \ + etc). \ +" HOMEPAGE = "http://makedumpfile.sourceforge.net" DEPENDS = "bzip2 zlib elfutils" @@ -18,9 +18,9 @@ PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ - file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ - " + ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ + file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ +" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" @@ -33,21 +33,21 @@ SECTION = "base" # target gcc. # EXTRA_OEMAKE = "\ - LINKTYPE=static \ - TARGET=${TARGET_ARCH} \ - " + LINKTYPE=static \ + TARGET=${TARGET_ARCH} \ +" do_install () { - mkdir -p ${D}/usr/bin - install -m 755 ${S}/makedumpfile ${D}/usr/bin - install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin + mkdir -p ${D}/usr/bin + install -m 755 ${S}/makedumpfile ${D}/usr/bin + install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin - mkdir -p ${D}/usr/share/man/man8 - install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 + mkdir -p ${D}/usr/share/man/man8 + install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 - mkdir -p ${D}/usr/share/man/man5 - install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 + mkdir -p ${D}/usr/share/man/man5 + install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 - mkdir -p ${D}/etc/ - install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample + mkdir -p ${D}/etc/ + install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample } diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb index d431abdaa75..20983a775a2 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -4,18 +4,18 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" LICENSE = "GPLv2+" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ - file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454" + file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ + file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454" SECTION = "libs" DEPENDS = "libid3tag" PR = "r3" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ - file://no-force-mem.patch \ - file://add-pkgconfig.patch \ - file://fix_for_mips_with_gcc-4.5.0.patch \ - file://obsolete_automake_macros.patch \ - file://automake-foreign.patch \ + file://no-force-mem.patch \ + file://add-pkgconfig.patch \ + file://fix_for_mips_with_gcc-4.5.0.patch \ + file://obsolete_automake_macros.patch \ + file://automake-foreign.patch \ " SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c" @@ -29,8 +29,8 @@ EXTRA_OECONF = "-enable-speed --enable-shared" EXTRA_OECONF_append_arm = " --enable-fpm=arm" do_configure_prepend () { -# damn picky automake... - touch NEWS AUTHORS ChangeLog +# damn picky automake... + touch NEWS AUTHORS ChangeLog } ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/meta-oe/recipes-multimedia/minidlna/minidlna.inc index ebca7553ac2..b333fce0bb5 100644 --- a/meta-oe/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc @@ -19,16 +19,16 @@ S = "${WORKDIR}/git" EXTRA_AUTORECONF = "" do_install_append(){ - install -d ${D}${sysconfdir} - install -m 0755 minidlna.conf ${D}${sysconfdir} + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} # Systemd script - install -d ${D}${nonarch_base_libdir}/systemd/system - install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system # Sysvinit script - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna } diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index e121b447d35..a65d324eae5 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -6,9 +6,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ - file://not_build_elc.patch \ - file://2ch_t.patch \ - " + file://not_build_elc.patch \ + file://2ch_t.patch \ +" SRC_URI_append_class-target = "file://target-helpers.patch" SRC_URI_append_class-native = "file://native-helpers.patch" @@ -25,18 +25,21 @@ PACKAGES += "${PN}-el libanthy0 libanthy-dev" FILES_${PN}-dbg += "${libdir}/.debug" FILES_libanthy0 = "${libdir}/libanthy.so.* \ - ${libdir}/libanthydic.so.* \ - ${libdir}/libanthyinput.so.*" + ${libdir}/libanthydic.so.* \ + ${libdir}/libanthyinput.so.* \ +" FILES_libanthy-dev = "${libdir}/libanthy*.la \ - ${libdir}/libanthy*.a \ - ${libdir}/libanthy*.so \ - ${includedir}/anthy \ - ${libdir}/pkgconfig/anthy.pc" + ${libdir}/libanthy*.a \ + ${libdir}/libanthy*.so \ + ${includedir}/anthy \ + ${libdir}/pkgconfig/anthy.pc \ +" FILES_${PN}-el = "${datadir}/emacs/*" FILES_${PN} = "${datadir}/* \ - ${bindir}/* \ - ${sysconfdir}/anthy-conf" + ${bindir}/* \ + ${sysconfdir}/anthy-conf \ +" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/augeas/augeas.inc b/meta-oe/recipes-support/augeas/augeas.inc index 23d12cadfed..354b1809f01 100644 --- a/meta-oe/recipes-support/augeas/augeas.inc +++ b/meta-oe/recipes-support/augeas/augeas.inc @@ -26,5 +26,5 @@ RRECOMMENDS_lib${BPN} += "${PN}" LEAD_SONAME = "libaugeas.so" do_install_append() { - rm -fr ${D}${datadir}/vim + rm -fr ${D}${datadir}/vim } diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb b/meta-oe/recipes-support/ccid/ccid_1.4.24.bb index 49f7a0c8b7f..31145d0efd5 100644 --- a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb +++ b/meta-oe/recipes-support/ccid/ccid_1.4.24.bb @@ -7,7 +7,8 @@ DEPENDS = "virtual/libusb0 pcsc-lite" RDEPENDS_${PN} = "pcsc-lite" SRC_URI = "https://alioth.debian.org/frs/download.php/file/4171/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch " + file://no-dep-on-libfl.patch \ +" SRC_URI[md5sum] = "915a03cda85b60fefbe3654cbdc68ca9" SRC_URI[sha256sum] = "62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176" diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-support/fbtest/fb-test_git.bb index 13f9e377a8a..6a9d4b27876 100644 --- a/meta-oe/recipes-support/fbtest/fb-test_git.bb +++ b/meta-oe/recipes-support/fbtest/fb-test_git.bb @@ -11,10 +11,10 @@ SRC_URI = "git://github.com/prpplague/fb-test-app.git" S = "${WORKDIR}/git" do_install() { - install -d ${D}${bindir} - install -m 0755 fb-test ${D}${bindir} - # avoid collisions with perf (perf) and mesa-demos (offset) - for prog in perf rect offset ; do - install -m 0755 $prog ${D}${bindir}/fb-$prog - done + install -d ${D}${bindir} + install -m 0755 fb-test ${D}${bindir} + # avoid collisions with perf (perf) and mesa-demos (offset) + for prog in perf rect offset ; do + install -m 0755 $prog ${D}${bindir}/fb-$prog + done } diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb b/meta-oe/recipes-support/gd/gd_2.2.3.bb index 80d66c9f7dc..c5aff661671 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.3.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += " --disable-rpath \ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' do_install_append() { - # cleanup buildpaths from gdlib.pc - sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc + # cleanup buildpaths from gdlib.pc + sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } PACKAGES += "${PN}-tools" diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_1.0.3.bb index 4e445c8b352..181661af72b 100644 --- a/meta-oe/recipes-support/htop/htop_1.0.3.bb +++ b/meta-oe/recipes-support/htop/htop_1.0.3.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f5 LDFLAGS_append_libc-uclibc = " -lubacktrace" do_configure_prepend () { - rm -rf ${S}/config.h + rm -rf ${S}/config.h } inherit autotools diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index 256fa053bee..e5a145ab228 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc @@ -28,12 +28,12 @@ TESTDIR = "tests" # We presume the tests we are going to install so just build them directly. # do_compile_ptest() { - oe_runmake -C ${TESTDIR} genfile ezapi1 + oe_runmake -C ${TESTDIR} genfile ezapi1 } do_install_ptest() { - install -d ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} + install -d ${D}${PTEST_PATH} + install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} + install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} + install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} } diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb index cf39278a608..9c1a5200b5a 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb @@ -24,7 +24,7 @@ PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," PACKAGECONFIG[python] = "--enable-python=${PYTHON_PN},,${PYTHON_PN}" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" RDEPENDS_${PN} = "libgcc" diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 9c3d2340fd1..73905b6c069 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -139,8 +139,8 @@ do_install() { ${D}${systemd_unitdir}/system/install_db.service if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "f /var/log/mysqld.err 0640 mysql mysql -" \ + install -d ${D}${sysconfdir}/tmpfiles.d + echo "f /var/log/mysqld.err 0640 mysql mysql -" \ > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf fi install -d ${D}${bindir} diff --git a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb b/meta-oe/recipes-support/numactl/numactl_2.0.11.bb index 199726fd08f..dd159a3b10f 100644 --- a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb +++ b/meta-oe/recipes-support/numactl/numactl_2.0.11.bb @@ -11,12 +11,12 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \ - file://fix-null-pointer.patch \ - file://Fix-the-test-output-format.patch \ - file://Makefile \ - file://run-ptest \ - file://0001-define-run-test-target.patch \ - " + file://fix-null-pointer.patch \ + file://Fix-the-test-output-format.patch \ + file://Makefile \ + file://run-ptest \ + file://0001-define-run-test-target.patch \ +" SRC_URI[md5sum] = "d3bc88b7ddb9f06d60898f4816ae9127" SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861" @@ -24,34 +24,34 @@ SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e COMPATIBLE_HOST = "^((?!arm).*)$" do_install() { - oe_runmake DESTDIR=${D} prefix=${D}/usr install - #remove the empty man2 directory - rm -r ${D}${mandir}/man2 + oe_runmake DESTDIR=${D} prefix=${D}/usr install + #remove the empty man2 directory + rm -r ${D}${mandir}/man2 } do_compile_ptest() { - oe_runmake test + oe_runmake test } do_install_ptest() { - #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ - mynode nodemap node-parse pagesize prefered randmap realloc_test \ - tbitmap tshared" - - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test - for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test - done - - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ - shmtest runltp bind_range" - for i in $test_scripts; do - install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test - done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ + #install tests binaries + local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ + mynode nodemap node-parse pagesize prefered randmap realloc_test \ + tbitmap tshared" + + [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test + for i in $test_binaries; do + install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test + done + + local test_scripts="checktopology checkaffinity printcpu regress regress2 \ + shmtest runltp bind_range" + for i in $test_scripts; do + install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test + done + + install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ + install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ } RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 8ab9a2b4e07..da1131616b6 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -19,11 +19,12 @@ IPP_MD5 = "808b791a6eac9ed78d32a7666804320e" SRCREV_FORMAT = "opencv" SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ - git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://fixgcc60.patch \ - file://fixpkgconfig.patch" + git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://fixgcc60.patch \ + file://fixpkgconfig.patch \ +" PV = "3.1+git${SRCPV}" @@ -35,22 +36,22 @@ do_unpack_extra() { addtask unpack_extra after do_unpack before do_patch EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ - -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ - -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ + -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ + -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ + ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ + ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," @@ -80,7 +81,7 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ - ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" + ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}') diff --git a/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb b/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb index 4e8b7d847b0..4233ba430f4 100644 --- a/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb +++ b/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb @@ -12,9 +12,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=e284d013ef08e66d4737f446c5890550" SRC_URI = "http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.5.tar.gz \ - file://1000patch-219201.patch \ - file://7000Makefile-fix-CC.patch \ - " + file://1000patch-219201.patch \ + file://7000Makefile-fix-CC.patch \ +" SRC_URI[md5sum] = "cd9c014f736158b1a60384a8e2bdc28a" SRC_URI[sha256sum] = "32528ddf7d8219c788b6e7702361611ff16c6340b6dc0f418ff164aadc4a4a88" @@ -24,10 +24,11 @@ S = "${WORKDIR}/pam_passwdqc-${PV}" DEPENDS = "libpam" EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -Wall -fPIC -DHAVE_SHADOW" \ - SECUREDIR=${base_libdir}/security" + SECUREDIR=${base_libdir}/security \ +" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } FILES_${PN} += "${base_libdir}/security/pam_passwdqc.so" diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.14.bb b/meta-oe/recipes-support/sharutils/sharutils_4.14.bb index 49981e7f7a6..d69e6ecbd42 100644 --- a/meta-oe/recipes-support/sharutils/sharutils_4.14.bb +++ b/meta-oe/recipes-support/sharutils/sharutils_4.14.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit gettext autotools-brokensep SRC_URI = "ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz \ - file://fix-for-cross-compiling.patch \ - " + file://fix-for-cross-compiling.patch \ +" SRC_URI[md5sum] = "5686c11131b4c4c0841f8f3ef34d136a" SRC_URI[sha256sum] = "90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208" do_configure () { - oe_runconf + oe_runconf } diff --git a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb index ac8593cb67f..4a1b4ce6706 100644 --- a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb @@ -22,9 +22,9 @@ DEPENDS = "linux-libc-headers ncurses" EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}" do_compile () { - oe_runmake 'CC=${CC}' + oe_runmake 'CC=${CC}' } do_install() { - oe_runmake install INSTALLDIR=${D} + oe_runmake install INSTALLDIR=${D} } diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb index ae193b20082..76a41252d7b 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.6.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb @@ -1,15 +1,14 @@ DESCRIPTION = "A multilingual user input method library" HOMEPAGE = "http://uim.freedesktop.org/" LICENSE = "BSD-3-Clause & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" SECTION = "inputmethods" -SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \ - " - -SRC_URI_append_class-target = "file://uim-module-manager.patch \ - file://0001-fix-bug-for-cross-compile.patch" +SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2" -LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" +SRC_URI_append_class-target = " file://uim-module-manager.patch \ + file://0001-fix-bug-for-cross-compile.patch \ +" SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" @@ -24,12 +23,13 @@ LEAD_SONAME = "libuim.so.1" inherit autotools pkgconfig gettext EXTRA_OECONF += "--disable-emacs \ - --without-scim \ - --without-m17nlib \ - --without-prime \ - --without-canna \ - --without-mana \ - --without-eb" + --without-scim \ + --without-m17nlib \ + --without-prime \ + --without-canna \ + --without-mana \ + --without-eb \ +" CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" @@ -45,60 +45,62 @@ do_install_append() { PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-common uim-anthy libuim0 libuim-dev" FILES_${PN} = "${bindir}/uim-help \ - ${libdir}/uim/plugin/libuim-* \ - ${libdir}/libuim-scm* \ - ${libdir}/libgcroots* \ - ${libdir}/uim/plugin/libuim-*" + ${libdir}/uim/plugin/libuim-* \ + ${libdir}/libuim-scm* \ + ${libdir}/libgcroots* \ + ${libdir}/uim/plugin/libuim-* \ +" FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ - ${libdir}/libuim-custom.so.* \ - ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ - ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ - ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ - ${libdir}/libuim.so.*" - + ${libdir}/libuim-custom.so.* \ + ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ + ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ + ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ + ${libdir}/libuim.so.* \ +" FILES_libuim-dev = "${libdir}/libuim*.a \ - ${libdir}/libuim*.la \ - ${libdir}/libuim*.so \ - ${includedir}/uim \ - ${libdir}/pkgconfig/uim.pc" - + ${libdir}/libuim*.la \ + ${libdir}/libuim*.so \ + ${includedir}/uim \ + ${libdir}/pkgconfig/uim.pc \ +" FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ - ${datadir}/uim/anthy*.scm" - + ${datadir}/uim/anthy*.scm \ +" FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" FILES_uim-utils = "${bindir}/uim-sh \ - ${bindir}/uim-module-manager \ - ${libexecdir}/uim-helper-server" - + ${bindir}/uim-module-manager \ + ${libexecdir}/uim-helper-server \ +" FILES_uim-xim = "${bindir}/uim-xim \ - ${libexecdir}/uim-candwin-*gtk \ - ${libexecdir}/uim-candwin-*gtk3 \ - ${datadir}/man/man1/uim-xim.1 \ - ${sysconfdir}/X11/xinit/xinput.d/uim*" - + ${libexecdir}/uim-candwin-*gtk \ + ${libexecdir}/uim-candwin-*gtk3 \ + ${datadir}/man/man1/uim-xim.1 \ + ${sysconfdir}/X11/xinit/xinput.d/uim* \ +" FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ - ${datadir}/uim" - + ${datadir}/uim \ +" FILES_uim-fep = "${bindir}/uim-fep*" FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ - ${bindir}/uim-toolbar-gtk \ - ${bindir}/uim-toolbar-gtk-systray \ - ${bindir}/uim-*-gtk \ - ${bindir}/uim-input-pad-ja \ - ${libdir}/uim/uim-*-gtk" - + ${bindir}/uim-toolbar-gtk \ + ${bindir}/uim-toolbar-gtk-systray \ + ${bindir}/uim-*-gtk \ + ${bindir}/uim-input-pad-ja \ + ${libdir}/uim/uim-*-gtk \ +" FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ - ${bindir}/uim-toolbar-gtk3 \ - ${bindir}/uim-toolbar-gtk3-systray \ - ${bindir}/uim-*-gtk3 \ - ${libdir}/uim/uim-*-gtk3" - + ${bindir}/uim-toolbar-gtk3 \ + ${bindir}/uim-toolbar-gtk3-systray \ + ${bindir}/uim-*-gtk3 \ + ${libdir}/uim/uim-*-gtk3 \ +" FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ - ${datadir}/uim/skk*.scm" + ${datadir}/uim/skk*.scm \ +" pkg_postinst_uim-anthy() { if [ -f /usr/bin/uim-module-manager ]; then @@ -137,8 +139,8 @@ pkg_postrm_uim-skk() { pkg_postinst_uim-common() { if [ -f /usr/bin/uim-module-manager ]; then /usr/bin/uim-module-manager --path /etc/uim --register \ - tutcode tcode hangul viqr \ - ipa-x-sampa latin byeoru + tutcode tcode hangul viqr \ + ipa-x-sampa latin byeoru fi } diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb index 52a2f5688c1..425f66b91b9 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb @@ -15,5 +15,5 @@ RDEPENDS_${PN} = "tcl" RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} install } |