diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do index 1649b0e2f43d47f73619147ecc480d017d4f44b3..fbe2f5c8483aafd57588c282b9d61fe41a68c1cb 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 64aad02d0e6ca9efec7a2bbf7006beab1d3cbd35..297088ebcf8d57f2952dc26a2b91b84e3ddce4d2 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