diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-11 17:33:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 10:24:50 +0100 |
| commit | bfd279de3275abbfaf3e630383ec244131e0375f (patch) | |
| tree | 0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/recipes-extended | |
| parent | 99203edda6f0b09d817454d656c100b7a8806b18 (diff) | |
| download | poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz | |
Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/cups/cups14.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp_20120401.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-23.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.5.bb | 44 |
5 files changed, 31 insertions, 31 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 9cae33c5b6..4f2b0a1dc4 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc | |||
| @@ -58,10 +58,10 @@ fakeroot do_install () { | |||
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | python do_package_append() { | 60 | python do_package_append() { |
| 61 | import subprocess | 61 | import subprocess |
| 62 | # Change permissions back the way they were, they probably had a reason... | 62 | # Change permissions back the way they were, they probably had a reason... |
| 63 | workdir = d.getVar('WORKDIR', True) | 63 | workdir = d.getVar('WORKDIR', True) |
| 64 | subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) | 64 | subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 67 | PACKAGES =+ "${PN}-lib ${PN}-libimage" |
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb index ea41d82267..85ea7083d0 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | |||
| @@ -59,6 +59,6 @@ CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" | |||
| 59 | PACKAGES_DYNAMIC = "lighttpd-module-*" | 59 | PACKAGES_DYNAMIC = "lighttpd-module-*" |
| 60 | 60 | ||
| 61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
| 62 | lighttpd_libdir = d.expand('${libdir}') | 62 | lighttpd_libdir = d.expand('${libdir}') |
| 63 | do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') | 63 | do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') |
| 64 | } | 64 | } |
diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb index 563bd58bf8..31babf9d3d 100644 --- a/meta/recipes-extended/ltp/ltp_20120401.bb +++ b/meta/recipes-extended/ltp/ltp_20120401.bb | |||
| @@ -49,7 +49,7 @@ FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/lt | |||
| 49 | TARGET_CC_ARCH += "${LDFLAGS}" | 49 | TARGET_CC_ARCH += "${LDFLAGS}" |
| 50 | 50 | ||
| 51 | do_unpack_append() { | 51 | do_unpack_append() { |
| 52 | bb.build.exec_func('do_extract_tarball', d) | 52 | bb.build.exec_func('do_extract_tarball', d) |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | do_extract_tarball() { | 55 | do_extract_tarball() { |
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb index b9a05c6fed..764955e576 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb | |||
| @@ -46,8 +46,8 @@ do_unpack[cleandirs] += "${S}" | |||
| 46 | 46 | ||
| 47 | # We invoke base do_patch at end, to incorporate any local patch | 47 | # We invoke base do_patch at end, to incorporate any local patch |
| 48 | python do_patch() { | 48 | python do_patch() { |
| 49 | bb.build.exec_func('nettools_do_patch', d) | 49 | bb.build.exec_func('nettools_do_patch', d) |
| 50 | bb.build.exec_func('patch_do_patch', d) | 50 | bb.build.exec_func('patch_do_patch', d) |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | do_configure() { | 53 | do_configure() { |
diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb index 275e5d8424..9274ed3832 100644 --- a/meta/recipes-extended/pam/libpam_1.1.5.bb +++ b/meta/recipes-extended/pam/libpam_1.1.5.bb | |||
| @@ -53,28 +53,28 @@ RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cr | |||
| 53 | RRECOMMENDS_${PN} = "libpam-runtime" | 53 | RRECOMMENDS_${PN} = "libpam-runtime" |
| 54 | 54 | ||
| 55 | python populate_packages_prepend () { | 55 | python populate_packages_prepend () { |
| 56 | import os.path | 56 | import os.path |
| 57 | 57 | ||
| 58 | def pam_plugin_append_file(pn, dir, file): | 58 | def pam_plugin_append_file(pn, dir, file): |
| 59 | nf = os.path.join(dir, file) | 59 | nf = os.path.join(dir, file) |
| 60 | of = d.getVar('FILES_' + pn, True) | 60 | of = d.getVar('FILES_' + pn, True) |
| 61 | if of: | 61 | if of: |
| 62 | nf = of + " " + nf | 62 | nf = of + " " + nf |
| 63 | d.setVar('FILES_' + pn, nf) | 63 | d.setVar('FILES_' + pn, nf) |
| 64 | 64 | ||
| 65 | dvar = bb.data.expand('${WORKDIR}/package', d, True) | 65 | dvar = bb.data.expand('${WORKDIR}/package', d, True) |
| 66 | pam_libdir = d.expand('${base_libdir}/security') | 66 | pam_libdir = d.expand('${base_libdir}/security') |
| 67 | pam_sbindir = d.expand('${sbindir}') | 67 | pam_sbindir = d.expand('${sbindir}') |
| 68 | pam_filterdir = d.expand('${base_libdir}/security/pam_filter') | 68 | pam_filterdir = d.expand('${base_libdir}/security/pam_filter') |
| 69 | 69 | ||
| 70 | do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='') | 70 | do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='') |
| 71 | pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd') | 71 | pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd') |
| 72 | pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_update') | 72 | pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_update') |
| 73 | pam_plugin_append_file('pam-plugin-tally', pam_sbindir, 'pam_tally') | 73 | pam_plugin_append_file('pam-plugin-tally', pam_sbindir, 'pam_tally') |
| 74 | pam_plugin_append_file('pam-plugin-tally2', pam_sbindir, 'pam_tally2') | 74 | pam_plugin_append_file('pam-plugin-tally2', pam_sbindir, 'pam_tally2') |
| 75 | pam_plugin_append_file('pam-plugin-timestamp', pam_sbindir, 'pam_timestamp_check') | 75 | pam_plugin_append_file('pam-plugin-timestamp', pam_sbindir, 'pam_timestamp_check') |
| 76 | pam_plugin_append_file('pam-plugin-mkhomedir', pam_sbindir, 'mkhomedir_helper') | 76 | pam_plugin_append_file('pam-plugin-mkhomedir', pam_sbindir, 'mkhomedir_helper') |
| 77 | do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') | 77 | do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | do_install() { | 80 | do_install() { |
