[OE-core] [PATCHv2 7/8] bluez5: cleanup tabs and spaces
Khem Raj
raj.khem at gmail.com
Mon Apr 17 22:08:26 UTC 2017
python code uses spaces but shell code uses tabs for OE-Core. I know
its confusing but thats how it is see the style guide for more details
http://www.openembedded.org/wiki/Styleguide
On Mon, Apr 17, 2017 at 6:38 AM, Marc Ferland <ferlandm at amotus.ca> wrote:
> Signed-off-by: Marc Ferland <ferlandm at amotus.ca>
> ---
> meta/recipes-connectivity/bluez5/bluez5.inc | 56 ++++++++++++++---------------
> 1 file changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
> index 47d8f22..98fb9b3 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -52,29 +52,29 @@ NOINST_TOOLS = " \
> "
>
> do_install_append() {
> - install -d ${D}${INIT_D_DIR}
> - install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
> -
> - install -d ${D}${sysconfdir}/bluetooth/
> - if [ -f ${S}/profiles/network/network.conf ]; then
> - install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
> - fi
> - if [ -f ${S}/profiles/input/input.conf ]; then
> - install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
> - fi
> -
> - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
> - sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
> - fi
> -
> - # Install desired tools that upstream leaves in build area
> - for f in ${NOINST_TOOLS} ; do
> - install -m 755 ${B}/$f ${D}/${bindir}
> - done
> -
> - # Patch python tools to use Python 3; they should be source compatible, but
> - # still refer to Python 2 in the shebang
> - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
> + install -d ${D}${INIT_D_DIR}
> + install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
> +
> + install -d ${D}${sysconfdir}/bluetooth/
> + if [ -f ${S}/profiles/network/network.conf ]; then
> + install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
> + fi
> + if [ -f ${S}/profiles/input/input.conf ]; then
> + install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
> + fi
> +
> + if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
> + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
> + fi
> +
> + # Install desired tools that upstream leaves in build area
> + for f in ${NOINST_TOOLS} ; do
> + install -m 755 ${B}/$f ${D}/${bindir}
> + done
> +
> + # Patch python tools to use Python 3; they should be source compatible, but
> + # still refer to Python 2 in the shebang
> + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
> }
>
> PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
> @@ -84,8 +84,8 @@ FILES_${PN} += " \
> ${systemd_unitdir}/ ${datadir}/dbus-1 \
> ${libdir}/cups \
> "
> -FILES_${PN}-dev += "\
> - ${libdir}/bluetooth/plugins/*.la \
> +FILES_${PN}-dev += " \
> + ${libdir}/bluetooth/plugins/*.la \
> "
>
> FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
> @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth"
> EXCLUDE_FROM_WORLD = "1"
>
> do_compile_ptest() {
> - oe_runmake buildtests
> + oe_runmake buildtests
> }
>
> do_install_ptest() {
> - cp -r ${B}/unit/ ${D}${PTEST_PATH}
> - rm -f ${D}${PTEST_PATH}/unit/*.o
> + cp -r ${B}/unit/ ${D}${PTEST_PATH}
> + rm -f ${D}${PTEST_PATH}/unit/*.o
> }
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
More information about the Openembedded-core
mailing list