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

Merged
merged 3 commits into from
Nov 25, 2024
Merged

[pull] master from buildroot:master #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ec30e6
Config.in: fix _FORTIFY_SOURCE help string typos
jolivain Nov 17, 2024
5d49bc5
{linux, linux-headers}: bump 6.{1, 6, 11}.x series
bkuhls Nov 23, 2024
ed590a2
package/doxygen: fix _SITE download URL
jolivain Nov 24, 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
4 changes: 2 additions & 2 deletions Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ config BR2_FORTIFY_SOURCE_2
# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
help
This option sets _FORTIFY_SOURCES to 2 and some more
This option sets _FORTIFY_SOURCE to 2 and some more
checking is added, but some conforming programs might fail.
Also adds checks at run-time (detected buffer overflow
terminates the program)
Expand All @@ -972,7 +972,7 @@ config BR2_FORTIFY_SOURCE_3
bool "Extended"
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12
help
This option sets _FORTIFY_SOURCES to 3 and even more
This option sets _FORTIFY_SOURCE to 3 and even more
checking is added compared to level 2. Extends checks at
run-time that can introduce an additional performance
overhead.
Expand Down
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.9" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.11.10" 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
6 changes: 3 additions & 3 deletions linux/linux.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4 linux-6.11.9.tar.xz
sha256 e2c35611775534941b9d4dd871f3ae5b988b6594dc9033b5ca784366e07d9336 linux-6.6.62.tar.xz
sha256 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c linux-6.1.118.tar.xz
sha256 4bc184915290629d61f935aa1eb1b6e711b8e47d8f289a39f0d584ecbdb4fe77 linux-6.11.10.tar.xz
sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz
sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8 linux-5.15.173.tar.xz
sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz
Expand Down
2 changes: 1 addition & 1 deletion package/doxygen/doxygen.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

DOXYGEN_VERSION = 1.8.18
DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
DOXYGEN_SITE = http://doxygen.nl/files
DOXYGEN_SITE = https://sourceforge.net/projects/doxygen/files/rel-$(DOXYGEN_VERSION)
DOXYGEN_LICENSE = GPL-2.0
DOXYGEN_LICENSE_FILES = LICENSE
DOXYGEN_CPE_ID_VENDOR = doxygen
Expand Down
6 changes: 3 additions & 3 deletions package/linux-headers/Config.in.host
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
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 "6.1.119" if BR2_KERNEL_HEADERS_6_1
default "6.6.63" if BR2_KERNEL_HEADERS_6_6
default "6.11.10" 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