Skip to content

Commit 48890ef

Browse files
committed
fix: update base commit to -rc6
Linus fixed an issue introduced between -rc4 and -rc5 that shows up as random userspace processes hanging without and kernel logs to show what might be going from [1]. This pretty much exactly matches what we are seeing with docekr just random hanging sometimes. Let's try updating to -rc6 to see if that makes the issue go away. On aarch64, this kernel needs some additional dependencies to build (hexdump), which we do not have in the docker container, so add a "instlal build dependencies" step to the kernel building script. [1]: https://lore.kernel.org/all/CAHk-=wiMJWwgJ4HYsLzJ4_OkhzJ75ah0HrfBBk+W-RGjk4-h2g@mail.gmail.com/ Signed-off-by: Patrick Roy <[email protected]>
1 parent f91bd97 commit 48890ef

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

resources/hiding_ci/build_and_install_kernel.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ check_userspace() {
2929
exit 1
3030
}
3131

32+
install_build_deps() {
33+
case $USERSPACE in
34+
"UBUNTU")
35+
apt-get update && apt-get install -y make bsdmainutils flex yacc bison bc xz-utils libelf-dev elfutils libssl-dev
36+
;;
37+
"AL2023")
38+
yum groupinstall "Development Tools"
39+
yum install make openssl-devel dkms
40+
;;
41+
esac
42+
}
43+
3244
tidy_up() {
3345
# Some cleanup after we are done
3446
echo "Cleaning up.."
@@ -154,6 +166,9 @@ update_boot_config() {
154166
esac
155167
}
156168

169+
check_userspace
170+
install_build_deps
171+
157172
KERNEL_URL=$(cat kernel_url)
158173
KERNEL_COMMIT_HASH=$(cat kernel_commit_hash)
159174
KERNEL_PATCHES_DIR=$(pwd)/linux_patches
@@ -210,7 +225,6 @@ echo "New kernel version:" $KERNEL_VERSION
210225
confirm "$@"
211226

212227
check_root
213-
check_userspace
214228

215229
echo "Installing kernel modules..."
216230
make INSTALL_MOD_STRIP=1 modules_install
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d7b8f8e20813f0179d8ef519541a3527e7661d3a
1+
347e9f5043c89695b01e66b3ed111755afcf1911

0 commit comments

Comments
 (0)