[Buildroot] [PATCH 0/2] util-linux 2.39.2

[Buildroot] [PATCH 0/2] util-linux 2.39.2

[Markus Mayer via buildroot]

Bump the version of util-linux to 2.39.2, which lets us get rid of a
downstream patch and the need for re-running autoconf.

Markus Mayer (2):
  package/util-linux: bump version to 2.39.2
  Revert "package/util-linux: add missing autoreconf"

 .../0001-libmount-ifdef-statx-call.patch      | 57 -------------------
 package/util-linux/util-linux.hash            |  2 +-
 package/util-linux/util-linux.mk              |  6 +-
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 package/util-linux/0001-libmount-ifdef-statx-call.patch

-- 
2.40.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] package/util-linux: bump version to 2.39.2

[Markus Mayer via buildroot]

Release notes:
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/v2.39.2-ReleaseNotes

This update primarily allows util-linux to be built against older kernel
headers. It also means that a downstream patch can be eliminated, because
the changes are included in util-linux 2.39.2.

https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=c0136ac0c98b1

Signed-off-by: Markus Mayer <mmayer@broadcom.com>
---
 .../0001-libmount-ifdef-statx-call.patch      | 57 -------------------
 package/util-linux/util-linux.hash            |  2 +-
 package/util-linux/util-linux.mk              |  2 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 package/util-linux/0001-libmount-ifdef-statx-call.patch

