summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-07-19 14:05:34 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-19 16:26:18 +0200
commit5cb8258d15a64fcf73ce024acdbbb36de4db2fec (patch)
treee9354fdda9992af192d77e247183c79b86d3cc72 /meta-oe
parent3770f2bbee2f27a56075d3561174d00080605703 (diff)
downloadmeta-openembedded-5cb8258d15a64fcf73ce024acdbbb36de4db2fec.tar.gz
recipes: convert tabs to 4 spaces in populate_packages
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb4
-rw-r--r--meta-oe/recipes-devtools/orc/orc.inc4
-rw-r--r--meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb6
-rw-r--r--meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb4
-rw-r--r--meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb6
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp.inc42
-rw-r--r--meta-oe/recipes-support/opencv/opencv_2.4.bb34
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin.inc46
8 files changed, 73 insertions, 73 deletions
diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
index 09e11f997..00030d3b2 100644
--- a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
+++ b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
@@ -29,8 +29,8 @@ EXTRA_OECONF = "\
29# enable pulse again when pulseaudio >= 0.9.11 is the default in OE 29# enable pulse again when pulseaudio >= 0.9.11 is the default in OE
30 30
31python populate_packages_prepend() { 31python populate_packages_prepend() {
32 plugindir = bb.data.expand('${libdir}/${P}/', d) 32 plugindir = bb.data.expand('${libdir}/${P}/', d)
33 do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) 33 do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
34} 34}
35 35
36PACKAGES =+ "${PN}-gtk" 36PACKAGES =+ "${PN}-gtk"
diff --git a/meta-oe/recipes-devtools/orc/orc.inc b/meta-oe/recipes-devtools/orc/orc.inc
index c599126e3..6efe02564 100644
--- a/meta-oe/recipes-devtools/orc/orc.inc
+++ b/meta-oe/recipes-devtools/orc/orc.inc
@@ -16,8 +16,8 @@ FILES_orc-examples = "${libdir}/orc/*"
16FILES_${PN} = "${bindir}/*" 16FILES_${PN} = "${bindir}/*"
17 17
18python populate_packages_prepend () { 18python populate_packages_prepend () {
19 libdir = bb.data.expand('${libdir}', d) 19 libdir = bb.data.expand('${libdir}', d)
20 do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) 20 do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True)
21} 21}
22 22
23do_compile_prepend_virtclass-native () { 23do_compile_prepend_virtclass-native () {
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
index ac00046b4..0d0388988 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
@@ -23,9 +23,9 @@ PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome"
23PACKAGES_DYNAMIC += "${PN}-theme-*" 23PACKAGES_DYNAMIC += "${PN}-theme-*"
24 24
25python populate_packages_prepend() { 25python populate_packages_prepend() {
26 theme_dir = bb.data.expand('${datadir}/themes/', d) 26 theme_dir = bb.data.expand('${datadir}/themes/', d)
27 theme_name = bb.data.expand('${PN}-theme-%s', d) 27 theme_name = bb.data.expand('${PN}-theme-%s', d)
28 do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) 28 do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True)
29} 29}
30 30
31RDEPENDS_${PN} += "${PN}-core" 31RDEPENDS_${PN} += "${PN}-core"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
index ab9be352b..79920ce1f 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}
9S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" 9S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}"
10 10
11python populate_packages_prepend() { 11python populate_packages_prepend() {
12 plugindir = bb.data.expand('${datadir}/fonts/ttf-mplus/', d) 12 plugindir = bb.data.expand('${datadir}/fonts/ttf-mplus/', d)
13 do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s', extra_depends = "ttf-common") 13 do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s', extra_depends = "ttf-common")
14} 14}
15 15
16do_install() { 16do_install() {
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb
index 3d231e0f1..bff53124a 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access." 1ESCRIPTION = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access."
2HOMEPAGE = "http://www.gnu.org/software/libcdio/" 2HOMEPAGE = "http://www.gnu.org/software/libcdio/"
3SECTION = "libs" 3SECTION = "libs"
4 4
@@ -22,7 +22,7 @@ FILES_${PN} = "${libdir}/${PN}${SOLIB}"
22FILES_${PN}-utils = "${bindir}/*" 22FILES_${PN}-utils = "${bindir}/*"
23 23
24python populate_packages_prepend () { 24python populate_packages_prepend () {
25 glibdir = bb.data.expand('${libdir}', d) 25 glibdir = bb.data.expand('${libdir}', d)
26 do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) 26 do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
27} 27}
28 28
diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc
index ec7d36059..46aecf613 100644
--- a/meta-oe/recipes-support/freerdp/freerdp.inc
+++ b/meta-oe/recipes-support/freerdp/freerdp.inc
@@ -26,25 +26,25 @@ FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
26PACKAGES_DYNAMIC = "libfreerdp-plugin-*" 26PACKAGES_DYNAMIC = "libfreerdp-plugin-*"
27 27
28python populate_packages_prepend () { 28python populate_packages_prepend () {
29 freerdp_root = bb.data.expand('${libdir}/freerdp', d) 29 freerdp_root = bb.data.expand('${libdir}/freerdp', d)
30 30
31 do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', 31 do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
32 output_pattern='libfreerdp-plugin-%s', 32 output_pattern='libfreerdp-plugin-%s',
33 description='FreeRDP plugin %s', 33 description='FreeRDP plugin %s',
34 prepend=True, extra_depends='libfreerdp-plugin-audin') 34 prepend=True, extra_depends='libfreerdp-plugin-audin')
35 35
36 do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', 36 do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
37 output_pattern='libfreerdp-plugin-%s', 37 output_pattern='libfreerdp-plugin-%s',
38 description='FreeRDP plugin %s', 38 description='FreeRDP plugin %s',
39 prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') 39 prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
40 40
41 do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', 41 do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
42 output_pattern='libfreerdp-plugin-%s', 42 output_pattern='libfreerdp-plugin-%s',
43 description='FreeRDP plugin %s', 43 description='FreeRDP plugin %s',
44 prepend=True, extra_depends='libfreerdp-plugin-tsmf') 44 prepend=True, extra_depends='libfreerdp-plugin-tsmf')
45 45
46 do_split_packages(d, freerdp_root, '^([^-]*)\.so$', 46 do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
47 output_pattern='libfreerdp-plugin-%s', 47 output_pattern='libfreerdp-plugin-%s',
48 description='FreeRDP plugin %s', 48 description='FreeRDP plugin %s',
49 prepend=True, extra_depends='') 49 prepend=True, extra_depends='')
50} 50}
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 942e89a66..9cd454109 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -39,23 +39,23 @@ TARGET_CC_ARCH += "-I${S}/include "
39PACKAGES += "${PN}-apps python-opencv" 39PACKAGES += "${PN}-apps python-opencv"
40 40
41python populate_packages_prepend () { 41python populate_packages_prepend () {
42 cv_libdir = bb.data.expand('${libdir}', d) 42 cv_libdir = bb.data.expand('${libdir}', d)
43 cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) 43 cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
44 do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) 44 do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
45 do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 45 do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
46 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 46 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
47 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) 47 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
48 48
49 pn = bb.data.getVar('PN', d, 1) 49 pn = bb.data.getVar('PN', d, 1)
50 metapkg = pn + '-dev' 50 metapkg = pn + '-dev'
51 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) 51 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
52 blacklist = [ metapkg ] 52 blacklist = [ metapkg ]
53 metapkg_rdepends = [ ] 53 metapkg_rdepends = [ ]
54 packages = bb.data.getVar('PACKAGES', d, 1).split() 54 packages = bb.data.getVar('PACKAGES', d, 1).split()
55 for pkg in packages[1:]: 55 for pkg in packages[1:]:
56 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): 56 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'):
57 metapkg_rdepends.append(pkg) 57 metapkg_rdepends.append(pkg)
58 bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d) 58 bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
59} 59}
60 60
61FILES_${PN} = "" 61FILES_${PN} = ""
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc
index db4753ed3..90e2fd4b6 100644
--- a/meta-oe/recipes-support/pidgin/pidgin.inc
+++ b/meta-oe/recipes-support/pidgin/pidgin.inc
@@ -59,32 +59,32 @@ FILES_${PN}-dev += "${libdir}/${PN}/*.la"
59PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" 59PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
60 60
61python populate_packages_prepend () { 61python populate_packages_prepend () {
62 pidgroot = bb.data.expand('${libdir}/pidgin', d) 62 pidgroot = bb.data.expand('${libdir}/pidgin', d)
63 purple = bb.data.expand('${libdir}/purple-2', d) 63 purple = bb.data.expand('${libdir}/purple-2', d)
64 finch = bb.data.expand('${libdir}/finch', d) 64 finch = bb.data.expand('${libdir}/finch', d)
65 65
66 do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', 66 do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$',
67 output_pattern='pidgin-plugin-%s', 67 output_pattern='pidgin-plugin-%s',
68 description='Pidgin plugin %s', 68 description='Pidgin plugin %s',
69 prepend=True, extra_depends='') 69 prepend=True, extra_depends='')
70 70
71 do_split_packages(d, purple, '^lib(.*)\.so$', 71 do_split_packages(d, purple, '^lib(.*)\.so$',
72 output_pattern='libpurple-protocol-%s', 72 output_pattern='libpurple-protocol-%s',
73 description='Libpurple protocol plugin for %s', 73 description='Libpurple protocol plugin for %s',
74 prepend=True, extra_depends='') 74 prepend=True, extra_depends='')
75 75
76 do_split_packages(d, purple, '^(ssl-.*)\.so$', 76 do_split_packages(d, purple, '^(ssl-.*)\.so$',
77 output_pattern='libpurple-plugin-%s', 77 output_pattern='libpurple-plugin-%s',
78 description='libpurple plugin %s', 78 description='libpurple plugin %s',
79 prepend=True, extra_depends='libpurple-plugin-ssl') 79 prepend=True, extra_depends='libpurple-plugin-ssl')
80 80
81 do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', 81 do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
82 output_pattern='libpurple-plugin-%s', 82 output_pattern='libpurple-plugin-%s',
83 description='libpurple plugin %s', 83 description='libpurple plugin %s',
84 prepend=True, extra_depends='') 84 prepend=True, extra_depends='')
85 85
86 do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', 86 do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
87 output_pattern='finch-plugin-%s', 87 output_pattern='finch-plugin-%s',
88 description='Finch plugin %s', 88 description='Finch plugin %s',
89 prepend=True, extra_depends='') 89 prepend=True, extra_depends='')
90} 90}