e2fsprogs-libs, util-linux-ng, pidgin: Use unique variable names in do_split_packages():

* see http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-May/011212.html for more

diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
index 8b214c1..5b82c11 100644 (file)
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -15,12 +15,12 @@ FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 FILES_${PN} = "${bindir}"
 
 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', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True)
-       do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev')
-       do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev')
-       do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True)
+       e2fs_libdir = bb.data.expand('${libdir}', d)
+       e2fs_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+       do_split_packages(d, e2fs_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True)
+       do_split_packages(d, e2fs_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev')
+       do_split_packages(d, e2fs_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev')
+       do_split_packages(d, e2fs_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True)
 }
 
 do_stage () {

diff --git a/recipes/pidgin/pidgin.inc b/recipes/pidgin/pidgin.inc
index 913cf1c..7b2f350 100644 (file)
--- a/recipes/pidgin/pidgin.inc
+++ b/recipes/pidgin/pidgin.inc
@@ -52,11 +52,11 @@ FILES_${PN}-dev += "${libdir}/${PN}/*.la"
 PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
 
 python populate_packages_prepend () {
-       root   = 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, root, '^([^l][^i][^b].*)\.so$',
+       do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$',
                output_pattern='pidgin-plugin-%s',
                description='Pidgin plugin %s',
                prepend=True, extra_depends='')

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 45fd1a6..9c70b9e 100644 (file)
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -123,12 +123,12 @@ do_install () {
 }
 
 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', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True)
-       do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev')
-       do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev')
-       do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True)
+       ulinxng_libdir = bb.data.expand('${libdir}', d)
+       ulinxng_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+       do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True)
+       do_split_packages(d, ulinxng_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev')
+       do_split_packages(d, ulinxng_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev')
+       do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True)
 }