Skip to content

Commit ce7c116

Browse files
committed
tools: update create-buildroot-image.sh script
Use a newer Buildroot release. Use an appropriate arm instruction set for arm32. Reduce the syslogd logging level. Closes #5986. Closes #5452.
1 parent 6ca47dd commit ce7c116

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

tools/create-buildroot-image.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ case "$TARGETARCH" in
4040
esac
4141

4242
git fetch origin
43-
git checkout 2022.08.2
43+
git checkout 2025.02.1
4444

4545
make "${DEFCONFIG}"
4646

@@ -121,15 +121,15 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
121121
BR2_LINUX_KERNEL_IMAGEGZ=y
122122
BR2_LINUX_KERNEL_GZIP=y
123123
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
124-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10"
124+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.235"
125125
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh ./post_image_script.sh support/scripts/genimage.sh"
126126
BR2_ROOTFS_POST_SCRIPT_ARGS="-c ./custom-genimage-efi.cfg"
127127
EOF
128128
;;
129129
arm)
130130
cat >>.config <<EOF
131-
BR2_cortex_a57=y
132131
# BR2_LINUX_KERNEL is not set
132+
BR2_cortex_a15_a7=y
133133
BR2_TARGET_ROOTFS_EXT2_4=y
134134
EOF
135135
;;
@@ -155,6 +155,15 @@ EOF
155155
;;
156156
esac
157157

158+
# Set syslogd level to "critical", otherwise we may get too many unrelated logs (see #5452).
159+
sed -i 's/SYSLOGD_ARGS=""$/SYSLOGD_ARGS="-l 2"/' package/busybox/S01syslogd
160+
161+
# dhcpd version 10.1.0 fails to start in the presence of CONFIG_SECCOMP.
162+
sed -i 's/DHCPCD_VERSION = 10.1.0$/DHCPCD_VERSION = 10.2.0/' package/dhcpcd/dhcpcd.mk
163+
if ! grep -q "dhcpcd-10.2.0.tar.xz" package/dhcpcd/dhcpcd.hash; then
164+
echo "sha256 7916fed1560835b5b9d70d27604c3858e501c5a177eef027f96eb7ab0f711399 dhcpcd-10.2.0.tar.xz" >> package/dhcpcd/dhcpcd.hash
165+
fi
166+
158167
# This script modifies the target root filesystem
159168
# before it's packed into the final image.
160169
# This part is common for all architectures.

0 commit comments

Comments
 (0)