diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-05-26 18:58:32 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-05-26 18:58:32 +0000 |
| commit | 3ac37564039127c80eb5cf109fddf23a8e438bf8 (patch) | |
| tree | ef4017a2959058d6543388e874492d2e0e863ddf | |
| parent | 685650a1c18e33967c9860ec9f04bff5e6812fb4 (diff) | |
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
| -rw-r--r-- | recipes/e2fsprogs-libs/e2fsprogs-libs.inc | 12 | ||||
| -rw-r--r-- | recipes/pidgin/pidgin.inc | 8 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng.inc | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 8b214c13bd..5b82c11ca1 100644 --- 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 913cf1c248..7b2f350ce2 100644 --- 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 45fd1a6048..9c70b9e3ff 100644 --- 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) } |