Commit a45830a3 authored by Martin Jansa's avatar Martin Jansa

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: default avatarMartin Jansa <Martin.Jansa@gmail.com>
Acked-by: default avatarKoen Kooi <koen@dominion.thruhere.net>
parent 6f48cf89
......@@ -17,7 +17,7 @@ inherit e-base autotools pkgconfig distutils-base
SRCVER = "${PV}"
SRC_URI = "\
${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \
${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \
"
S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
......
......@@ -17,16 +17,16 @@ SRC_URI = "git://github.com/shr-project/e-tasks.git;protocol=git;branch=master \
S = "${WORKDIR}/git"
do_install_append() {
install -d "${D}/${datadir}/pixmaps"
install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps"
install -d "${D}/${datadir}/applications"
install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications"
install -d "${D}/${datadir}/e-tasks"
for ico in "${S}/resources/"*.png; do
if [ "$(basename $ico)" != "e-tasks.png" ]; then
install -m 0644 $ico "${D}/${datadir}/e-tasks"
fi
done
install -d "${D}/${datadir}/pixmaps"
install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps"
install -d "${D}/${datadir}/applications"
install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications"
install -d "${D}/${datadir}/e-tasks"
for ico in "${S}/resources/"*.png; do
if [ "$(basename $ico)" != "e-tasks.png" ]; then
install -m 0644 $ico "${D}/${datadir}/e-tasks"
fi
done
}
FILES_${PN} += "/usr/share/e-tasks/* /usr/share/applications/* /usr/share/pixmaps/*"
......@@ -18,14 +18,14 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http"
S = "${WORKDIR}/${SRCNAME}/e"
do_compile() {
# unfortunately hardcoded edje_cc in Makefile
sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile
make
# unfortunately hardcoded edje_cc in Makefile
sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile
make
}
do_install() {
install -d ${D}${datadir}/enlightenment/data/themes/
install -m 0644 ${S}/b_and_w.edj ${D}${datadir}/enlightenment/data/themes/
install -d ${D}${datadir}/enlightenment/data/themes/
install -m 0644 ${S}/b_and_w.edj ${D}${datadir}/enlightenment/data/themes/
}
FILES_${PN} = "${datadir}/enlightenment/data/themes/"
......@@ -9,11 +9,11 @@ inherit e update-alternatives gettext
S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-simple-x11 \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-simple-x11 \
"
do_configure_prepend() {
......@@ -52,16 +52,16 @@ do_install_append() {
}
RDEPENDS_${PN} += "\
shared-mime-info \
mime-support \
setxkbmap \
edje-utils \
${PN}-utils \
dbus-x11 \
evas-loader-png \
evas-loader-jpeg \
evas-loader-gif \
evas-generic-loader-svg \
shared-mime-info \
mime-support \
setxkbmap \
edje-utils \
${PN}-utils \
dbus-x11 \
evas-loader-png \
evas-loader-jpeg \
evas-loader-gif \
evas-generic-loader-svg \
"
# Uclibc build don't have 'glibc-utils'
......@@ -75,57 +75,57 @@ RCONFLICTS_${PN}-config-mobile = "${PN}-config-illume2"
RPROVIDES_${PN}-config-mobile = "${PN}-config-illume2"
PACKAGES =+ "\
${PN}-config-default \
${PN}-config-mobile \
${PN}-config-minimalist \
${PN}-config-netbook \
${PN}-config-scaleable \
${PN}-config-standard \
${PN}-theme-default \
${PN}-background-dark-gradient \
${PN}-background-light-gradient \
${PN}-backgrounds \
${PN}-images \
${PN}-icons \
${PN}-other \
${PN}-input-methods \
${PN}-sysactions \
${PN}-utils \
${PN}-menu \
efm-desktop-icon \
illume-keyboard-default-alpha \
illume-keyboard-default-numeric \
illume-keyboard-default-terminal \
${PN}-config-default \
${PN}-config-mobile \
${PN}-config-minimalist \
${PN}-config-netbook \
${PN}-config-scaleable \
${PN}-config-standard \
${PN}-theme-default \
${PN}-background-dark-gradient \
${PN}-background-light-gradient \
${PN}-backgrounds \
${PN}-images \
${PN}-icons \
${PN}-other \
${PN}-input-methods \
${PN}-sysactions \
${PN}-utils \
${PN}-menu \
efm-desktop-icon \
illume-keyboard-default-alpha \
illume-keyboard-default-numeric \
illume-keyboard-default-terminal \
"
ESYSACTIONS ?= "${PN}-sysactions"
RRECOMMENDS_${PN} = "\
${PN}-config-default \
${PN}-images \
${PN}-icons \
${PN}-other \
${PN}-input-methods \
${ESYSACTIONS} \
${PN}-config-default \
${PN}-images \
${PN}-icons \
${PN}-other \
${PN}-input-methods \
${ESYSACTIONS} \
"
FILES_${PN} = "\
${bindir}/* \
${libdir}/enlightenment/utils/* \
${libdir}/enlightenment/modules/*/*.* \
${libdir}/enlightenment/modules/*/*/* \
${libdir}/enlightenment/modules/*/*/.order \
${libdir}/enlightenment/modules/keyboards/ignore_built_in_keyboards \
${libdir}/enlightenment/*plugins/*/*/* \
${libdir}/enlightenment/preload/e_precache.so \
${datadir}/enlightenment/data/icons \
${datadir}/enlightenment/data/favorites \
${datadir}/enlightenment/data/input_methods \
${datadir}/enlightenment/data/config/profile.cfg \
${datadir}/enlightenment/AUTHORS \
${datadir}/enlightenment/COPYING \
${datadir}/xsessions/enlightenment.desktop \
${sysconfdir}/xdg \
${bindir}/* \
${libdir}/enlightenment/utils/* \
${libdir}/enlightenment/modules/*/*.* \
${libdir}/enlightenment/modules/*/*/* \
${libdir}/enlightenment/modules/*/*/.order \
${libdir}/enlightenment/modules/keyboards/ignore_built_in_keyboards \
${libdir}/enlightenment/*plugins/*/*/* \
${libdir}/enlightenment/preload/e_precache.so \
${datadir}/enlightenment/data/icons \
${datadir}/enlightenment/data/favorites \
${datadir}/enlightenment/data/input_methods \
${datadir}/enlightenment/data/config/profile.cfg \
${datadir}/enlightenment/AUTHORS \
${datadir}/enlightenment/COPYING \
${datadir}/xsessions/enlightenment.desktop \
${sysconfdir}/xdg \
"
FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
......@@ -148,53 +148,53 @@ FILES_${PN}-utils = "${libdir}/enlightenment/utils/*"
FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
FILES_efm-desktop-icon = "\
${datadir}/applications/efm.desktop \
${datadir}/applications/enlightenment_filemanager.desktop \
${datadir}/icons/e-module-fileman.png \
${datadir}/applications/efm.desktop \
${datadir}/applications/enlightenment_filemanager.desktop \
${datadir}/icons/e-module-fileman.png \
"
KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards"
FILES_illume-keyboard-default-alpha = "\
${KEYBOARDS_DIR}/Default.kbd \
${KEYBOARDS_DIR}/alpha.png \
${KEYBOARDS_DIR}/Default.kbd \
${KEYBOARDS_DIR}/alpha.png \
"
FILES_illume-keyboard-default-numeric = "\
${KEYBOARDS_DIR}/Numbers.kbd \
${KEYBOARDS_DIR}/numeric.png \
${KEYBOARDS_DIR}/Numbers.kbd \
${KEYBOARDS_DIR}/numeric.png \
"
FILES_illume-keyboard-default-terminal = "\
${KEYBOARDS_DIR}/Terminal.kbd \
${KEYBOARDS_DIR}/qwerty.png \
${KEYBOARDS_DIR}/Terminal.kbd \
${KEYBOARDS_DIR}/qwerty.png \
"
RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
RRECOMMENDS_${PN}-config-mobile = "\
illume-keyboard-default-alpha \
illume-keyboard-default-numeric \
illume-keyboard-default-terminal \
illume-keyboard-default-alpha \
illume-keyboard-default-numeric \
illume-keyboard-default-terminal \
"
RRECOMMENDS_${PN}-config-minimalist = "\
${PN}-background-light-gradient \
${PN}-theme-default \
${PN}-background-light-gradient \
${PN}-theme-default \
"
RRECOMMENDS_${PN}-config-netbook = "\
${PN}-background-dark-gradient \
${PN}-theme-default \
${PN}-background-dark-gradient \
${PN}-theme-default \
"
RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default"
RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default"
FILES_${PN}-dbg += "\
${libdir}/enlightenment/modules/*/*/.debug/ \
${libdir}/enlightenment/modules/policies/.debug/ \
${libdir}/enlightenment/preload/.debug/ \
${libdir}/enlightenment/utils/.debug/ \
${libdir}/enlightenment/*plugins/*/*/.debug \
${libdir}/enlightenment/modules/*/*/.debug/ \
${libdir}/enlightenment/modules/policies/.debug/ \
${libdir}/enlightenment/preload/.debug/ \
${libdir}/enlightenment/utils/.debug/ \
${libdir}/enlightenment/*plugins/*/*/.debug \
"
FILES_${PN}-doc += "\
${datadir}/enlightenment/doc \
${datadir}/enlightenment/doc \
"
CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
......
......@@ -7,9 +7,9 @@ SRCNAME = "enlightenment"
S = "${WORKDIR}/${SRCNAME}-${PV}"
SRC_URI = "\
${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
file://enlightenment_start.oe \
file://applications.menu \
${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
file://enlightenment_start.oe \
file://applications.menu \
"
SRC_URI[md5sum] = "e78018ba7a4622efbcbebd6d093b7fa4"
......
......@@ -10,7 +10,7 @@ SRCREV = "${EFL_SRCREV}"
S = "${WORKDIR}/${SRCNAME}"
SRC_URI = "\
${E_SVN}/trunk;module=${SRCNAME};protocol=http \
file://enlightenment_start.oe \
file://applications.menu \
${E_SVN}/trunk;module=${SRCNAME};protocol=http \
file://enlightenment_start.oe \
file://applications.menu \
"
......@@ -19,5 +19,5 @@ SRCREV = "${EFL_SRCREV}"
RDEPENDS_${PN} = "${PN}-themes"
do_configure_prepend() {
autopoint --force
autopoint --force
}
......@@ -18,12 +18,12 @@ RDEPENDS_${PN} += "\
gst-plugins-base-ogg gst-plugins-base-ivorbisdec \
gst-plugins-good-flac \
lightmediascanner-test \
"
"
inherit e gettext
SRC_URI = " \
${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
"
S = "${WORKDIR}/${SRCNAME}"
......@@ -32,11 +32,11 @@ PR = "r1"
FILES_${PN} += "${datadir}/icons/"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
"
do_configure_prepend() {
autopoint || touch config.rpath
autopoint || touch config.rpath
}
pkg_postinst_${PN} () {
......
......@@ -10,16 +10,16 @@ SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
S = "${WORKDIR}/${SRCNAME}"
do_configure_prepend() {
autopoint || touch config.rpath
autopoint || touch config.rpath
}
SRC_URI += "file://eve-theme-for-smaller-screens.patch \
"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
"
FILES_${PN} += "\
${datadir}/icons/eve.png \
${datadir}/icons/eve.png \
"
......@@ -21,7 +21,7 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj
${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj
}
do_install() {
......
......@@ -21,18 +21,18 @@ SRC_URI += "file://splashfuncs"
inherit update-rc.d
do_install_prepend() {
install -d ${D}/mnt/.splash/
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite
install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs
install -d ${D}${bindir}
ln -s exquisite-write ${D}${bindir}/splash-write
install -d ${D}/mnt/.splash/
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite
install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs
install -d ${D}${bindir}
ln -s exquisite-write ${D}${bindir}/splash-write
}
do_install_append() {
rm -rf ${D}${datadir}/exquisite/data/fonts/*
rm -rf ${D}${datadir}/exquisite/data/fonts/*
}
INITSCRIPT_NAME = "exquisite"
......
......@@ -10,11 +10,11 @@ INC_PR = "r2"
PE = "2"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
"
FILES_${PN} += "\
${datadir}/icons/terminology.png \
${datadir}/icons/terminology.png \
"
# doesn't start without own theme
......
......@@ -3,7 +3,7 @@ require ${BPN}.inc
PR = "${INC_PR}.0"
SRC_URI = "\
${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
"
SRC_URI[md5sum] = "7cecd058cb4509873412252477f2ce5b"
......
......@@ -15,14 +15,14 @@ BBCLASSEXTEND = "native"
EXTRA_OECONF += " --disable-mysql-tests"
do_configure_prepend_class-target() {
sed -i "s#\./lemon#${STAGING_BINDIR_NATIVE}/azy_lemon#g" ${S}/src/bin/Makefile.am
sed -i "s#\$(top_builddir)/src/bin/azy_parser -H -p -o#${STAGING_BINDIR_NATIVE}/azy_parser -H -p -o#g" ${S}/src/tests/Makefile.am
sed -i "s#\$(top_builddir)/src/bin/azy_parser -eHn -m#${STAGING_BINDIR_NATIVE}/azy_parser -eHn -m#g" ${S}/src/tests/identi.ca/Makefile.am
sed -i "s#\./lemon#${STAGING_BINDIR_NATIVE}/azy_lemon#g" ${S}/src/bin/Makefile.am
sed -i "s#\$(top_builddir)/src/bin/azy_parser -H -p -o#${STAGING_BINDIR_NATIVE}/azy_parser -H -p -o#g" ${S}/src/tests/Makefile.am
sed -i "s#\$(top_builddir)/src/bin/azy_parser -eHn -m#${STAGING_BINDIR_NATIVE}/azy_parser -eHn -m#g" ${S}/src/tests/identi.ca/Makefile.am
}
do_install_append_class-native() {
install -d ${D}/${bindir}
install -m 0755 ${S}/src/bin/lemon ${D}/${bindir}/azy_lemon
install -d ${D}/${bindir}
install -m 0755 ${S}/src/bin/lemon ${D}/${bindir}/azy_lemon
}
inherit efl
......
......@@ -35,12 +35,12 @@ PACKAGES =+ "\
${PN}-txt \
${PN}-x \
${PN}-input \
"
"
# Some upgrade path tweaking
AUTO_LIBNAME_PKGS = ""
FILES_${PN} = "${libdir}/libecore*.so.* \
${bindir} \
${bindir} \
"
FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
......@@ -51,7 +51,7 @@ FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*"
FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*"
FILES_${PN}-file = "${libdir}/libecore_file*.so.*"
FILES_${PN}-imf = "${libdir}/libecore_imf*.so.* \
${libdir}/ecore/immodules/*.so \
${libdir}/ecore/immodules/*.so \
"
FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*"
FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*"
......@@ -61,32 +61,32 @@ FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
ECORE_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-simple-x11 \
--enable-ecore-config \
--enable-ecore-x \
--enable-ecore-job \
--enable-ecore-fb \
--enable-ecore-evas \
--enable-ecore-evas-software-16-x11 \
--enable-ecore-evas-xrender \
--enable-abstract-sockets \
--enable-ecore-con \
--enable-ecore-ipc \
--enable-ecore-file \
--enable-inotify \
--disable-ecore-desktop \
--disable-ecore-x-xcb \
--disable-ecore-x-xprint \
--disable-ecore-directfb \
--disable-ecore-sdl \
--enable-ecore-evas-opengl-x11 \
--disable-ecore-evas-dfb \
--disable-ecore-evas-sdl \
--disable-openssl \
--disable-poll \
--enable-xim \
--x-includes=${STAGING_INCDIR}/X11 \