Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from buildroot:master #375

Merged
merged 3 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2024.11-rc3, released Decemmber 5th, 2024

Fixes all over the tree.

Updated/fixed packages: alsa-lib, android-tools, bats-core,
doxygen, frr, gnutls, libvpl, linux-tools, lmbench, lrzsz,
musl, nfs-utils, opkg, polkit, postgresql, procps-ng,
python-psycopg2, quagga, rt-tests, rust, sexpect

2024.11-rc2, released November 23rd, 2024

Fixes all over the tree.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ all:
.PHONY: all

# Set and export the version string
export BR2_VERSION := 2024.11-rc2
export BR2_VERSION := 2024.11-rc3
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1732356000
BR2_VERSION_EPOCH = 1733418000

# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
Expand Down
18 changes: 9 additions & 9 deletions docs/website/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,37 +76,37 @@ <h3><a href="/downloads/buildroot-2024.08.2.tar.xz">buildroot-2024.08.2.tar.xz</
</div>
</div>

<h3 style="text-align: center;">Latest release candidate: <b>2024.11-rc2</b></h3>
<h3 style="text-align: center;">Latest release candidate: <b>2024.11-rc3</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>

<h3><a href="/downloads/buildroot-2024.11-rc2.tar.gz">buildroot-2024.11-rc2.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc2.tar.gz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2024.11-rc3.tar.gz">buildroot-2024.11-rc3.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc3.tar.gz.sign">PGP signature</a></p>
</div>
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>

<h3><a href="/downloads/buildroot-2024.11-rc2.tar.xz">buildroot-2024.11-rc2.tar.xz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc2.tar.xz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2024.11-rc3.tar.xz">buildroot-2024.11-rc3.tar.xz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc3.tar.xz.sign">PGP signature</a></p>
</div>
</div>

Expand Down
21 changes: 21 additions & 0 deletions docs/website/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,27 @@
<h2>News</h2>
<ul class="timeline">

<li class="timeline-inverted">
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">2024.11-rc3 released</h4>
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>5 December 2024</small></p>
</div>
<div class="timeline-body">
<p>Another week, another release candidate with more cleanups and build fixes. See the
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2024.11-rc3/CHANGES">CHANGES</a>
file for more details.</p>

<p>Go to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2024.11-rc3.tar.xz">2024.11-rc3
release</a>, and report any problems found to the
<a href="support.html">mailing list</a> or
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
</div>
</div>
</li>

<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 2c7ff6989bc6161d8a2cc823d3aa7c9cb1deca80 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <[email protected]>
Date: Wed, 4 Dec 2024 22:59:31 +0100
Subject: [PATCH] scripts/build: make it possible to set LDLIBS

LDLIBS is currently unconditionnally set to '-lm', but doesn't allow
the user to provide additional libraries to link with.

Upstream: dead, last release in 2006
Signed-off-by: Thomas Petazzoni <[email protected]>
---
scripts/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build b/scripts/build
index 60b755c..4820d80 100755
--- a/scripts/build
+++ b/scripts/build
@@ -18,7 +18,7 @@ done

trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15

-LDLIBS=-lm
+LDLIBS="${LDLIBS} -lm"

# check for HP-UX's ANSI compiler
echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c
--
2.47.0

1 change: 0 additions & 1 deletion package/lmbench/lmbench.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ LMBENCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK

define LMBENCH_CONFIGURE_CMDS
sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
sed -i 's/LDLIBS=/LDLIBS+=/g' $(@D)/scripts/build
sed -i '/cd .*doc/d' $(@D)/src/Makefile
sed -i '/include/d' $(@D)/src/Makefile
touch $@
Expand Down
99 changes: 99 additions & 0 deletions package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
From f37d178d5c25c547835d054fbb1eda32c25034b3 Mon Sep 17 00:00:00 2001
From: Craig Small <[email protected]>
Date: Mon, 30 Sep 2024 17:26:01 +1000
Subject: [PATCH] build-sys: Fix pidfd_open checking

The previous build setup would check for pidfd_open using
AC_CHECK_FUNC and would be incorrectly reported as true.

Also, if pidfd_open() and __NR_pidfd_open were not present,
pidwait would silently not be built.

So, changes:
compile a small programin using pidfd_open to test it properly
conditionally try to find NR_pidfd_open if the function fails
complain if neither are present
have --disable-pidwait configure option so you are explicit in
not wanting and knowing you wont get pidwait

References:
#352
commit d9c3e3676d86094abaa239b3218f57bf49d70b4f
commit 17f94796a9b3c4f1ff28829107a82107dcb362b4

Signed-off-by: Craig Small <[email protected]>

Upstream: https://gitlab.com/procps-ng/procps/-/commit/2507bc475782ff5e0541d37c780dff1e293c9553

Signed-off-by: Scott Fan <[email protected]>
[Scott: backported to version 4.0.4]
---
configure.ac | 45 ++++++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index fec27e3f..0719fcd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,21 +170,6 @@ AC_TRY_COMPILE([#include <errno.h>],
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))

