From 9cb9f5b46c0a147e7daf9d69a0030a59f903b8a4 Mon Sep 17 00:00:00 2001
From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Tue, 2 Jun 2020 17:35:50 +0200
Subject: [PATCH] Fix patch applications for Linux kernel
---
reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do | 9 +++++++--
reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
index 1649b0e..fbe2f5c 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
@@ -25,8 +25,13 @@ export \
(
cd "${LINUX_VERSION}"
for PATCHFILE in ../template-kernel/patches/*.patch; do
- git apply --check "${PATCHFILE}"
- git apply "${PATCHFILE}"
+ git apply \
+ --directory=reform2-imx8mq/"${LINUX_VERSION}" \
+ "${PATCHFILE}" \
+ || continue
+ git apply \
+ --directory=reform2-imx8mq/"${LINUX_VERSION}" \
+ "${PATCHFILE}"
done
# By default, make writes diagnostic messages to standard out, not
diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
index 64aad02..297088e 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
@@ -25,8 +25,13 @@ export \
(
cd "${LINUX_VERSION}"
for PATCHFILE in ../template-kernel/patches/*.patch; do
- git apply --check "${PATCHFILE}"
- git apply "${PATCHFILE}"
+ git apply \
+ --directory=reform2-imx8mq/"${LINUX_VERSION}" \
+ "${PATCHFILE}" \
+ || continue
+ git apply \
+ --directory=reform2-imx8mq/"${LINUX_VERSION}" \
+ "${PATCHFILE}"
done
>&2 make -j "$(nproc)" Image
--
GitLab