diff mbox series

[1/2] util-linux/util-linux-libuuid: upgrade from 2.40.1 to 2.40.2

Message ID 20240822092642.893250-1-Qi.Chen@windriver.com
State Accepted, archived
Commit 2303f28de507ceb88a012647f70b74e0fad6ec4b
Headers show
Series [1/2] util-linux/util-linux-libuuid: upgrade from 2.40.1 to 2.40.2 | expand

Commit Message

ChenQi Aug. 22, 2024, 9:26 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

Upgrade util-linux from 2.40.1 to 2.40.2.

0001-Revert-autotools-make-pam-install-path-configurable.patch
is added to solve a problem of lastlog2 pam module not installed
in the expected location.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...2.40.1.bb => util-linux-libuuid_2.40.2.bb} |  0
 meta/recipes-core/util-linux/util-linux.inc   |  3 +-
 ...s-make-pam-install-path-configurable.patch | 65 +++++++++++++++++++
 ...l-linux_2.40.1.bb => util-linux_2.40.2.bb} |  0
 4 files changed, 67 insertions(+), 1 deletion(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.40.1.bb => util-linux-libuuid_2.40.2.bb} (100%)
 create mode 100644 meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch
 rename meta/recipes-core/util-linux/{util-linux_2.40.1.bb => util-linux_2.40.2.bb} (100%)

Comments

Joao Marcos Costa Aug. 27, 2024, 9:02 a.m. UTC | #1 
Hello, Chen

On 8/22/24 11:26, Chen Qi via lists.openembedded.org wrote:
> From: Chen Qi<Qi.Chen@windriver.com>
>
> Upgrade util-linux from 2.40.1 to 2.40.2.
>
> 0001-Revert-autotools-make-pam-install-path-configurable.patch
> is added to solve a problem of lastlog2 pam module not installed
> in the expected location.
>
> Signed-off-by: Chen Qi<Qi.Chen@windriver.com>

This update might be causing the ptest failure below, in the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6937/steps/12/logs/stdio

Could you please take a look?
ChenQi Aug. 27, 2024, 9:33 a.m. UTC | #2 
Before I sent out this patch, I did test util-linux-ptest for both glibc and musl.
I’ll check this failure ASAP.

Regards,
Qi

From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Joao Marcos Costa via lists.openembedded.org
Sent: Tuesday, August 27, 2024 5:03 PM
To: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core][PATCH 1/2] util-linux/util-linux-libuuid: upgrade from 2.40.1 to 2.40.2


Hello, Chen
On 8/22/24 11:26, Chen Qi via lists.openembedded.org wrote:

From: Chen Qi <Qi.Chen@windriver.com><mailto:Qi.Chen@windriver.com>



Upgrade util-linux from 2.40.1 to 2.40.2.



0001-Revert-autotools-make-pam-install-path-configurable.patch

is added to solve a problem of lastlog2 pam module not installed

in the expected location.



Signed-off-by: Chen Qi <Qi.Chen@windriver.com><mailto:Qi.Chen@windriver.com>

This update might be causing the ptest failure below, in the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6937/steps/12/logs/stdio

Could you please take a look?

--

Best regards,

João Marcos Costa
Alexandre Belloni Aug. 27, 2024, 8:34 p.m. UTC | #3 
On 27/08/2024 11:02:47+0200, Joao Marcos Costa via lists.openembedded.org wrote:
> Hello, Chen
> 
> On 8/22/24 11:26, Chen Qi via lists.openembedded.org wrote:
> > From: Chen Qi<Qi.Chen@windriver.com>
> > 
> > Upgrade util-linux from 2.40.1 to 2.40.2.
> > 
> > 0001-Revert-autotools-make-pam-install-path-configurable.patch
> > is added to solve a problem of lastlog2 pam module not installed
> > in the expected location.
> > 
> > Signed-off-by: Chen Qi<Qi.Chen@windriver.com>
> 
> This update might be causing the ptest failure below, in the autobuilder:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6937/steps/12/logs/stdio
> 
> Could you please take a look?

This is a know, rare AB-INT:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15188

Can you triage it as such?

> 
> -- 
> Best regards,
> Jo�o Marcos Costa

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#203819): https://lists.openembedded.org/g/openembedded-core/message/203819
> Mute This Topic: https://lists.openembedded.org/mt/108035181/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
ChenQi Aug. 29, 2024, 9:48 a.m. UTC | #4 
Got it. I looked at the script and the output, but got no clue what might be wrong.
I'll keep this intermittent error in mind, when I saw it next time (maybe while upgrading util-linux), I'll keep the environment and see what's going on.

Regards,
Qi

-----Original Message-----
From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Alexandre Belloni via lists.openembedded.org
Sent: Wednesday, August 28, 2024 4:34 AM
To: joaomarcos.costa@bootlin.com
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core][PATCH 1/2] util-linux/util-linux-libuuid: upgrade from 2.40.1 to 2.40.2

On 27/08/2024 11:02:47+0200, Joao Marcos Costa via lists.openembedded.org wrote:
> Hello, Chen
> 
> On 8/22/24 11:26, Chen Qi via lists.openembedded.org wrote:
> > From: Chen Qi<Qi.Chen@windriver.com>
> > 
> > Upgrade util-linux from 2.40.1 to 2.40.2.
> > 
> > 0001-Revert-autotools-make-pam-install-path-configurable.patch
> > is added to solve a problem of lastlog2 pam module not installed in 
> > the expected location.
> > 
> > Signed-off-by: Chen Qi<Qi.Chen@windriver.com>
> 
> This update might be causing the ptest failure below, in the autobuilder:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6937
> /steps/12/logs/stdio
> 
> Could you please take a look?

This is a know, rare AB-INT:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15188

Can you triage it as such?

> 
> --
> Best regards,
> João Marcos Costa

> 
> 
> 


--
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
diff mbox series

Patch

diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.40.1.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.40.2.bb
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-libuuid_2.40.1.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.40.2.bb
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 0f5f838e84..ff47131d12 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -38,6 +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 \
            "
 
-SRC_URI[sha256sum] = "59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f"
+SRC_URI[sha256sum] = "d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3"
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
new file mode 100644
index 0000000000..e9f01fd0be
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch
@@ -0,0 +1,65 @@ 
+From af5b58cb77fc8e2e2e2f26aadef4b773b950eafc Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@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.Chen@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_2.40.1.bb b/meta/recipes-core/util-linux/util-linux_2.40.2.bb
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux_2.40.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.40.2.bb