Task do_patch_append calling do_fix_ia_headers is removing files using "rm" not
"rm -f".
So first time execution of patch task is success, while re-execution of patch
task
fails as it tries to remove the files already removed.
So changed "rm" to "rm -f".
[Yocto #2194]
Signed-off-by: Venkata Ramana Gollamudi <ramana.gollam...@huawei.com>
---
meta/recipes-core/eglibc/eglibc_2.13.bb | 8 ++++----
meta/recipes-core/eglibc/eglibc_2.15.bb | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb
b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 927f72f..872767e 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -141,7 +141,7 @@ do_fix_ia_headers() {
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/environments.h
${S}/sysdeps/unix/sysv/linux/i386/bits/environments.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
${S}/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
cp ${S}/sysdeps/x86_64/fpu/bits/fenv.h ${S}/sysdeps/i386/fpu/bits/fenv.h
- rm ${S}/sysdeps/i386/bits/huge_vall.h
+ rm -f ${S}/sysdeps/i386/bits/huge_vall.h
cp ${S}/sysdeps/x86_64/bits/link.h ${S}/sysdeps/i386/bits/link.h
cp ${S}/sysdeps/x86_64/bits/mathdef.h ${S}/sysdeps/i386/bits/mathdef.h
cp ${S}/sysdeps/x86_64/fpu/bits/mathinline.h
${S}/sysdeps/i386/fpu/bits/mathinline.h
@@ -150,14 +150,14 @@ do_fix_ia_headers() {
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
cp ${S}/sysdeps/x86_64/bits/select.h ${S}/sysdeps/i386/bits/select.h
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h
${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/semaphore.h
- rm ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+ rm -f ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
cp ${S}/sysdeps/x86_64/bits/setjmp.h ${S}/sysdeps/i386/bits/setjmp.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
${S}/sysdeps/unix/sysv/linux/i386/bits/shm.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h
${S}/sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
${S}/sysdeps/unix/sysv/linux/i386/bits/stat.h
- rm ${S}/sysdeps/i386/i486/bits/string.h ; cp
${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
+ rm -f ${S}/sysdeps/i386/i486/bits/string.h ; cp
${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
# Skip syscall.h, see do_install
- rm ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
+ rm -f ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
cp ${S}/sysdeps/x86_64/bits/wordsize.h ${S}/sysdeps/i386/bits/wordsize.h
cp ${S}/sysdeps/x86_64/bits/xtitypes.h ${S}/sysdeps/i386/bits/xtitypes.h
# i386 version is correct, x86_64 is incorrect for fpu_control.h
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb
b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 1575e7f..dd04378 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -154,7 +154,7 @@ do_fix_ia_headers() {
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/environments.h
${S}/sysdeps/unix/sysv/linux/i386/bits/environments.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
${S}/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
cp ${S}/sysdeps/x86_64/fpu/bits/fenv.h ${S}/sysdeps/i386/fpu/bits/fenv.h
- rm ${S}/sysdeps/i386/bits/huge_vall.h
+ rm -f ${S}/sysdeps/i386/bits/huge_vall.h
cp ${S}/sysdeps/x86_64/bits/link.h ${S}/sysdeps/i386/bits/link.h
cp ${S}/sysdeps/x86_64/bits/mathdef.h ${S}/sysdeps/i386/bits/mathdef.h
cp ${S}/sysdeps/x86_64/fpu/bits/mathinline.h
${S}/sysdeps/i386/fpu/bits/mathinline.h
@@ -163,14 +163,14 @@ do_fix_ia_headers() {
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
cp ${S}/sysdeps/x86_64/bits/select.h ${S}/sysdeps/i386/bits/select.h
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h
${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/semaphore.h
- rm ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+ rm -f ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
cp ${S}/sysdeps/x86_64/bits/setjmp.h ${S}/sysdeps/i386/bits/setjmp.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
${S}/sysdeps/unix/sysv/linux/i386/bits/shm.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h
${S}/sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
${S}/sysdeps/unix/sysv/linux/i386/bits/stat.h
- rm ${S}/sysdeps/i386/i486/bits/string.h ; cp
${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
+ rm -f ${S}/sysdeps/i386/i486/bits/string.h ; cp
${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
# Skip syscall.h, see do_install
- rm ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
+ rm -f ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
cp ${S}/sysdeps/x86_64/bits/wordsize.h ${S}/sysdeps/i386/bits/wordsize.h
cp ${S}/sysdeps/x86_64/bits/xtitypes.h ${S}/sysdeps/i386/bits/xtitypes.h
# i386 version is correct, x86_64 is incorrect for fpu_control.h
--
1.7.7
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
