From 5cb8258d15a64fcf73ce024acdbbb36de4db2fec Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 19 Jul 2012 14:05:34 +0000 Subject: recipes: convert tabs to 4 spaces in populate_packages Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- meta-oe/recipes-support/freerdp/freerdp.inc | 42 ++++++++++++------------- meta-oe/recipes-support/opencv/opencv_2.4.bb | 34 ++++++++++---------- meta-oe/recipes-support/pidgin/pidgin.inc | 46 ++++++++++++++-------------- 3 files changed, 61 insertions(+), 61 deletions(-) (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc index ec7d360594..46aecf6130 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}" PACKAGES_DYNAMIC = "libfreerdp-plugin-*" python populate_packages_prepend () { - freerdp_root = bb.data.expand('${libdir}/freerdp', d) - - do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-audin') - - do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') - - do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-tsmf') - - do_split_packages(d, freerdp_root, '^([^-]*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='') + freerdp_root = bb.data.expand('${libdir}/freerdp', d) + + do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-audin') + + do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') + + do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-tsmf') + + do_split_packages(d, freerdp_root, '^([^-]*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='') } diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 942e89a663..9cd454109e 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 " PACKAGES += "${PN}-apps python-opencv" python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = bb.data.getVar('PN', d, 1) - metapkg = pn + '-dev' - bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = bb.data.getVar('PACKAGES', d, 1).split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d) + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = bb.data.getVar('PN', d, 1) + metapkg = pn + '-dev' + bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = bb.data.getVar('PACKAGES', d, 1).split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d) } FILES_${PN} = "" diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc index db4753ed3d..90e2fd4b66 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" PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" python populate_packages_prepend () { - pidgroot = bb.data.expand('${libdir}/pidgin', d) - purple = bb.data.expand('${libdir}/purple-2', d) - finch = bb.data.expand('${libdir}/finch', d) + pidgroot = bb.data.expand('${libdir}/pidgin', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) - do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', - output_pattern='pidgin-plugin-%s', - description='Pidgin plugin %s', - prepend=True, extra_depends='') + do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True, extra_depends='') - do_split_packages(d, purple, '^lib(.*)\.so$', - output_pattern='libpurple-protocol-%s', - description='Libpurple protocol plugin for %s', - prepend=True, extra_depends='') + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True, extra_depends='') - do_split_packages(d, purple, '^(ssl-.*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='libpurple-plugin-ssl') + do_split_packages(d, purple, '^(ssl-.*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='') + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='') - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', - output_pattern='finch-plugin-%s', - description='Finch plugin %s', - prepend=True, extra_depends='') + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True, extra_depends='') } -- cgit 1.2.3-korg