From 96a041c5e8d7c814b5b10fe7df09fb084994c972 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 18 Mar 2017 12:21:09 +0100 Subject: meta-toradex-demo: clean-up whitespace use Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes-core/systemd/systemd_%.bbappend | 4 +-- recipes-devtools/python/python_2.7.%.bbappend | 4 +-- .../gnome-disk-utility_3.21.3.bb | 10 +------- recipes-graphics/graphviz/graphviz_2.38.0.bb | 6 +++-- recipes-graphics/rdesktop/rdesktop.inc | 6 +++-- recipes-graphics/scrot/giblib_1.2.4.bb | 8 +++--- recipes-graphics/scrot/scrot_0.8.bb | 8 +++--- recipes-graphics/vnc/tightvnc_1.3.10.bb | 24 ++++++++++-------- .../codecgraph/codecgraph_20120114.bb | 2 +- .../gstreamer/gst-plugins-bad_0.10.23.bbappend | 2 +- recipes-multimedia/hda-verb/hda-verb_git.bb | 2 +- recipes-multimedia/mediainfo/mediainfo_0.7.62.bb | 4 +-- recipes-qt/qt5/qt5-x11-free-systemd.bb | 6 +++-- recipes-support/florence/florence_0.5.4.bb | 8 +++--- recipes-support/gpio-tool/gpio-tool.bb | 29 +++++++++++----------- recipes-support/mcc-pingpong/mcc-pingpong_1.0.bb | 8 +++--- .../trdx-oak-sensors/trdx-oak-sensors_0082.bb | 2 +- 17 files changed, 67 insertions(+), 66 deletions(-) diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index 8fbdc90..8130a38 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -1,8 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" -SRC_URI += " \ - file://rndis.network \ -" +SRC_URI += "file://rndis.network" PACKAGECONFIG_append = " networkd" diff --git a/recipes-devtools/python/python_2.7.%.bbappend b/recipes-devtools/python/python_2.7.%.bbappend index 28e5d9e..bc5c05e 100644 --- a/recipes-devtools/python/python_2.7.%.bbappend +++ b/recipes-devtools/python/python_2.7.%.bbappend @@ -8,9 +8,7 @@ PACKAGECONFIG[tkinter] = ",,tk" PACKAGECONFIG_remove_class-native = "tkinter" PACKAGECONFIG_remove_class-nativesdk = "tkinter" RDEPENDS_${PN}-tkinter_append += "${@bb.utils.contains('PACKAGECONFIG', 'tkinter', 'tcl tk', '', d)}" -SRC_URI += " \ - ${@bb.utils.contains('PACKAGECONFIG', 'tkinter', '', 'file://dont_build_tkinter.patch', d)} \ -" +SRC_URI += " ${@bb.utils.contains('PACKAGECONFIG', 'tkinter', '', 'file://dont_build_tkinter.patch', d)}" python __anonymous() { if not 'openembedded-layer' in d.getVar('BBFILE_COLLECTIONS', True): if 'tkinter' in d.getVar('PACKAGECONFIG', True): diff --git a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb index 60d014c..7400434 100644 --- a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb +++ b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb @@ -14,15 +14,7 @@ PR = "r4" inherit gnomebase gtk-icon-cache SRC_URI[archive.md5sum] = "265ed1aede9ef0570228ca6908e9df59" SRC_URI[archive.sha256sum] = "f39508226268f39dafa8977ebcec1d36e694f8aa7c4a404d1ac50f76e8e57739" -GNOME_COMPRESS_TYPE="xz" - -#SRC_URI += "\ -# file://disable-scrollkeeper.patch \ -# file://fix-dbus-interfaces.patch \ -# file://sysrooted-pkg-config.patch \ -# file://0001-Add-support-for-DeviceAutomountHint.patch \ -# file://0002-Require-libnotify-0.6.1.patch \ -#" +GNOME_COMPRESS_TYPE = "xz" EXTRA_OECONF += "--disable-gsd-plugin" diff --git a/recipes-graphics/graphviz/graphviz_2.38.0.bb b/recipes-graphics/graphviz/graphviz_2.38.0.bb index 776f46c..2001d79 100644 --- a/recipes-graphics/graphviz/graphviz_2.38.0.bb +++ b/recipes-graphics/graphviz/graphviz_2.38.0.bb @@ -4,8 +4,10 @@ HOMEPAGE = "http://www.graphviz.org" LICENSE = "EPL-1.0" DEPENDS = "cairo pango expat intltool-native gtk-doc gettext-native python" -SRC_URI = "http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-${PV}.tar.gz \ - file://cross_compile.patch" +SRC_URI = " \ + http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-${PV}.tar.gz \ + file://cross_compile.patch \ +" LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" SRC_URI[md5sum] = "5b6a829b2ac94efcd5fa3c223ed6d3ae" SRC_URI[sha256sum] = "81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e" diff --git a/recipes-graphics/rdesktop/rdesktop.inc b/recipes-graphics/rdesktop/rdesktop.inc index 078aae1..025c4e9 100644 --- a/recipes-graphics/rdesktop/rdesktop.inc +++ b/recipes-graphics/rdesktop/rdesktop.inc @@ -6,5 +6,7 @@ LICENSE = "GPL" INC_PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" -SRC_URI += "file://add_ioctl_serial_get_properties.patch" \ No newline at end of file +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ + file://add_ioctl_serial_get_properties.patch \ +" \ No newline at end of file diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb index fbcb6fa..4fedbfa 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "graphic/utils" SUMMARY = "giblib is a simple library which wraps imlib2" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE ="BSD" +LICENSE = "BSD" DEPENDS = "imlib2" @@ -9,8 +9,10 @@ MIRRORS_prepend () { http://linuxbrit.co.uk/downloads/ http://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/ } -SRC_URI = "http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \ - file://fix-giblib-binconfig-paths.patch " +SRC_URI = " \ + http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \ + file://fix-giblib-binconfig-paths.patch \ +" LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" SRC_URI[md5sum] = "c810ef5389baf24882a1caca2954385e" SRC_URI[sha256sum] = "176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac" diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb index 63b167a..7dd3ac2 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -2,7 +2,7 @@ SECTION = "graphic/utils" SUMMARY = "scrot (SCReen shOT), screen capture utility" DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE ="BSD" +LICENSE = "BSD" RDEPENDS_${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" @@ -11,8 +11,10 @@ MIRRORS_prepend () { http://linuxbrit.co.uk/downloads/ http://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/ } -SRC_URI = "http://linuxbrit.co.uk/downloads/scrot-${PV}.tar.gz \ - file://fix-scrot-include-paths.patch " +SRC_URI = " \ + http://linuxbrit.co.uk/downloads/scrot-${PV}.tar.gz \ + file://fix-scrot-include-paths.patch \ +" LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" SRC_URI[md5sum] = "ccae904d225609571bdd3b03445c1e88" SRC_URI[sha256sum] = "613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c98093994f2" diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 0962a03..537d7bd 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -8,9 +8,11 @@ DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-${PV}_unixsrc.tar.bz2 \ - file://Makefile \ - file://Vncviewer" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-${PV}_unixsrc.tar.bz2 \ + file://Makefile \ + file://Vncviewer \ +" S = "${WORKDIR}/vnc_unixsrc/vncviewer/" @@ -19,24 +21,24 @@ FILES_${PN}-viewer-dbg = "${bindir}/.debug" FILES_${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" do_compile () { - install ${WORKDIR}/Makefile ${S} - oe_runmake + install ${WORKDIR}/Makefile ${S} + oe_runmake } do_install () { - install -d ${D}${bindir} - install ${PN}viewer ${D}${bindir} - install -d ${D}${sysconfdir}/X11/app-defaults - install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer + install -d ${D}${bindir} + install ${PN}viewer ${D}${bindir} + install -d ${D}${sysconfdir}/X11/app-defaults + install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer } pkg_postinst_${PN}-viewer () { - update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 + update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 } pkg_prerm_${PN}-viewer () { - update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 + update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 } SRC_URI[md5sum] = "397b35faad32d5246b6d44b142f8304f" diff --git a/recipes-multimedia/codecgraph/codecgraph_20120114.bb b/recipes-multimedia/codecgraph/codecgraph_20120114.bb index 9630f7d..54d596a 100644 --- a/recipes-multimedia/codecgraph/codecgraph_20120114.bb +++ b/recipes-multimedia/codecgraph/codecgraph_20120114.bb @@ -2,7 +2,7 @@ SECTION = "multimedia" SUMMARY = "Tool to generate a graph of HDA codec config" DESCRIPTION = "Codecgraph is a tool to generate a graph based on the ALSA description of a High Definition Audio codec." HOMEPAGE = "http://helllabs.org/codecgraph/" -LICENSE ="GPLv2+" +LICENSE = "GPLv2+" RDEPENDS_${PN} = "python graphviz" SRC_URI = "http://helllabs.org/codecgraph/codecgraph-${PV}.tar.gz" diff --git a/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend b/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend index b6d6cce..c578581 100644 --- a/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend +++ b/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend @@ -1 +1 @@ -EXTRA_OECONF += "--disable-sdl" +EXTRA_OECONF += "--disable-sdl" diff --git a/recipes-multimedia/hda-verb/hda-verb_git.bb b/recipes-multimedia/hda-verb/hda-verb_git.bb index 27288fa..0d2f85d 100644 --- a/recipes-multimedia/hda-verb/hda-verb_git.bb +++ b/recipes-multimedia/hda-verb/hda-verb_git.bb @@ -1,7 +1,7 @@ SECTION = "multimedia" SUMMARY = "hda-verb sendS HD-audio commands to ALSA HDA devices" HOMEPAGE = "" -LICENSE ="GPLv2+" +LICENSE = "GPLv2+" SRCREV = "4bf54c5003af304e9da8ef40475a481086d80d85" SRC_URI = "git://git.alsa-project.org/alsa-tools.git;protocol=git" diff --git a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb index 6102ff7..ee78fc1 100644 --- a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb +++ b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb @@ -1,10 +1,10 @@ -HOMEPAGE="mediainfo.sourceforge.net" +HOMEPAGE = "mediainfo.sourceforge.net" SUMMARY = "Mediainfo is a tool to analyze multimedia files" LICENSE = "GPLv2_modified" inherit autotools -SRC_URI="http://mediaarea.net/download/binary/mediainfo/0.7.62/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" +SRC_URI = "http://mediaarea.net/download/binary/mediainfo/0.7.62/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" LIC_FILES_CHKSUM = "file://${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/License.html;md5=7f3735d23c6ef724bbd1475e4f82edcf" SRC_URI[md5sum] = "ba10422974111fdff5cf1bb38410c9a1" diff --git a/recipes-qt/qt5/qt5-x11-free-systemd.bb b/recipes-qt/qt5/qt5-x11-free-systemd.bb index 3bf66e9..95483e8 100644 --- a/recipes-qt/qt5/qt5-x11-free-systemd.bb +++ b/recipes-qt/qt5/qt5-x11-free-systemd.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d inherit allarch systemd -SRC_URI = "file://qt5-x11-demo.service \ - file://qt5-x11-demo-init " +SRC_URI = " \ + file://qt5-x11-demo.service \ + file://qt5-x11-demo-init \ +" do_install () { install -d ${D}/${bindir} diff --git a/recipes-support/florence/florence_0.5.4.bb b/recipes-support/florence/florence_0.5.4.bb index 7321a9c..28f7f64 100644 --- a/recipes-support/florence/florence_0.5.4.bb +++ b/recipes-support/florence/florence_0.5.4.bb @@ -10,9 +10,11 @@ PR = "r1" DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer" -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \ - file://fix-no-atspi-compile.patch \ - file://fix_garbled_titlebar.patch" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \ + file://fix-no-atspi-compile.patch \ + file://fix_garbled_titlebar.patch \ +" SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7" SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1" diff --git a/recipes-support/gpio-tool/gpio-tool.bb b/recipes-support/gpio-tool/gpio-tool.bb index f083be3..48846c1 100644 --- a/recipes-support/gpio-tool/gpio-tool.bb +++ b/recipes-support/gpio-tool/gpio-tool.bb @@ -7,9 +7,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "gtk+" -SRC_URI = "file://gpio-tool" -SRC_URI += "file://gpio-tool.desktop" -SRC_URI += "file://gpio-tool.png" +SRC_URI = " \ + file://gpio-tool \ + file://gpio-tool.desktop \ + file://gpio-tool.png \ +" PACKAGES = "${PN}" @@ -23,22 +25,19 @@ do_configure() { } do_install() { - install -d ${D}/${bindir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 755 ${WORKDIR}/gpio-tool ${D}/${bindir}/ - install -m 644 ${WORKDIR}/gpio-tool.desktop ${D}/${datadir}/applications/ - install -m 644 ${WORKDIR}/gpio-tool.png ${D}/${datadir}/pixmaps/ + install -d ${D}/${bindir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 755 ${WORKDIR}/gpio-tool ${D}/${bindir}/ + install -m 644 ${WORKDIR}/gpio-tool.desktop ${D}/${datadir}/applications/ + install -m 644 ${WORKDIR}/gpio-tool.png ${D}/${datadir}/pixmaps/ } pkg_postinst_${PN}() { - mkdir -p ${base_prefix}/home/root/Desktop - cp ${datadir}/applications/gpio-tool.desktop ${base_prefix}/home/root/Desktop/ + mkdir -p ${base_prefix}/home/root/Desktop + cp ${datadir}/applications/gpio-tool.desktop ${base_prefix}/home/root/Desktop/ } pkg_postrm_${PN}() { - rm -f ${base_prefix}/home/Desktop/gpio-tool.desktop + rm -f ${base_prefix}/home/Desktop/gpio-tool.desktop } - - - diff --git a/recipes-support/mcc-pingpong/mcc-pingpong_1.0.bb b/recipes-support/mcc-pingpong/mcc-pingpong_1.0.bb index bd80dcd..a4ae4be 100644 --- a/recipes-support/mcc-pingpong/mcc-pingpong_1.0.bb +++ b/recipes-support/mcc-pingpong/mcc-pingpong_1.0.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d" PR = "r0" SRC_URI = " \ - http://repository.timesys.com/buildsources/m/mcc-pingpong/mcc-pingpong-${PV}/mcc-pingpong-${PV}.tar.bz2 \ - file://update-mcc_free_buffer-call.patch \ - file://makefile-use-libs.patch \ + http://repository.timesys.com/buildsources/m/mcc-pingpong/mcc-pingpong-${PV}/mcc-pingpong-${PV}.tar.bz2 \ + file://update-mcc_free_buffer-call.patch \ + file://makefile-use-libs.patch \ " SRC_URI[md5sum] = "a03417c37f97849baa794e37d88e0cd2" @@ -20,7 +20,7 @@ CFLAGS += "-I${STAGING_KERNEL_DIR}/include" DEPENDS = "libmcc" do_install (){ - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} install } COMPATIBLE_MACHINE = "(vf60)" diff --git a/recipes-support/trdx-oak-sensors/trdx-oak-sensors_0082.bb b/recipes-support/trdx-oak-sensors/trdx-oak-sensors_0082.bb index f3e8017..fc13b98 100644 --- a/recipes-support/trdx-oak-sensors/trdx-oak-sensors_0082.bb +++ b/recipes-support/trdx-oak-sensors/trdx-oak-sensors_0082.bb @@ -1,7 +1,7 @@ SUMMARY = "Sample code to access the toradex oak sensors" LICENSE = "PD" -S="${WORKDIR}/OakLinux_${PV}" +S = "${WORKDIR}/OakLinux_${PV}" SRC_URI = "http://files.toradex.com/Oak/Linux/OakLinux_${PV}.tar.bz2" -- cgit v1.2.3