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

stable-2.3 | packaging: Use `patch` for applying patches

tools/packaging/scripts/apply_patches.sh

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

tools/packaging/static-build/kernel/Dockerfile

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

tools/packaging/static-build/qemu/Dockerfile

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