diff --git a/package/util-linux/0001-libmount-ifdef-statx-call.patch b/package/util-linux/0001-libmount-ifdef-statx-call.patch
deleted file mode 100644
index ba44650bd3d0..000000000000
--- a/package/util-linux/0001-libmount-ifdef-statx-call.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c0136ac0c98b18208508fbcfac31a843e0bb8a37 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 3 Aug 2023 12:39:19 +0200
-Subject: [PATCH] libmount: ifdef statx() call
-
-In this case the statx() is use to get mount ID. It's optional and not
-required. Let's #ifdef the statx() call and also check for stx_mnt_id
-struct member.
-
-Fixes: https://github.com/util-linux/util-linux/issues/2415
-Signed-off-by: Karel Zak <kzak@redhat.com>
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-Upstream: https://github.com/util-linux/util-linux/commit/c0136ac0c98b18208508fbcfac31a843e0bb8a37
----
- configure.ac              | 5 ++++-
- libmount/src/hook_mount.c | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a3cf330b5..ae721c7ac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -525,7 +525,10 @@ AC_CHECK_MEMBERS([struct termios.c_line],,,
-     [[#include <termios.h>]])
- 
- AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec],,,
--	[#include <sys/stat.h>])
-+    [[#include <sys/stat.h>]])
-+
-+AC_CHECK_MEMBERS([struct statx.stx_mnt_id],,,
-+    [[#include <linux/stat.h>]])
- 
- AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include <langinfo.h>]])
- 
-diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c
-index d69a018ec..056338c49 100644
---- a/libmount/src/hook_mount.c
-+++ b/libmount/src/hook_mount.c
-@@ -294,6 +294,7 @@ static int hook_create_mount(struct libmnt_context *cxt,
- 		/* cleanup after fail (libmount may only try the FS type) */
- 		close_sysapi_fds(api);
- 
-+#if defined(HAVE_STRUCT_STATX) && defined(HAVE_STRUCT_STATX_STX_MNT_ID)
- 	if (!rc && cxt->fs) {
- 		struct statx st;
- 
-@@ -306,6 +307,7 @@ static int hook_create_mount(struct libmnt_context *cxt,
- 				fs->id = cxt->fs->id;
- 		}
- 	}
-+#endif
- 
- done:
- 	DBG(HOOK, ul_debugobj(hs, "create FS done [rc=%d, id=%d]", rc, cxt->fs ? cxt->fs->id : -1));
--- 
-2.39.2
-
diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash
index 7ecd165459d7..1638cd9967b1 100644
--- a/package/util-linux/util-linux.hash
+++ b/package/util-linux/util-linux.hash
@@ -1,5 +1,5 @@
 # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc
-sha256  890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b  util-linux-2.39.1.tar.xz
+sha256  87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f  util-linux-2.39.2.tar.xz
 # License files, locally calculated
 sha256  64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455  README.licensing
 sha256  9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3-Clause
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 0b8e3979b712..73eda5c17134 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -8,7 +8,7 @@
 # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well.
 
 UTIL_LINUX_VERSION_MAJOR = 2.39
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-- 
2.40.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] Revert "package/util-linux: add missing autoreconf"

[Markus Mayer via buildroot]

This reverts commit f3fab0defe8fa9e1d99e4a89ddb29776e3bdd7fd.

With 0001-libmount-ifdef-statx-call.patch no longer required (due to the
release of util-linux 2.39.2), we no longer need to run autoreconf.

Signed-off-by: Markus Mayer <mmayer@broadcom.com>
---
 package/util-linux/util-linux.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 73eda5c17134..4a40d5afec85 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -30,10 +30,6 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
 	Documentation/licenses/COPYING.LGPL-2.1-or-later
 
 UTIL_LINUX_CPE_ID_VENDOR = kernel
-
-# 0001-libmount-ifdef-statx-call.patch
-UTIL_LINUX_AUTORECONF = YES
-
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = \
 	host-pkgconf \
-- 
2.40.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] Revert "package/util-linux: add missing autoreconf"

[Yann E. MORIN]

Markus, All,

On 2023-08-17 17:31 -0700, Markus Mayer via buildroot spake thusly:
> This reverts commit f3fab0defe8fa9e1d99e4a89ddb29776e3bdd7fd.
> 
> With 0001-libmount-ifdef-statx-call.patch no longer required (due to the
> release of util-linux 2.39.2), we no longer need to run autoreconf.

The AUTORECONF=YES should have been dropped in the previous patch.

Indeed, the bump and associated removal of the patch is what means
autoreconf is not needed; it is all a semantically atomice change: bump,
drop patch, remove autoreconf.

Besides, a git-revert semantically means "the reverted commit was wrong
even at the time it was introduced". But here, using autoreconf was
correct when we introduced it, so it should not be "git-reverted".

No need to respin, the two commits can be squashed when applying.

Regards,
Yann E. MORIN.

> Signed-off-by: Markus Mayer <mmayer@broadcom.com>
> ---
>  package/util-linux/util-linux.mk | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index 73eda5c17134..4a40d5afec85 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -30,10 +30,6 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
>  	Documentation/licenses/COPYING.LGPL-2.1-or-later
>  
>  UTIL_LINUX_CPE_ID_VENDOR = kernel
> -
> -# 0001-libmount-ifdef-statx-call.patch
> -UTIL_LINUX_AUTORECONF = YES
> -
>  UTIL_LINUX_INSTALL_STAGING = YES
>  UTIL_LINUX_DEPENDENCIES = \
>  	host-pkgconf \
> -- 
> 2.40.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] Revert "package/util-linux: add missing autoreconf"

[Markus Mayer via buildroot]

On Thu, 17 Aug 2023 at 22:47, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Markus, All,
>
> The AUTORECONF=YES should have been dropped in the previous patch.

Okay. Good to know. I erred on the side of caution, because squashing
commits is easier than prying them apart.

> Besides, a git-revert semantically means "the reverted commit was wrong
> even at the time it was introduced". But here, using autoreconf was
> correct when we introduced it, so it should not be "git-reverted".

Noted. Makes sense.

> No need to respin, the two commits can be squashed when applying.

Thanks. I appreciate it.

Regards,
-Markus
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 0/2] util-linux 2.39.2

[Thomas Petazzoni via buildroot]

On Thu, 17 Aug 2023 17:31:22 -0700
Markus Mayer via buildroot <buildroot@buildroot.org> wrote:

> Markus Mayer (2):
>   package/util-linux: bump version to 2.39.2
>   Revert "package/util-linux: add missing autoreconf"

Both applied to next, after squashing them together (and cherry-picking
into next the few commits from master that these patches depended on).

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot