Skip to content
Snippets Groups Projects
Unverified Commit 9cb9f5b4 authored by Nils Dagsson Moskopp's avatar Nils Dagsson Moskopp
Browse files

Fix patch applications for Linux kernel

parent 1ef0a1b7
No related branches found
No related tags found
1 merge request!12RC1 of MNT Reform System Image and Rescue Image
...@@ -25,8 +25,13 @@ export \ ...@@ -25,8 +25,13 @@ export \
( (
cd "${LINUX_VERSION}" cd "${LINUX_VERSION}"
for PATCHFILE in ../template-kernel/patches/*.patch; do for PATCHFILE in ../template-kernel/patches/*.patch; do
git apply --check "${PATCHFILE}" git apply \
git apply "${PATCHFILE}" --directory=reform2-imx8mq/"${LINUX_VERSION}" \
"${PATCHFILE}" \
|| continue
git apply \
--directory=reform2-imx8mq/"${LINUX_VERSION}" \
"${PATCHFILE}"
done done
# By default, make writes diagnostic messages to standard out, not # By default, make writes diagnostic messages to standard out, not
......
...@@ -25,8 +25,13 @@ export \ ...@@ -25,8 +25,13 @@ export \
( (
cd "${LINUX_VERSION}" cd "${LINUX_VERSION}"
for PATCHFILE in ../template-kernel/patches/*.patch; do for PATCHFILE in ../template-kernel/patches/*.patch; do
git apply --check "${PATCHFILE}" git apply \
git apply "${PATCHFILE}" --directory=reform2-imx8mq/"${LINUX_VERSION}" \
"${PATCHFILE}" \
|| continue
git apply \
--directory=reform2-imx8mq/"${LINUX_VERSION}" \
"${PATCHFILE}"
done done
>&2 make -j "$(nproc)" Image >&2 make -j "$(nproc)" Image
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment