Skip patching mender patch script if already patched.

teamredlabs · Feb 14, 2020 · eb0cb64 · eb0cb64
1 parent eef7a93
commit eb0cb64
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/recipes-bsp/u-boot/u-boot-espressobin.inc b/recipes-bsp/u-boot/u-boot-espressobin.inc
@@ -16,8 +16,8 @@ SRC_URI_append = " file://0001-Include-menuconfig-options-when-checking-for-Kcon
 SRC_URI_append = " file://0002-Set-HOSTARCH-and-ARCH-when-making-env-target.patch.mender"
 
 do_mender_uboot_auto_configure_fix () {
-    patch "${WORKDIR}/uboot_auto_patch.sh" "${WORKDIR}/0001-Include-menuconfig-options-when-checking-for-Kconfig.patch.mender"
-    patch "${WORKDIR}/uboot_auto_configure.sh" "${WORKDIR}/0002-Set-HOSTARCH-and-ARCH-when-making-env-target.patch.mender"
+    patch -N "${WORKDIR}/uboot_auto_patch.sh" "${WORKDIR}/0001-Include-menuconfig-options-when-checking-for-Kconfig.patch.mender" || true
+    patch -N "${WORKDIR}/uboot_auto_configure.sh" "${WORKDIR}/0002-Set-HOSTARCH-and-ARCH-when-making-env-target.patch.mender" || true
     sed -i 's/${ARCH}/'${TUNE_ARCH_32}'/g' "${WORKDIR}/uboot_auto_configure.sh"
 }