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

Merge branch 'patch-failure-pr' of https://github.com/osresearch/heads

Browse Source
This commit is contained in:
Trammell Hudson 2018-07-18 06:52:09 -04:00
commit 6170b4cd06
Failed to extract signature
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -212,14 +212,16 @@ define define_module =
git clone $($1_repo) "$(build)/$($1_base_dir)" git clone $($1_repo) "$(build)/$($1_base_dir)"
if [ -r patches/$1.patch ]; then \ if [ -r patches/$1.patch ]; then \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< patches/$1.patch; \ < patches/$1.patch \
|| exit 1 ; \
fi fi
if [ -d patches/$1 ] && \ if [ -d patches/$1 ] && \
[ -r patches/$1 ] ; then \ [ -r patches/$1 ] ; then \
for patch in patches/$1/*.patch ; do \ for patch in patches/$1/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \ echo "Applying patch file : $$$$patch " ; \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< $$$$patch ; \ < $$$$patch \
|| exit 1 ; \
done ; \ done ; \
fi fi
@touch "$$@" @touch "$$@"
@ -243,14 +245,16 @@ define define_module =
tar -xf "$(packages)/$($1_tar)" -C "$(build)" tar -xf "$(packages)/$($1_tar)" -C "$(build)"
if [ -r patches/$1-$($1_version).patch ]; then \ if [ -r patches/$1-$($1_version).patch ]; then \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< patches/$1-$($1_version).patch; \ < patches/$1-$($1_version).patch \
|| exit 1 ; \
fi fi
if [ -d patches/$1-$($1_version) ] && \ if [ -d patches/$1-$($1_version) ] && \
[ -r patches/$1-$($1_version) ] ; then \ [ -r patches/$1-$($1_version) ] ; then \
for patch in patches/$1-$($1_version)/*.patch ; do \ for patch in patches/$1-$($1_version)/*.patch ; do \
echo "Applying patch file : $$$$patch " ; \ echo "Applying patch file : $$$$patch " ; \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \ ( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< $$$$patch ; \ < $$$$patch \
|| exit 1 ; \
done ; \ done ; \
fi fi
@touch "$$@" @touch "$$@"