diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2021-07-28 08:39:59 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-06 21:48:05 +0300 |
| commit | 66d661a7f7784d58c8a437f1cdeb0c0ab03f0364 (patch) | |
| tree | d883f6c95333135f9cc9fbef49eebaaef7963e03 /poky | |
| parent | a46b3b06d6692327bdf70a8c0a636d11d8007e68 (diff) | |
| download | openbmc-66d661a7f7784d58c8a437f1cdeb0c0ab03f0364.tar.xz | |
perlcross: not break build if already patched
Currently the build will break if the patch already applied
as the return value of "test ! -f $@" is not 0, so make sure
to return 0 if the patch already applied.
Fixes:
$ bitbake perl-native
Make a change as below
$ git diff
diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb b/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
index b77bbd1fd4..4c5e35ab80 100644
--- a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
+++ b/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
@@ -33,6 +33,7 @@ do_compile () {
do_install_class-native() {
mkdir -p ${D}/${datadir}/perl-cross/
cp -rf ${S}/* ${D}/${datadir}/perl-cross/
+ echo "test" > ${D}/${datadir}/perl-cross/testfile
}
$ bitbake perl-native
NOTE: make -j 40
make crosspatch
make[1]: Entering directory '/build/tmp-glibc/work/x86_64-linux/perl-native/5.34.0-r0/perl-5.34.0'
test ! -f cnf/diffs/perl5-5.34.0/posix-makefile.applied && (patch -p1 -i cnf/diffs/perl5-5.34.0/posix-makefile.patch && touch cnf/diffs/perl5-5.34.0/posix-makefile.applied)
test ! -f cnf/diffs/perl5-5.34.0/dynaloader.applied && (patch -p1 -i cnf/diffs/perl5-5.34.0/dynaloader.patch && touch cnf/diffs/perl5-5.34.0/dynaloader.applied)
make[1]: *** [Makefile:64: cnf/diffs/perl5-5.34.0/posix-makefile.applied] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:64: cnf/diffs/perl5-5.34.0/dynaloader.applied] Error 1
make[1]: Leaving directory '/build/tmp-glibc/work/x86_64-linux/perl-native/5.34.0-r0/perl-5.34.0'
make: *** [Makefile:78: all] Error 2
(From OE-Core rev: 354163db5588d87941f53a2763be62b2430cc1fc)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dd5ebf4fdd3ccbe937001a777ad7fcc1e1319e94)
Change-Id: I5ff726eb777d5efcfe0cab7364763c646cab1ecb
Diffstat (limited to 'poky')
| -rw-r--r-- | poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch b/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch index fb7b28759..8c8f3b717 100644 --- a/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch +++ b/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch @@ -22,7 +22,7 @@ index f4a26f5..7bc748e 100644 # and if that fails, reaching for the source tarball is the safest option. $(CROSSPATCHED): %.applied: %.patch - patch -p1 -i $< && touch $@ -+ test ! -f $@ && (patch -p1 -i $< && touch $@) ++ test ! -f $@ && (patch -p1 -i $< && touch $@) || echo "$@ exist" # ---[ common ]----------------------------------------------------------------- |