-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
- AC_MSG_CHECKING([for __NR_pidfd_open])
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <sys/syscall.h>
-#ifndef __NR_pidfd_open
-#error __NR_pidfd_open not defined
-#endif
- ])], [enable_pidwait=yes], [enable_pidwait=no])
- AC_MSG_RESULT([$enable_pidwait])
-])
-if test "$enable_pidwait" = yes; then
- AC_DEFINE([ENABLE_PIDWAIT], [1], [Enable pidwait])
-fi
-AM_CONDITIONAL([BUILD_PIDWAIT], [test x$enable_pidwait = xyes])
-
dnl watch8bit must be before the AC_ARG_WITH set as it sets up ncurses
AC_SUBST([WITH_WATCH8BIT])
AC_ARG_ENABLE([watch8bit],
@@ -321,6 +306,36 @@ AC_ARG_ENABLE([pidof],
)
AM_CONDITIONAL(BUILD_PIDOF, test "x$enable_pidof" = xyes)

+# If pidwait is enabled, we need either pidfd_open() or __NR_pidfd_open need to be defined
+# Cannot use AC_CHECK_FUNC as it (incorrectly) passes with pidfd_open missing
+AC_ARG_ENABLE([pidwait],
+ AS_HELP_STRING([--disable-pidwait], [do not build pidwait]),
+ [], [
+ enable_pidwait=yes
+ AC_DEFINE(ENABLE_PIDWAIT, 1, [enable pidwait])
+ ]
+)
+AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes)
+AC_MSG_CHECKING([for pidfd_open()])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])],
+ have_pidfd_open=yes; AC_MSG_RESULT([yes]) ,
+ have_pidfd_open=no; AC_MSG_RESULT([no])
+ )
+
+AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]],
+ AC_MSG_CHECKING([for __NR_pidfd_open])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include <sys/syscall.h>
+#ifndef __NR_pidfd_open
+#error __NR_pidfd_open not defined
+#endif
+ ])],
+ AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Neither pidfd_open or __NR_pidfd_open found. Disable pidwait with configure option --disable-pidwait])
+ )
+ ,[])
+
AC_ARG_ENABLE([kill],
AS_HELP_STRING([--disable-kill], [do not build kill]),
[], [enable_kill=yes]
--
2.43.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 1e2d53e1d86cb75e8f39b42b9a5c409e5d3261ed Mon Sep 17 00:00:00 2001
From: oli-ben <[email protected]>
Date: Wed, 27 Nov 2024 20:17:11 +0000
Subject: [PATCH] build-sys: Fix define of HAVE_PIDFD_OPEN

Fix cross-compilation issues when using GCC-12.3
* configure fails to detect that the sysroot does support the pidfd_open
syscall wrapper
* configure fails to define HAVE_PIDFD_OPEN which is used in pgrep.c,
so it fails building, because __NR_pidfd_open is then undefined

Upstream: https://gitlab.com/procps-ng/procps/-/commit/587efb47df7ddbfda4e6abdd1e7792a2531a238f

Signed-off-by: Scott Fan <[email protected]>
[Scott: backported to version 4.0.4]
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0719fcd1..6242a8f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,8 +317,8 @@ AC_ARG_ENABLE([pidwait],
)
AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes)
AC_MSG_CHECKING([for pidfd_open()])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])],
- have_pidfd_open=yes; AC_MSG_RESULT([yes]) ,
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[pidfd_open(1,1)]])],
+ have_pidfd_open=yes; AC_DEFINE(HAVE_PIDFD_OPEN, 1, [pidfd_open is defined]) AC_MSG_RESULT([yes]),
have_pidfd_open=no; AC_MSG_RESULT([no])
)

--
2.43.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 81ded587d2484b6f470f2d5c837c5591491377ce Mon Sep 17 00:00:00 2001
From: Craig Small <[email protected]>
Date: Thu, 28 Nov 2024 07:20:42 +1100
Subject: [PATCH] pgrep: Include sys/syscall.h if making pidwait

sys/syscall.h would only be included if pidwait was made
and we found pidfd_open() The previous commit fixed the
finding part, but in fact we want sys/syscall.h either
way because syscall() is defined there too.

Most of the time the header is included by other headers
but adding it explicitly means if that header is removed or
changed it still works.

Signed-off-by: Craig Small <[email protected]>

Upstream: https://gitlab.com/procps-ng/procps/-/commit/5acbb5dc1587d688de646d739a97251eb893bbb0

Signed-off-by: Scott Fan <[email protected]>
[Scott: backported to version 4.0.4]
---
src/pgrep.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/src/pgrep.c b/src/pgrep.c
index d8e57dff..a2607532 100644
--- a/src/pgrep.c
+++ b/src/pgrep.c
@@ -44,9 +44,7 @@

#ifdef ENABLE_PIDWAIT
#include <sys/epoll.h>
-#ifndef HAVE_PIDFD_OPEN
#include <sys/syscall.h>
-#endif /* !HAVE_PIDFD_OPEN */
#endif

/* EXIT_SUCCESS is 0 */
--
2.43.0

2 changes: 2 additions & 0 deletions package/procps-ng/procps-ng.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)

# Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am
# Applying 0002-fix-ncurses-h-include.patch touches configure.ac
# Applying 0003-build-sys-Fix-pidfd_open-checking.patch touches configure.ac
# Applying 0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch touches configure.ac
PROCPS_NG_AUTORECONF = YES

ifeq ($(BR2_PACKAGE_SYSTEMD),y)
Expand Down