diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.6.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/iptables/iptables_1.6.2.bb b/meta/recipes-extended/iptables/iptables_1.6.2.bb index e00824f763..a57cac34eb 100644 --- a/meta/recipes-extended/iptables/iptables_1.6.2.bb +++ b/meta/recipes-extended/iptables/iptables_1.6.2.bb | |||
@@ -39,7 +39,7 @@ PACKAGES += "${PN}-modules" | |||
39 | PACKAGES_DYNAMIC += "^${PN}-module-.*" | 39 | PACKAGES_DYNAMIC += "^${PN}-module-.*" |
40 | 40 | ||
41 | python populate_packages_prepend() { | 41 | python populate_packages_prepend() { |
42 | modules = do_split_packages(d, '${libdir}/xtables', 'lib(.*)\.so$', '${PN}-module-%s', '${PN} module %s', extra_depends='') | 42 | modules = do_split_packages(d, '${libdir}/xtables', r'lib(.*)\.so$', '${PN}-module-%s', '${PN} module %s', extra_depends='') |
43 | if modules: | 43 | if modules: |
44 | metapkg = d.getVar('PN') + '-modules' | 44 | metapkg = d.getVar('PN') + '-modules' |
45 | d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) | 45 | d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) |
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb index adf77598d8..fb76a8bbb1 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb | |||
@@ -81,5 +81,5 @@ PACKAGES_DYNAMIC += "^lighttpd-module-.*" | |||
81 | 81 | ||
82 | python populate_packages_prepend () { | 82 | python populate_packages_prepend () { |
83 | lighttpd_libdir = d.expand('${libdir}') | 83 | lighttpd_libdir = d.expand('${libdir}') |
84 | do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') | 84 | do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') |
85 | } | 85 | } |
diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index 3aec2cdb4c..5c45460c3a 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb | |||
@@ -120,7 +120,7 @@ python populate_packages_prepend () { | |||
120 | pam_filterdir = d.expand('${base_libdir}/security/pam_filter') | 120 | pam_filterdir = d.expand('${base_libdir}/security/pam_filter') |
121 | pam_pkgname = mlprefix + 'pam-plugin%s' | 121 | pam_pkgname = mlprefix + 'pam-plugin%s' |
122 | 122 | ||
123 | do_split_packages(d, pam_libdir, '^pam(.*)\.so$', pam_pkgname, | 123 | do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, |
124 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') | 124 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') |
125 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') | 125 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') |
126 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') | 126 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') |
@@ -129,7 +129,7 @@ python populate_packages_prepend () { | |||
129 | pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') | 129 | pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') |
130 | pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') | 130 | pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') |
131 | pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') | 131 | pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') |
132 | do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') | 132 | do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') |
133 | } | 133 | } |
134 | 134 | ||
135 | do_install() { | 135 | do_install() { |