ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-01-29 15:44:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Emergency revert of git apply instead of patch

Browse Source
This commit is contained in:
Thierry Laurion 2022-08-30 15:57:30 -04:00
parent 48b9b74f39
commit 988b05f09d
No known key found for this signature in database
GPG Key ID: E7B4A71658E36A93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -260,7 +260,7 @@ define define_module =
git clone $($1_repo) "$(build)/$($1_base_dir)"
cd $(build)/$($1_base_dir) && git submodule update --init --checkout
if [ -r patches/$($1_patch_name).patch ]; then \
( git apply --verbose --reject --binary --directory build/$($1_base_dir) ) \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< patches/$($1_patch_name).patch \
|| exit 1 ; \
fi
@ -268,7 +268,7 @@ define define_module =
[ -r patches/$($1_patch_name) ] ; then \
for patch in patches/$($1_patch_name)/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \
( git apply --verbose --reject --binary --directory build/$($1_base_dir) ) \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< $$$$patch \
|| exit 1 ; \
done ; \
@ -296,7 +296,7 @@ define define_module =
mkdir -p "$$(dir $$@)"
tar -xf "$(packages)/$($1_tar)" $(or $($1_tar_opt),--strip 1) -C "$$(dir $$@)"
if [ -r patches/$($1_patch_name).patch ]; then \
( git apply --verbose --reject --binary --directory build/$($1_base_dir) ) \
( cd $$(dir $$@) ; patch -p1 ) \
< patches/$($1_patch_name).patch \
|| exit 1 ; \
fi
@ -304,7 +304,7 @@ define define_module =
[ -r patches/$($1_patch_name) ] ; then \
for patch in patches/$($1_patch_name)/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \
( git apply --verbose --reject --binary --directory build/$($1_base_dir) ) \
( cd $$(dir $$@) ; patch -p1 ) \
< $$$$patch \
|| exit 1 ; \
done ; \