mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-10-22 12:29:49 +00:00
5c9d2b413f
`tools/packaging/scripts/apply_patches.sh` uses `git apply $patch`, but this will not apply to subdirectories. If one wanted to apply with `git apply`, they'd have to run it with `--directory=...` _relative to the Git tree's root_ (absolute will not work!). I suggest we just use `patch`, which will do what we expected `git apply` would do. `patch` is also added to build containers that require it. Fixes: #3690 Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
51 lines
1.2 KiB
Bash
Executable File
51 lines
1.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# Copyright (c) 2020 Red Hat, Inc.
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
# This script apply patches.
|
|
#
|
|
set -e
|
|
|
|
script_dir="$(realpath $(dirname $0))"
|
|
patches_dir="$1"
|
|
|
|
if [ -z "$patches_dir" ]; then
|
|
cat <<-EOT
|
|
Apply patches to the sources at the current directory.
|
|
|
|
Patches are expected to be named in the standard git-format-patch(1) format where
|
|
the first part of the filename represents the patch ordering (lowest numbers
|
|
apply first):
|
|
'NUMBER-DASHED_DESCRIPTION.patch'
|
|
|
|
For example,
|
|
|
|
0001-fix-the-bad-thing.patch
|
|
0002-improve-the-fix-the-bad-thing-fix.patch
|
|
0003-correct-compiler-warnings.patch
|
|
|
|
Usage:
|
|
$0 PATCHES_DIR
|
|
Where:
|
|
PATCHES_DIR is the directory containing the patches
|
|
EOT
|
|
exit 1
|
|
fi
|
|
|
|
echo "INFO: Apply patches from $patches_dir"
|
|
if [ -d "$patches_dir" ]; then
|
|
patches=($(find "$patches_dir" -name '*.patch'|sort -t- -k1,1n))
|
|
echo "INFO: Found ${#patches[@]} patches"
|
|
for patch in ${patches[@]}; do
|
|
echo "INFO: Apply $patch"
|
|
patch -p1 < "$patch" || \
|
|
{ echo >&2 "ERROR: Not applied. Exiting..."; exit 1; }
|
|
done
|
|
else
|
|
echo "INFO: Patches directory does not exist: ${patches_dir}"
|
|
echo "INFO: Create a ${patches_dir}/no_patches.txt file if the current version has no patches"
|
|
exit 1;
|
|
fi
|