There is a better solution upstream to fix the pam_lastlog2 installation issue[1]. Backport this patch to replace the local patch.
[1] https://github.com/util-linux/util-linux/pull/3173 Signed-off-by: Yi Zhao <yi.z...@windriver.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- ...s-make-pam-install-path-configurable.patch | 65 --------------- ...x-securedir-and-pam_lastlog2-install.patch | 82 +++++++++++++++++++ 3 files changed, 83 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch create mode 100644 meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 1c066631f3..1dc30c0535 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -38,7 +38,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://fcntl-lock.c \ - file://0001-Revert-autotools-make-pam-install-path-configurable.patch \ + file://0001-autotools-fix-securedir-and-pam_lastlog2-install.patch \ file://libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch \ " diff --git a/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch b/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch deleted file mode 100644 index e9f01fd0be..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch +++ /dev/null @@ -1,65 +0,0 @@ -From af5b58cb77fc8e2e2e2f26aadef4b773b950eafc Mon Sep 17 00:00:00 2001 -From: Chen Qi <qi.c...@windriver.com> -Date: Wed, 21 Aug 2024 07:50:57 -0700 -Subject: [PATCH] Revert "autotools: make pam install path configurable" - -This reverts commit 0539b1ebd26f6a168b822374d7b167f8ef4a1997. - -If people want to use /lib instead of /usr/lib as $(libdir) and want -lastlog2 pam module installed in /lib/security, there's no way to do so. - -Beside, we have: -pam_lastlog2/meson.build: pamlibdir = get_option('libdir') / 'security' - -So things are not in sync between Makemodule.am and meson.build with -the original commit. - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3173] - -Signed-off-by: Chen Qi <qi.c...@windriver.com> ---- - Makefile.am | 1 - - configure.ac | 3 --- - pam_lastlog2/src/Makemodule.am | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 54e0fd497..3f801c686 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,6 @@ usrsbin_exec_PROGRAMS = - man_MANS = - pkgconfig_DATA = - usrlib_exec_LTLIBRARIES = --usrsecurelib_exec_LTLIBRARIES = - bin_PROGRAMS = - sbin_PROGRAMS = - dist_usrbin_exec_SCRIPTS = -diff --git a/configure.ac b/configure.ac -index 82d0e4bf9..35a70aba4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,9 +120,6 @@ AS_CASE([$libdir], - ) - AC_SUBST([usrlib_execdir]) - --usrsecurelib_execdir='${usrlib_execdir}/security' --AC_SUBST([usrsecurelib_execdir]) -- - # static configuration maintaned by packages (e.g. /usr/lib) - AC_ARG_VAR([SYSCONFSTATICDIR], - [Path to static system configuration, default ${prefix}/lib]) -diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am -index 6d2365378..f9a9b6b41 100644 ---- a/pam_lastlog2/src/Makemodule.am -+++ b/pam_lastlog2/src/Makemodule.am -@@ -1,4 +1,5 @@ --usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la -+securelibdir = $(libdir)/security -+securelib_LTLIBRARIES = pam_lastlog2.la - - pam_lastlog2_la_SOURCES = \ - pam_lastlog2/src/pam_lastlog2.c --- -2.25.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch b/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch new file mode 100644 index 0000000000..272e574a77 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch @@ -0,0 +1,82 @@ +From f912fb1bbb0ff5af2736d154347a3b9fc40476eb Mon Sep 17 00:00:00 2001 +From: Karel Zak <k...@redhat.com> +Date: Tue, 27 Aug 2024 12:00:21 +0200 +Subject: [PATCH] autotools: fix securedir and pam_lastlog2 install + +Addresses: https://github.com/util-linux/util-linux/pull/3173 +Signed-off-by: Karel Zak <k...@redhat.com> + +Upstream-Status: Backport +[https://github.com/util-linux/util-linux/commit/9c787eaac43f5f01146f792b0239f587e4b81202] + +Signed-off-by: Yi Zhao <yi.z...@windriver.com> +--- + Makefile.am | 6 +++--- + configure.ac | 6 +++--- + pam_lastlog2/src/Makemodule.am | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ee2d553..a5dcaea 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -56,7 +56,7 @@ usrsbin_exec_PROGRAMS = + man_MANS = + pkgconfig_DATA = + usrlib_exec_LTLIBRARIES = +-usrsecurelib_exec_LTLIBRARIES = ++securelib_exec_LTLIBRARIES = + bin_PROGRAMS = + sbin_PROGRAMS = + dist_usrbin_exec_SCRIPTS = +@@ -155,11 +155,11 @@ EXTRA_DIST += \ + # pylibmountexec module must be installed after usrlib_exec libraries, + # otherwise the libtool relink step will fail to find libmount.la and + # will try -lmount which is possibly not available. +-# The same for usrsecurelib_exec and liblastlog2.la ++# The same for securelib_exec and liblastlog2.la + # + # So introduce this dependency rule: + # install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES +-# install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES ++# install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES + @verbatim_extra_dependency@ + + # +diff --git a/configure.ac b/configure.ac +index 0375d29..134cf38 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -123,8 +123,8 @@ AS_CASE([$libdir], + ) + AC_SUBST([usrlib_execdir]) + +-usrsecurelib_execdir='${usrlib_execdir}/security' +-AC_SUBST([usrsecurelib_execdir]) ++securelib_execdir='${libdir}/security' ++AC_SUBST([securelib_execdir]) + + # static configuration maintaned by packages (e.g. /usr/lib) + AC_ARG_VAR([SYSCONFSTATICDIR], +@@ -2767,7 +2767,7 @@ verbatim_extra_dependency=' + # otherwise the libtool relink step will fail to find libmount.la and + # will try -lmount which is possibly not available. + install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES +-install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES ++install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES + + ' + AC_SUBST([verbatim_extra_dependency]) +diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am +index 6d23653..a2becac 100644 +--- a/pam_lastlog2/src/Makemodule.am ++++ b/pam_lastlog2/src/Makemodule.am +@@ -1,4 +1,4 @@ +-usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la ++securelib_exec_LTLIBRARIES += pam_lastlog2.la + + pam_lastlog2_la_SOURCES = \ + pam_lastlog2/src/pam_lastlog2.c +-- +2.25.1 + -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#209328): https://lists.openembedded.org/g/openembedded-core/message/209328 Mute This Topic: https://lists.openembedded.org/mt/110403685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
