From 289217bbc3c5c53f486ab5615a6d6196e3c12cf2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Aug 2016 18:53:48 +0200 Subject: 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 --- .../recipes-extended/cfengine/cfengine_3.9.0.bb | 20 ++++++------ .../recipes-extended/corosync/corosync_2.4.0.bb | 2 +- meta-oe/recipes-extended/haveged/haveged_1.9.1.bb | 20 ++++++------ .../mml-widget/gtkmathview_0.8.0.bb | 6 ++-- meta-oe/recipes-extended/polkit/polkit_0.113.bb | 6 ++-- .../scsirastools/scsirastools_1.6.4.bb | 3 +- .../smartmontools/smartmontools_6.4.bb | 38 +++++++++++----------- meta-oe/recipes-extended/wipe/wipe_git.bb | 8 ++--- 8 files changed, 51 insertions(+), 52 deletions(-) (limited to 'meta-oe/recipes-extended') 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 0bd5f32425..68a15f8974 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 50897f004e..a213a2726a 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 fbd1992d63..0fc6289730 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 9c6af16cf7..cce3528921 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 fdd198a61d..daafaf5c84 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 13f93cc6d0..edf84c1bae 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 86e6d9ee61..fce50e5bdd 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 dd4995881b..9a8101621b 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" -- cgit 1.2.3-korg