Verified Commit 1296e0db authored by Kristian Klausen's avatar Kristian Klausen 🎉
Browse files

Revert "Downgrade to util-linux v2.36 to workaround kernel bug"

The bug has been fixed in v5.14-rc1[1] and backported to the stable
kernels: 5.13.2, 5.12.17 and 5.10.50.

The newest archiso (shipped today) ships with 5.13.6.

[1] https://github.com/torvalds/linux/commit/2b9ac22b12a266eb4fec246a07b504dd4983b16b

Fix #139

This reverts commit 316d0523.
parent 3508cf2c
......@@ -137,13 +137,6 @@ function main() {
send "pacman -Syu --ignore linux --noconfirm qemu-headless jq\n"
expect "# " 120 # (10/14) Updating module dependencies...
# Downgrade util-linux to v2.36 as losetup (>=2.37)[1] uses
# the LOOP_CONFIGURE ioctl which discard support is broken[2].
# [1] https://github.com/karelzak/util-linux/pull/1152
# [2] https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.14/drivers&id=2b9ac22b12a266eb4fec246a07b504dd4983b16b
send "pacman -U --noconfirm https://archive.archlinux.org/packages/u/util-linux/util-linux{,-libs}-2.36.2-1-x86_64.pkg.tar.zst\n"
expect "# "
## Start build and copy output to local disk
send "bash -x ./build-inside-vm.sh ${BUILD_VERSION:-}\n"
expect "# " 240 # qemu-img convert can take a long time
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment