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 --- meta-xfce/recipes-xfce/exo/exo_0.10.2.bb | 4 ++-- meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb | 2 +- meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb | 4 ++-- meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb | 2 +- .../recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.2.0.bb | 4 ++-- meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb | 6 +++--- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta-xfce/recipes-xfce') diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb index 5e6b5acdb..09aacc3da 100644 --- a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb @@ -27,10 +27,10 @@ PACKAGES =+ "exo-csource" # pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 FILES_${PN} += "${datadir}/xfce4/ \ ${libdir}/xfce4/exo-1 \ - " +" FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ - " +" FILES_exo-csource += "${bindir}/exo-csource" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb index 663e67c7c..93a95d534 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb @@ -20,7 +20,7 @@ FILES_${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ ${libdir}/tumbler-1/plugins/cache/*.so \ - " +" FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ ${libdir}/tumbler-1/plugins/cache/*.la" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb index 1955fccb0..8779b01f4 100644 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb @@ -14,8 +14,8 @@ SRC_URI[md5sum] = "372b74f432e7e02d946c2ea9d3de2805" SRC_URI[sha256sum] = "f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8" do_install_append() { - install -d ${D}${datadir}/aclocal - install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/ + install -d ${D}${datadir}/aclocal + install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/ } FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb index f7d7c4687..02a6cb1c9 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb @@ -26,4 +26,4 @@ FILES_${PN} += "${libdir}/xfce4/panel/migrate \ ${libdir}/xfce4/panel/wrapper" FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ - " +" diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.2.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.2.0.bb index 670fc251e..af2ba5e64 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.2.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.2.0.bb @@ -15,14 +15,14 @@ EXTRA_OECONF = " \ --enable-polkit \ --enable-network-manager \ --enable-panel-plugins \ - " +" PACKAGES += "xfce4-brightness-plugin" FILES_${PN} += "${datadir}/polkit-1" FILES_xfce4-brightness-plugin = " \ ${libdir}/xfce4/panel-plugins/xfce4-brightness-plugin \ ${datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop \ - " +" SRC_URI[md5sum] = "935599b7114b0a4b0e2c9a5d6c72524c" SRC_URI[sha256sum] = "d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb index c5cb03371..d633fa6d1 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb @@ -23,9 +23,9 @@ SRC_URI[sha256sum] = "4a4f1e79a58b524f3a6dd030b6fc687671b35566f847e6f516c6f84211 FILES_${PN} += "${libdir}/xfce4" do_install_prepend() { - # somehow binary files are not patched correctly by oe-patch - so copy them - cp ${WORKDIR}/touchscreen/invisible ${S}/cursors - cp ${WORKDIR}/touchscreen/wait ${S}/cursors + # somehow binary files are not patched correctly by oe-patch - so copy them + cp ${WORKDIR}/touchscreen/invisible ${S}/cursors + cp ${WORKDIR}/touchscreen/wait ${S}/cursors } RRECOMMENDS_${PN} += "gnome-icon-theme" diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb index 4f686a581..5801c517a 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb @@ -23,6 +23,6 @@ ALTERNATIVE_PRIORITY[x-window-manager] = "30" RDEPENDS_${PN} = "xfwm4-theme-default" FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ ${datadir}/xfwm4/defaults \ - " +" FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" -- cgit v1.2.3-54-g00ecf