github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-23 05:04:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11918 from fidencio/topic/builds-qemu-use-liburing-newer-than-2.2

Browse Source 
builds: qemu: Use a liburing newer than 2.2
This commit is contained in:
Aurélien Bombo
2025-10-14 10:17:16 -05:00
committed by GitHub
parent 363701d767 2ad81c4797
commit 0c6fcde198
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/packaging/scripts/lib.sh
View File

@@ -167,7 +167,8 @@ sha256sum_from_files() {
calc_qemu_files_sha256sum() { calc_qemu_files_sha256sum() {
local files="${repo_root_dir}/tools/packaging/qemu \ local files="${repo_root_dir}/tools/packaging/qemu \
${repo_root_dir}/tools/packaging/static-build/qemu.blacklist \ ${repo_root_dir}/tools/packaging/static-build/qemu.blacklist \
${repo_root_dir}/tools/packaging/static-build/scripts" ${repo_root_dir}/tools/packaging/static-build/scripts \
${repo_root_dir}/tools/packaging/static-build/qemu"
sha256sum_from_files "$files" sha256sum_from_files "$files"
} }

33
tools/packaging/static-build/qemu/Dockerfile
View File

@@ -70,3 +70,36 @@ RUN apt-get update && apt-get upgrade -y && \
GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \
if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \ if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \
apt-get clean && rm -rf /var/lib/apt/lists/ apt-get clean && rm -rf /var/lib/apt/lists/
# Detect architecture and set appropriate Ubuntu mirror
RUN ARCH=$(dpkg --print-architecture) && \
if [ "${ARCH}" = "amd64" ]; then \
UBUNTU_MIRROR="http://archive.ubuntu.com/ubuntu/"; \
else \
UBUNTU_MIRROR="http://ports.ubuntu.com/ubuntu-ports/"; \
fi && \
echo "UBUNTU_MIRROR=${UBUNTU_MIRROR}" > /etc/ubuntu_mirror.env
# Backup sources list and add Noble (24.04) repository
RUN . /etc/ubuntu_mirror.env && \
cp /etc/apt/sources.list /etc/apt/sources.list.backup && \
echo "deb ${UBUNTU_MIRROR} noble main universe" > /etc/apt/sources.list.d/noble.list
# Set up APT pinning to prefer Jammy packages by default, but allow liburing from Noble
RUN mkdir -p /etc/apt/preferences.d && \
echo "Package: *\n\
Pin: release n=jammy\n\
Pin-Priority: 900\n\
\n\
Package: liburing*\n\
Pin: release n=noble\n\
Pin-Priority: 950" > /etc/apt/preferences.d/noble-pin
# Update package list and install liburing-dev from Noble
RUN apt-get update && \
apt-get install -y liburing-dev && \
rm -rf /var/lib/apt/lists/*
# Remove the Noble repository to prevent accidental upgrades
RUN rm /etc/apt/sources.list.d/noble.list && \
apt-get update