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

Merged
merged 3 commits into from
Sep 1, 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
2 changes: 1 addition & 1 deletion docs/manual/contribute.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ address you register in
https://patchwork.ozlabs.org/project/buildroot/list/[patchwork] should
match the one you use for sending patches to the mailing list.

You can also add the +--in-reply-to <message-id>+ option when
You can also add the +--in-reply-to=<message-id>+ option when
submitting a patch to the mailing list. The id of the mail to reply to
can be found under the "Message Id" tag on
https://patchwork.ozlabs.org/project/buildroot/list/[patchwork]. The
Expand Down
2 changes: 1 addition & 1 deletion linux/Config.in
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.10.6" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.10.7" 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
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 e0d50d5b74f8599375660e79f187af7493864dba5ff6671b14983376a070b3d1 linux-6.10.6.tar.xz
sha256 d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 linux-6.6.47.tar.xz
sha256 3773c9052c7ba7432e8337ca84bee115c1a94ccef9d62b72b99ae30c4cd5f80f linux-6.1.106.tar.xz
sha256 900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9 linux-6.10.7.tar.xz
sha256 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 linux-6.6.48.tar.xz
sha256 f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 linux-6.1.107.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe linux-5.15.165.tar.xz
sha256 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a linux-5.10.224.tar.xz
Expand Down
6 changes: 3 additions & 3 deletions package/linux-headers/Config.in.host
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.4.282" if BR2_KERNEL_HEADERS_5_4
default "5.10.224" if BR2_KERNEL_HEADERS_5_10
default "5.15.165" if BR2_KERNEL_HEADERS_5_15
default "6.1.106" if BR2_KERNEL_HEADERS_6_1
default "6.6.47" if BR2_KERNEL_HEADERS_6_6
default "6.10.6" if BR2_KERNEL_HEADERS_6_10
default "6.1.107" if BR2_KERNEL_HEADERS_6_1
default "6.6.48" if BR2_KERNEL_HEADERS_6_6
default "6.10.7" if BR2_KERNEL_HEADERS_6_10
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
1 change: 0 additions & 1 deletion support/scripts/genimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@ if grep -Eq "^BR2_PACKAGE_HOST_BMAP_TOOLS=y$" "${BR2_CONFIG}"; then
continue
fi
bmaptool create "${image_path}" -o "${image_path}.bmap"
gzip -c "${image_path}" > "${image_path}.gz"
done < <(grep '^image ' "${GENIMAGE_CFG}" | cut -d ' ' -f 2)
fi