diff options
author | Changqing Li <changqing.li@windriver.com> | 2021-01-12 14:41:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-13 23:13:46 +0000 |
commit | e5b5c38a76bbf3f56353954bdc65fa8736ed76bf (patch) | |
tree | c9179db97796775222cbff837b36172c1f72ff1e /meta/recipes-extended | |
parent | 21eb51e2a8d4063c636de8ffdfdf1768740edea0 (diff) | |
download | poky-e5b5c38a76bbf3f56353954bdc65fa8736ed76bf.tar.gz |
libpam: remove unused code
from commit b0384720a46fb25c4ad180e3f256ffdeb53dc8a6,
which upgrade libpam to 1.5.1, packaging is adjustd,
and the binary is packaged into libpam-runtime, so we
don't need to append them to pam-plugin-xxx.
(From OE-Core rev: 7b5a53152c0213f5efcf39c2442bb3b630f8cc09)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.1.bb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.5.1.bb index 8c008a9701..d6612bb936 100644 --- a/meta/recipes-extended/pam/libpam_1.5.1.bb +++ b/meta/recipes-extended/pam/libpam_1.5.1.bb | |||
@@ -82,13 +82,6 @@ RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" | |||
82 | RRECOMMENDS_${PN}_class-native = "" | 82 | RRECOMMENDS_${PN}_class-native = "" |
83 | 83 | ||
84 | python populate_packages_prepend () { | 84 | python populate_packages_prepend () { |
85 | def pam_plugin_append_file(pn, dir, file): | ||
86 | nf = os.path.join(dir, file) | ||
87 | of = d.getVar('FILES_' + pn) | ||
88 | if of: | ||
89 | nf = of + " " + nf | ||
90 | d.setVar('FILES_' + pn, nf) | ||
91 | |||
92 | def pam_plugin_hook(file, pkg, pattern, format, basename): | 85 | def pam_plugin_hook(file, pkg, pattern, format, basename): |
93 | pn = d.getVar('PN') | 86 | pn = d.getVar('PN') |
94 | libpam_suffix = d.getVar('libpam_suffix') | 87 | libpam_suffix = d.getVar('libpam_suffix') |
@@ -116,13 +109,6 @@ python populate_packages_prepend () { | |||
116 | 109 | ||
117 | do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, | 110 | do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, |
118 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') | 111 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') |
119 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') | ||
120 | pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') | ||
121 | pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') | ||
122 | pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') | ||
123 | pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') | ||
124 | pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') | ||
125 | pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') | ||
126 | do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') | 112 | do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') |
127 | } | 113 | } |
128 | 114 | ||