github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 14:58:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3691 from Jakob-Naucke/fix-apply-patches

Browse Source 
packaging: Use `patch` for applying patches
This commit is contained in:
James O. D. Hunt
2022-02-18 15:51:05 +00:00
committed by GitHub
parent 7db9bef72c 5c9d2b413f
commit a671b455a2
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/scripts/apply_patches.sh
View File

@@ -40,7 +40,7 @@ if [ -d "$patches_dir" ]; then
echo "INFO: Found ${#patches[@]} patches" echo "INFO: Found ${#patches[@]} patches"
for patch in ${patches[@]}; do for patch in ${patches[@]}; do
echo "INFO: Apply $patch" echo "INFO: Apply $patch"
git apply "$patch" || \ patch -p1 < "$patch" || \
{ echo >&2 "ERROR: Not applied. Exiting..."; exit 1; } { echo >&2 "ERROR: Not applied. Exiting..."; exit 1; }
done done
else else

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

@@ -16,6 +16,7 @@ RUN apt-get update && \
flex \ flex \
git \ git \
iptables \ iptables \
libelf-dev && \ libelf-dev \
patch && \
if [ "$(uname -m)" = "s390x" ]; then apt-get install -y --no-install-recommends libssl-dev; fi && \ if [ "$(uname -m)" = "s390x" ]; then apt-get install -y --no-install-recommends libssl-dev; fi && \
apt-get clean && rm -rf /var/lib/lists/ apt-get clean && rm -rf /var/lib/lists/

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

@@ -43,6 +43,7 @@ RUN apt-get update && apt-get upgrade -y && \
pkg-config \ pkg-config \
libseccomp-dev \ libseccomp-dev \
libseccomp2 \ libseccomp2 \
patch \
python \ python \
python-dev \ python-dev \
rsync \ rsync \