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.

Sign up for GitHub

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 #367

Merged
merged 7 commits into from
Nov 23, 2024
Merged

[pull] master from buildroot:master #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9bea4b
{linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 11}.…
bkuhls Nov 18, 2024
dbb019d
package/bmap-tools: select host-python3 if building host package
airtower-luna Nov 18, 2024
4b27190
package/python-sip: disable parallel install
RomainNaour Nov 17, 2024
fa20df5
package/util-linux-libs: allowing building even on non-Y2038 complian…
jolivain Nov 22, 2024
81d111d
Update for 2024.11-rc2
jacmet Nov 23, 2024
366d403
docs/website/news.html: use gitlab for all CHANGES links
jacmet Nov 23, 2024
b617eb3
docs/website/news.html: refer to gitlab for buildroot-test repo
jacmet Nov 23, 2024
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
8 changes: 8 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2024.11-rc2, released November 23rd, 2024

Fixes all over the tree.

Updated/fixed packages: bmap-tools, go, intel-microcode,
libblockdev, libcurl, libkrb5, libnvme, libpng, php,
postgresql, python-sip, skopeo, tiff, util-linux-libs

2024.11-rc1, released November 13th, 2024

Fixes all over the tree and package updates.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
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-rc1
export BR2_VERSION := 2024.11-rc2
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1731520600
BR2_VERSION_EPOCH = 1732356000

# 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
View file
Open in desktop
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-rc1</b></h3>
<h3 style="text-align: center;">Latest release candidate: <b>2024.11-rc2</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-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2024.11-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>

<h3><a href="/downloads/buildroot-2024.11-rc1.tar.gz">buildroot-2024.11-rc1.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc1.tar.gz.sign">PGP signature</a></p>
<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>
</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-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2024.11-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>

<h3><a href="/downloads/buildroot-2024.11-rc1.tar.xz">buildroot-2024.11-rc1.tar.xz</a></h3>
<p><a href="/downloads/buildroot-2024.11-rc1.tar.xz.sign">PGP signature</a></p>
<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>
</div>
</div>

Expand Down
799 changes: 410 additions & 389 deletions docs/website/news.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES

config BR2_LINUX_KERNEL_VERSION
string
default "6.11.7" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.11.9" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
Expand Down
14 changes: 7 additions & 7 deletions linux/linux.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 0bf5ec644817d7928920f763581311f5bf258a92759cf2f30985da743af3ebb2 linux-6.11.7.tar.xz
sha256 52f9e32d5082ab94253447fd66670d0c3bb765cfcb99b0bf61d1b8eae25952ef linux-6.6.60.tar.xz
sha256 17eb68336ee2a8f34378bf6089ffe8f805b978eda314c299d2a63b0603833b81 linux-6.1.116.tar.xz
sha256 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4 linux-6.11.9.tar.xz
sha256 e2c35611775534941b9d4dd871f3ae5b988b6594dc9033b5ca784366e07d9336 linux-6.6.62.tar.xz
sha256 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c linux-6.1.118.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 2953e064d8123c4c22c4fd48011378d73c8b99a3bf3d989e33f4f5c8f82f2a3b linux-5.15.171.tar.xz
sha256 08a6b5e6bbff85ef017f67b722f6beec7f12fe36fc0f9043f27a91990b88cde0 linux-5.10.229.tar.xz
sha256 be32c37ef2f6f724fa13acf43cbc9aacfd3acef58964923dae5daa6206d3429c linux-5.4.285.tar.xz
sha256 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8 linux-5.15.173.tar.xz
sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz
sha256 180754f3df0e8d7f206625255b3f5a6e1f441feec83336df42613ca8f6b1887c linux-5.4.286.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 eec9215fbac649d826fda9d3421da47aebd3c4e69e060e5106d32e309a9b6a1c linux-4.19.323.tar.xz
sha256 90e140ad2d07da88b43d5930cfda7bffc5c121660e9d8a86d96a9efe4d87ffe6 linux-4.19.324.tar.xz
# Locally computed
sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz
sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz
Expand Down
1 change: 1 addition & 0 deletions package/bmap-tools/Config.in.host
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
config BR2_PACKAGE_HOST_BMAP_TOOLS
bool "host bmap-tools"
select BR2_PACKAGE_HOST_PYTHON3 # runtime
select BR2_PACKAGE_HOST_PYTHON_SIX # runtime
help
Tool to flash image files to block devices using the block map
Expand Down
14 changes: 7 additions & 7 deletions package/linux-headers/Config.in.host
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,13 +428,13 @@ endchoice

config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.19.323" if BR2_KERNEL_HEADERS_4_19
default "5.4.285" if BR2_KERNEL_HEADERS_5_4
default "5.10.229" if BR2_KERNEL_HEADERS_5_10
default "5.15.171" if BR2_KERNEL_HEADERS_5_15
default "6.1.116" if BR2_KERNEL_HEADERS_6_1
default "6.6.60" if BR2_KERNEL_HEADERS_6_6
default "6.11.7" if BR2_KERNEL_HEADERS_6_11
default "4.19.324" if BR2_KERNEL_HEADERS_4_19
default "5.4.286" if BR2_KERNEL_HEADERS_5_4
default "5.10.230" if BR2_KERNEL_HEADERS_5_10
default "5.15.173" if BR2_KERNEL_HEADERS_5_15
default "6.1.118" if BR2_KERNEL_HEADERS_6_1
default "6.6.62" if BR2_KERNEL_HEADERS_6_6
default "6.11.9" if BR2_KERNEL_HEADERS_6_11
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
Expand Down
8 changes: 6 additions & 2 deletions package/python-sip/python-sip.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ define HOST_PYTHON_SIP_BUILD_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
endef

# Race condition on fast machine between sipconfig.py install and
# {sipdistutils.py,mk_distinfo.py} scripts.
define HOST_PYTHON_SIP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) install -C $(@D)
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE1) install -C $(@D)
endef

define PYTHON_SIP_CONFIGURE_CMDS
Expand All @@ -42,8 +44,10 @@ define PYTHON_SIP_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
endef

# Race condition on fast machine between sipconfig.py install and
# {sipdistutils.py,mk_distinfo.py} scripts.
define PYTHON_SIP_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D)
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) install -C $(@D)
endef

$(eval $(generic-package))
Expand Down
6 changes: 5 additions & 1 deletion package/util-linux/util-linux-libs/util-linux-libs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ UTIL_LINUX_LIBS_DEPENDENCIES = \
host-pkgconf \
$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
$(TARGET_NLS_DEPENDENCIES)
# --disable-year2038: tells the configure script to not abort if the
# system is not Y2038 compliant. util-linux-libs will support year2038
# if the system is compliant even with this option passed
UTIL_LINUX_LIBS_CONF_OPTS += \
--disable-rpath \
--disable-makeinstall-chown
--disable-makeinstall-chown \
--disable-year2038

UTIL_LINUX_LIBS_LINK_LIBS = $(TARGET_NLS_LIBS)

Expand Down