Skip to content

Commit 55d2e71

Browse files
committed
Revert "Force install kernel from alpine 3.20"
Pinning the kernel was a temporary measure to allow JDK based images to update to a fixed version. This happened over 6 months ago. Ref rancher-sandbox/rancher-desktop#10227 This reverts commit 5bf3eda. Signed-off-by: Jan Dubois <jan.dubois@suse.com>
1 parent 835437c commit 55d2e71

1 file changed

Lines changed: 0 additions & 29 deletions

File tree

mkimg.lima.sh

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -83,32 +83,3 @@ profile_lima() {
8383
apks="$apks zstd"
8484
fi
8585
}
86-
87-
# Override build_kernel to use the Alpine 3.20 kernel (6.6) because 6.12 has
88-
# issues with older Java, https://bugs.openjdk.org/browse/JDK-8348566
89-
build_kernel() {
90-
local _flavor="$2" _modloopsign= _add
91-
shift 3
92-
local _pkgs="$*"
93-
_pkgs=${_pkgs//linux-virt/linux-virt<6.12}
94-
[ "$modloop_sign" = "yes" ] && _modloopsign="--modloopsign"
95-
echo http://dl-cdn.alpinelinux.org/alpine/v3.20/main > /tmp/repositories.320
96-
update-kernel \
97-
$_hostkeys \
98-
${_abuild_pubkey:+--apk-pubkey $_abuild_pubkey} \
99-
$_modloopsign \
100-
--verbose \
101-
--media \
102-
--keys-dir "$APKROOT/etc/apk/keys" \
103-
--flavor "$_flavor" \
104-
--arch "$ARCH" \
105-
--package "$_pkgs" \
106-
--feature "$initfs_features" \
107-
--modloopfw "$modloopfw" \
108-
--repositories-file /tmp/repositories.320 \
109-
"$DESTDIR" \
110-
|| return 1
111-
for _add in $boot_addons; do
112-
apk fetch --root "$APKROOT" --quiet --stdout $_add | tar -C "${DESTDIR}" -zx boot/
113-
done
114-
}

0 commit comments

Comments
 (0)