summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-dvb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-multimedia/recipes-dvb
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
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 <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-multimedia/recipes-dvb')
-rw-r--r--meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb54
-rw-r--r--meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb16
2 files changed, 35 insertions, 35 deletions
diff --git a/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
index c39acacb6..e259db678 100644
--- a/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
+++ b/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
@@ -10,36 +10,36 @@ SRCREV = "3fc7dfa68484"
10S = "${WORKDIR}/${BPN}" 10S = "${WORKDIR}/${BPN}"
11 11
12do_configure() { 12do_configure() {
13 sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh 13 sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
14} 14}
15 15
16do_install() { 16do_install() {
17 make DESTDIR=${D} install 17 make DESTDIR=${D} install
18 install -d ${D}/${bindir} 18 install -d ${D}/${bindir}
19 install -d ${D}/${docdir}/dvb-apps 19 install -d ${D}/${docdir}/dvb-apps
20 install -d ${D}/${docdir}/dvb-apps/scan 20 install -d ${D}/${docdir}/dvb-apps/scan
21 install -d ${D}/${docdir}/dvb-apps/szap 21 install -d ${D}/${docdir}/dvb-apps/szap
22 chmod a+rx ${D}/${libdir}/*.so* 22 chmod a+rx ${D}/${libdir}/*.so*
23 23
24 # Install tests 24 # Install tests
25 install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage 25 install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage
26 install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k 26 install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k
27 install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst 27 install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst
28 install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc 28 install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc
29 install -m 0755 ${S}/test/test_sections ${D}${bindir}/ 29 install -m 0755 ${S}/test/test_sections ${D}${bindir}/
30 install -m 0755 ${S}/test/test_av_play ${D}${bindir}/ 30 install -m 0755 ${S}/test/test_av_play ${D}${bindir}/
31 install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/ 31 install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/
32 install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/ 32 install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/
33 install -m 0755 ${S}/test/test_tt ${D}${bindir}/ 33 install -m 0755 ${S}/test/test_tt ${D}${bindir}/
34 install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/ 34 install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/
35 install -m 0755 ${S}/test/test_stc ${D}${bindir}/ 35 install -m 0755 ${S}/test/test_stc ${D}${bindir}/
36 install -m 0755 ${S}/test/test_av ${D}${bindir}/ 36 install -m 0755 ${S}/test/test_av ${D}${bindir}/
37 install -m 0755 ${S}/test/test_vevent ${D}${bindir}/ 37 install -m 0755 ${S}/test/test_vevent ${D}${bindir}/
38 install -m 0755 ${S}/test/test_pes ${D}${bindir}/ 38 install -m 0755 ${S}/test/test_pes ${D}${bindir}/
39 install -m 0755 ${S}/test/test_dvr ${D}${bindir}/ 39 install -m 0755 ${S}/test/test_dvr ${D}${bindir}/
40 40
41 cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ 41 cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
42 cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ 42 cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
43} 43}
44 44
45python populate_packages_prepend () { 45python populate_packages_prepend () {
diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
index 212bca16e..7c8b95935 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
@@ -8,23 +8,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746"
8 8
9SRC_URI = "git://github.com/tvheadend/tvheadend.git \ 9SRC_URI = "git://github.com/tvheadend/tvheadend.git \
10 file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \ 10 file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \
11 " 11"
12SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe" 12SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe"
13PV = "3.3" 13PV = "3.3"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17do_configure() { 17do_configure() {
18 ./configure --prefix=${prefix} \ 18 ./configure --prefix=${prefix} \
19 --libdir=${libdir} \ 19 --libdir=${libdir} \
20 --bindir=${bindir} \ 20 --bindir=${bindir} \
21 --datadir=${datadir} \ 21 --datadir=${datadir} \
22 --arch=${TARGET_ARCH} \ 22 --arch=${TARGET_ARCH} \
23 --disable-bundle 23 --disable-bundle
24} 24}
25 25
26do_install() { 26do_install() {
27 oe_runmake install DESTDIR=${D} 27 oe_runmake install DESTDIR=${D}
28} 28}
29 29
30FILES_${PN} += "${datadir}/${BPN}" 30FILES_${PN} += "${datadir}/${BPN}"