Remove the workaround for qemu/+bug/1749393.

Now that we can run GitHub Actions on Ubuntu 22.04 images, we no longer
have to install qemu from a non-LTS Ubuntu repo in order to get these
bugfixes:

https://bugs.launchpad.net/qemu/+bug/1749393
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1928075

Signed-off-by: Chris Banks <chris.banks@digital.cabinet-office.gov.uk>
This commit is contained in:
Chris Banks
2022-08-26 15:13:33 +01:00
parent 57ef6ab622
commit d418e8272f
+2 -23
View File
@@ -31,30 +31,9 @@ runs:
set -x
if [[ "${{ inputs.platform }}" == "arm64" ]]; then
echo "Installing QEMU"
# qemu-user-static fails with segfaults building bullseye
# We will revisit this when 20.10 is allowed as build slave on GitHub Actions
# https://bugs.launchpad.net/qemu/+bug/1749393
# https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1928075
if [[ "${{ inputs.dist }}" == "bullseye" ]]; then
sudo tee /etc/apt/preferences.d/qemu <<EOF
Package: *
Pin: release n=focal
Pin-Priority: 900
Package: *
Pin: release n=hirsute
Pin-Priority: 400
EOF
sudo tee /etc/apt/sources.list.d/hirsute.list <<EOF
deb http://archive.ubuntu.com/ubuntu hirsute universe
deb http://archive.ubuntu.com/ubuntu hirsute-updates universe
deb http://security.ubuntu.com/ubuntu hirsute-security universe
EOF
sudo apt-get update -qq && sudo apt-get install -y -t hirsute qemu-user-static
else
sudo apt-get update -qq && sudo apt-get install -y qemu-user-static
fi
sudo apt-get update -qq && sudo apt-get install -y qemu-user-static
else
echo "QEMU is not required for platform ${{ inputs.platform }}"
echo "QEMU is not required for platform ${{ inputs.platform }}"
fi
shell: bash
- name: Build snapshot id