diff options
| -rw-r--r-- | recipes-extended/webmin/webmin_1.570.bb | 22 | ||||
| -rw-r--r-- | recipes-multimedia/orc/orc.inc | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb index c09bbac..cf52030 100644 --- a/recipes-extended/webmin/webmin_1.570.bb +++ b/recipes-extended/webmin/webmin_1.570.bb @@ -123,17 +123,17 @@ RRECOMMENDS_webmin-module-fdisk = "parted" RRECOMMENDS_webmin-module-lvm = "lvm2" python populate_packages_prepend() { - import os, os.path - - wadir = bb.data.expand('${libexecdir}/webmin', d) - wadir_image = bb.data.expand('${D}', d) + wadir - modules = [] - for mod in os.listdir(wadir_image): - modinfo = os.path.join(wadir_image, mod, "module.info") - if os.path.exists(modinfo): - modules.append(mod) - - do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True) + import os, os.path + + wadir = bb.data.expand('${libexecdir}/webmin', d) + wadir_image = bb.data.expand('${D}', d) + wadir + modules = [] + for mod in os.listdir(wadir_image): + modinfo = os.path.join(wadir_image, mod, "module.info") + if os.path.exists(modinfo): + modules.append(mod) + + do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True) } # Time-savers diff --git a/recipes-multimedia/orc/orc.inc b/recipes-multimedia/orc/orc.inc index 3fb2371..e149a9b 100644 --- a/recipes-multimedia/orc/orc.inc +++ b/recipes-multimedia/orc/orc.inc @@ -14,8 +14,8 @@ FILES_orc-examples = "${libdir}/orc/*" FILES_${PN} = "${bindir}/*" python populate_packages_prepend () { - libdir = bb.data.expand('${libdir}', d) - do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) + libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) } do_compile_prepend_virtclass-native () { |