mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-25 19:27:14 +00:00
Code Issues Projects Releases Wiki Activity

recipes: Unify indentation

Browse Source 
* 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 <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Martin Jansa
2013-04-13 22:49:41 +02:00
parent 6f48cf899a
commit a45830a39b
468 changed files with 3520 additions and 3526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
+2 -2
View File
@@ -16,6 +16,6 @@ FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
gupnp_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/
}
meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
+3 -3
View File
@@ -1,5 +1,5 @@
do_configure_prepend () {
# Vala needs gobject-introspection so won't work. Instead of depending
# on vala-native just to run configure, comment out the Vala macro.
sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac
# Vala needs gobject-introspection so won't work. Instead of depending
# on vala-native just to run configure, comment out the Vala macro.
sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac
}
meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
+25 -25
View File
@@ -10,36 +10,36 @@ SRCREV = "3fc7dfa68484"
S = "${WORKDIR}/${BPN}"
do_configure() {
sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
}
do_install() {
make DESTDIR=${D} install
install -d ${D}/${bindir}
install -d ${D}/${docdir}/dvb-apps
install -d ${D}/${docdir}/dvb-apps/scan
install -d ${D}/${docdir}/dvb-apps/szap
chmod a+rx ${D}/${libdir}/*.so*
make DESTDIR=${D} install
install -d ${D}/${bindir}
install -d ${D}/${docdir}/dvb-apps
install -d ${D}/${docdir}/dvb-apps/scan
install -d ${D}/${docdir}/dvb-apps/szap
chmod a+rx ${D}/${libdir}/*.so*
# Install tests
install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage
install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k
install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst
install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc
install -m 0755 ${S}/test/test_sections ${D}${bindir}/
install -m 0755 ${S}/test/test_av_play ${D}${bindir}/
install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/
install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/
install -m 0755 ${S}/test/test_tt ${D}${bindir}/
install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/
install -m 0755 ${S}/test/test_stc ${D}${bindir}/
install -m 0755 ${S}/test/test_av ${D}${bindir}/
install -m 0755 ${S}/test/test_vevent ${D}${bindir}/
install -m 0755 ${S}/test/test_pes ${D}${bindir}/
install -m 0755 ${S}/test/test_dvr ${D}${bindir}/
# Install tests
install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage
install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k
install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst
install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc
install -m 0755 ${S}/test/test_sections ${D}${bindir}/
install -m 0755 ${S}/test/test_av_play ${D}${bindir}/
install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/
install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/
install -m 0755 ${S}/test/test_tt ${D}${bindir}/
install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/
install -m 0755 ${S}/test/test_stc ${D}${bindir}/
install -m 0755 ${S}/test/test_av ${D}${bindir}/
install -m 0755 ${S}/test/test_vevent ${D}${bindir}/
install -m 0755 ${S}/test/test_pes ${D}${bindir}/
install -m 0755 ${S}/test/test_dvr ${D}${bindir}/
cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
}
python populate_packages_prepend () {
meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+8 -8
View File
@@ -8,23 +8,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746"
SRC_URI = "git://github.com/tvheadend/tvheadend.git \
file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \
"
"
SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe"
PV = "3.3"
S = "${WORKDIR}/git"
do_configure() {
./configure --prefix=${prefix} \
--libdir=${libdir} \
--bindir=${bindir} \
--datadir=${datadir} \
--arch=${TARGET_ARCH} \
--disable-bundle
./configure --prefix=${prefix} \
--libdir=${libdir} \
--bindir=${bindir} \
--datadir=${datadir} \
--arch=${TARGET_ARCH} \
--disable-bundle
}
do_install() {
oe_runmake install DESTDIR=${D}
oe_runmake install DESTDIR=${D}
}
FILES_${PN} += "${datadir}/${BPN}"
meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+18 -18
View File
@@ -16,23 +16,23 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \
file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \
file://configure.in-Avoid-running-code.patch \
"
"
inherit autotools gettext python-dir
S = "${WORKDIR}/git"
CACHED_CONFIGUREVARS += " \
ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
"
EXTRA_OECONF = " \
--disable-rpath \
--enable-gles \
--enable-libusb \
--enable-airplay \
--disable-optical-drive \
--enable-external-libraries \
--disable-rpath \
--enable-gles \
--enable-libusb \
--enable-airplay \
--disable-optical-drive \
--enable-external-libraries \
"
FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
@@ -48,27 +48,27 @@ export STAGING_INCDIR
export PYTHON_DIR
do_configure() {
sh bootstrap
oe_runconf
sh bootstrap
oe_runconf
}
PARALLEL_MAKE = ""
do_compile_prepend() {
for i in $(find . -name "Makefile") ; do
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
done
for i in $(find . -name "Makefile") ; do
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
done
for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
done
for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
done
}
INSANE_SKIP_${PN} = "rpaths"
# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly
do_install_append_arm() {
sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
}
FILES_${PN} += "${datadir}/xsessions ${datadir}/icons"
@@ -81,5 +81,5 @@ RRECOMMENDS_${PN}_append = " libcec \
python-re \
python-netclient \
libcurl \
"
"
RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb
+15 -15
View File
@@ -7,25 +7,25 @@ SRC_URI[md5sum] = "726cc2bd1a525929ff35ff9854c0ebab"
SRC_URI[sha256sum] = "476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5"
do_compile() {
cd ${S}/make/linux
oe_runmake CROSS="${TARGET_PREFIX}"
cd ${S}/make/linux
oe_runmake CROSS="${TARGET_PREFIX}"
}
do_install() {
cd ${S}/make/linux
cd ${S}/make/linux
install -d ${D}${libdir}
install -m 0644 libebml.a ${D}${libdir}
install -m 0755 libebml.so.* ${D}${libdir}
cp -a libebml.so ${D}${libdir}
install -d ${D}${libdir}
install -m 0644 libebml.a ${D}${libdir}
install -m 0755 libebml.so.* ${D}${libdir}
cp -a libebml.so ${D}${libdir}
install -d ${D}${includedir}/ebml
for i in ../../ebml/*.h; do
install -m 0644 $i ${D}${includedir}/ebml
done
install -d ${D}${includedir}/ebml
for i in ../../ebml/*.h; do
install -m 0644 $i ${D}${includedir}/ebml
done
install -d ${D}${includedir}/ebml/c
for i in ../../ebml/c/*.h; do
install -m 0644 $i ${D}${includedir}/ebml/c
done
install -d ${D}${includedir}/ebml/c
for i in ../../ebml/c/*.h; do
install -m 0644 $i ${D}${includedir}/ebml/c
done
}
meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb
+15 -15
View File
@@ -9,25 +9,25 @@ SRC_URI[md5sum] = "f4a8c411f09d39c754eb726efd616043"
SRC_URI[sha256sum] = "5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69"
do_compile() {
cd ${S}/make/linux
oe_runmake CROSS="${TARGET_PREFIX}"
cd ${S}/make/linux
oe_runmake CROSS="${TARGET_PREFIX}"
}
do_install() {
cd ${S}/make/linux
cd ${S}/make/linux
install -d ${D}${libdir}
install -m 0644 libmatroska.a ${D}${libdir}
install -m 0755 libmatroska.so.* ${D}${libdir}
cp -a libmatroska.so ${D}${libdir}
install -d ${D}${libdir}
install -m 0644 libmatroska.a ${D}${libdir}
install -m 0755 libmatroska.so.* ${D}${libdir}
cp -a libmatroska.so ${D}${libdir}
install -d ${D}${includedir}/matroska
for i in ../../matroska/*.h; do
install -m 0644 $i ${D}${includedir}/matroska
done
install -d ${D}${includedir}/matroska
for i in ../../matroska/*.h; do
install -m 0644 $i ${D}${includedir}/matroska
done
install -d ${D}${includedir}/matroska/c
for i in ../../matroska/c/*.h; do
install -m 0644 $i ${D}${includedir}/matroska/c
done
install -d ${D}${includedir}/matroska/c
for i in ../../matroska/c/*.h; do
install -m 0644 $i ${D}${includedir}/matroska/c
done
}
meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
+4 -4
View File
@@ -13,18 +13,18 @@ SRC_URI[sha256sum] = "d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4e
inherit autotools
EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
"
"
# remove some hardcoded searchpaths
do_configure_prepend() {
sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4
sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4
}
# Yeah, no makefile
do_compile() {
./drake
./drake
}
do_install() {
./drake install DESTDIR=${D}
./drake install DESTDIR=${D}
}
meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb
+2 -2
View File
@@ -14,8 +14,8 @@ SRC_URI[sha256sum] = "9cdee47bbbfa3de5aaa5cf3fc9e208ccd97e5079f6d8fa84a6d1f24a1b
inherit autotools
do_install_append() {
install -d ${D}${bindir}
install -m 0755 dms-info ${D}${bindir}
install -d ${D}${bindir}
install -m 0755 dms-info ${D}${bindir}
}
PACKAGES =+ "${PN}-tests"
meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
+2 -2
View File
@@ -14,8 +14,8 @@ SRC_URI[sha256sum] = "d6623d98dd35ee32bc08349b4a22d12101dda38a2ece1e468ff0160e51
inherit autotools
do_install_append() {
install -d ${D}${bindir}
install -m 0755 test/rendererconsole.py ${D}${bindir}
install -d ${D}${bindir}
install -m 0755 test/rendererconsole.py ${D}${bindir}
}
PACKAGES =+ "${PN}-tests"
meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
+6 -6
View File
@@ -20,10 +20,10 @@ S = "${WORKDIR}/mpg123-${PV}"
inherit autotools pkgconfig
EXTRA_OECONF = " \
--enable-shared \
${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \
"
--enable-shared \
${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \
"
meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
+2 -2
View File
@@ -7,7 +7,7 @@ inherit cmake
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
"
"
SRC_URI = "http://kcat.strangesoft.net/openal-releases/${PN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71"
@@ -15,6 +15,6 @@ SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de523
EXTRA_OECMAKE = "-DALSA=${@base_contains('DISTRO_FEATURES', 'alsa', 'TRUE', 'FALSE', d)} \
-DPULSEAUDIO=${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'TRUE', 'FALSE', d)} \
"
"
FILES_${PN} += "${datadir}/openal"
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+1 -1
View File
@@ -10,7 +10,7 @@ PR = "r1"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
"
"
PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio,"
PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib,"