github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Apply patches for specific versions.

Browse Source 
Today we apply patches per base branch. Having
two qemu versions in a similar base version can make
can have problems if one of the trees already has a patch.
If a patch is needed only for one specific tag/commit
add only the patch to that version.

Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
This commit is contained in:
Carlos Venegas 2021-03-19 16:14:21 +00:00
parent a09e58fa80
commit 98d01ce6b9
7 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tools/packaging/qemu/patches/tag_patches/qemu5.0-virtiofs-with51bits-dax/no_patches.txt Normal file
View File

0
tools/packaging/qemu/patches/v5.0.0/0004-virtiofsd-Add-o-allow_direct_io-no_allow_direct_io-o.patch → tools/packaging/qemu/patches/tag_patches/v5.0.0/0004-virtiofsd-Add-o-allow_direct_io-no_allow_direct_io-o.patch
View File

0
tools/packaging/qemu/patches/v5.0.0/0005-virtiofsd-extract-lo_do_open-from-lo_open.patch → tools/packaging/qemu/patches/tag_patches/v5.0.0/0005-virtiofsd-extract-lo_do_open-from-lo_open.patch
View File

0
tools/packaging/qemu/patches/v5.0.0/0006-virtiofsd-optionally-return-inode-pointer-from-lo_do.patch → tools/packaging/qemu/patches/tag_patches/v5.0.0/0006-virtiofsd-optionally-return-inode-pointer-from-lo_do.patch
View File

0
tools/packaging/qemu/patches/v5.0.0/0007-virtiofsd-prevent-opening-of-special-files-CVE-2020-.patch → tools/packaging/qemu/patches/tag_patches/v5.0.0/0007-virtiofsd-prevent-opening-of-special-files-CVE-2020-.patch
View File

0
tools/packaging/qemu/patches/tag_patches/v5.2.0/no_patches.txt Normal file
View File

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

@ -59,9 +59,12 @@ ADD qemu /root/kata_qemu
ADD scripts/apply_patches.sh /root/apply_patches.sh ADD scripts/apply_patches.sh /root/apply_patches.sh
ADD static-build /root/static-build ADD static-build /root/static-build
RUN echo "Apply patches for base version"
RUN stable_branch=$(cat VERSION | awk 'BEGIN{FS=OFS="."}{print $1 "." $2 ".x"}') && \ RUN stable_branch=$(cat VERSION | awk 'BEGIN{FS=OFS="."}{print $1 "." $2 ".x"}') && \
/root/apply_patches.sh "/root/kata_qemu/patches/${stable_branch}" /root/apply_patches.sh "/root/kata_qemu/patches/${stable_branch}"
RUN echo "Apply patches for specific qemu version"
RUN /root/apply_patches.sh "/root/kata_qemu/patches/tag_patches/${QEMU_VERSION}"
RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \ RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
--with-pkgversion=kata-static --with-pkgversion=kata-static