diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT index 7d59b0003e7184590e5096f4343582fdf09a02fa..78c71e17d302ec73225889a24ed5c2e829a8a23e 100644 --- a/configure/E3/DEFINES_FT +++ b/configure/E3/DEFINES_FT @@ -16,22 +16,20 @@ endef define patch_site for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\ printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ - patch -d $(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 < $$i;\ + git apply --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\ done endef define patch_revert_site for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\ - printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ - patch -R -d $(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 < $$i;\ + printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ + git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\ done - endef - ifndef VERBOSE QUIET := @ endif @@ -48,3 +46,4 @@ VARS_EXCLUDES+=patch_site VARS_EXCLUDES+=patch_revert_site VARS_EXCLUDES+=QUIET VARS_EXCLUDES+=SHELL + diff --git a/configure/modules/DEFINES_FT b/configure/modules/DEFINES_FT index c1432254d4a46a46293a183f1f139f10f6c05249..78c71e17d302ec73225889a24ed5c2e829a8a23e 100644 --- a/configure/modules/DEFINES_FT +++ b/configure/modules/DEFINES_FT @@ -16,7 +16,7 @@ endef define patch_site for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\ printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ - patch -d $(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 < $$i;\ + git apply --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\ done endef @@ -24,7 +24,7 @@ endef define patch_revert_site for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\ printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ - patch -R -d $(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 < $$i;\ + git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\ done endef