From a45830a39bb47a9eab27980d52966226c9504ea4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 22:49:41 +0200 Subject: recipes: Unify indentation * This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa Acked-by: Koen Kooi --- .../nonworking/gnome/gnome-terminal_2.26.3.bb | 2 +- .../system-tools/system-tools-backends_2.10.2.bb | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'meta-gnome/recipes-gnome/nonworking') diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb index a1777974e..9bf6b6de5 100644 --- a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb +++ b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb @@ -12,7 +12,7 @@ EXTRA_OECONF += "--disable-scrollkeeper" # Remove an autogenerated file that needs to be rebuilt do_configure_prepend () { - rm -f ${S}/src/terminal-type-builtins.c + rm -f ${S}/src/terminal-type-builtins.c } SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8" diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb index ef696f8fe..ed4a556e2 100644 --- a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb +++ b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb @@ -11,30 +11,30 @@ SRC_URI[archive.sha256sum] = "1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa8 SRC_URI += " \ file://system-tools-backends \ - " +" # This needs to move to meta-angstrom SRC_URI_append_angstrom = " \ file://add-angstrom-distro.patch \ - " +" EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " do_configure() { - rm missing || true - automake --add-missing - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in - libtoolize --force --install - aclocal + rm missing || true + automake --add-missing + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in + libtoolize --force --install + aclocal gnu-configize - oe_runconf - cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} + oe_runconf + cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} } do_install_append () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ } INITSCRIPT_NAME = "system-tools-backends" -- cgit v1.2.3-54-g00ecf