ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-24 07:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change patch to git apply

Browse Source
This commit is contained in:
Thierry Laurion 2022-08-30 17:53:57 -04:00
parent f848070d16
commit 1279e8bd57
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)" git clone $($1_repo) "$(build)/$($1_base_dir)"
cd $(build)/$($1_base_dir) && git reset --hard $($1_commit_hash) && git submodule update --init --checkout cd $(build)/$($1_base_dir) && git reset --hard $($1_commit_hash) && git submodule update --init --checkout
if [ -r patches/$($1_patch_name).patch ]; then \ if [ -r patches/$($1_patch_name).patch ]; then \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \
< patches/$($1_patch_name).patch \ < patches/$($1_patch_name).patch \
|| exit 1 ; \ || exit 1 ; \
fi fi
@ -268,7 +268,7 @@ define define_module =
[ -r patches/$($1_patch_name) ] ; then \ [ -r patches/$($1_patch_name) ] ; then \
for patch in patches/$($1_patch_name)/*.patch ; do \ for patch in patches/$($1_patch_name)/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \ echo "Applying patch file : $$$$patch " ; \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \
< $$$$patch \ < $$$$patch \
|| exit 1 ; \ || exit 1 ; \
done ; \ done ; \
@ -296,7 +296,7 @@ define define_module =
mkdir -p "$$(dir $$@)" mkdir -p "$$(dir $$@)"
tar -xf "$(packages)/$($1_tar)" $(or $($1_tar_opt),--strip 1) -C "$$(dir $$@)" tar -xf "$(packages)/$($1_tar)" $(or $($1_tar_opt),--strip 1) -C "$$(dir $$@)"
if [ -r patches/$($1_patch_name).patch ]; then \ if [ -r patches/$($1_patch_name).patch ]; then \
( cd $$(dir $$@) ; patch -p1 ) \ ( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \
< patches/$($1_patch_name).patch \ < patches/$($1_patch_name).patch \
|| exit 1 ; \ || exit 1 ; \
fi fi
@ -304,7 +304,7 @@ define define_module =
[ -r patches/$($1_patch_name) ] ; then \ [ -r patches/$($1_patch_name) ] ; then \
for patch in patches/$($1_patch_name)/*.patch ; do \ for patch in patches/$($1_patch_name)/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \ echo "Applying patch file : $$$$patch " ; \
( cd $$(dir $$@) ; patch -p1 ) \ ( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \
< $$$$patch \ < $$$$patch \
|| exit 1 ; \ || exit 1 ; \
done ; \ done ; \