diff options
| author | Venkata ramana gollamudi <ramana.gollamudi@huawei.com> | 2012-04-13 11:44:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-13 15:58:25 +0100 |
| commit | f960da1b48bafb3ccdd58222fe9fc12c1bb6ed9b (patch) | |
| tree | 58eee2891ab09b77692274017534b1aa4dd10bfb /meta/recipes-core | |
| parent | 291e20a51544c640d07767d1dc32d762f4370f41 (diff) | |
| download | openembedded-core-f960da1b48bafb3ccdd58222fe9fc12c1bb6ed9b.tar.gz openembedded-core-f960da1b48bafb3ccdd58222fe9fc12c1bb6ed9b.tar.bz2 openembedded-core-f960da1b48bafb3ccdd58222fe9fc12c1bb6ed9b.tar.xz openembedded-core-f960da1b48bafb3ccdd58222fe9fc12c1bb6ed9b.zip | |
eglibc: fix re-execution of task
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.gollamudi@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 8 | ||||
| -rw-r--r-- | 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 927f72faa..872767e85 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 1575e7fa7..dd04378fb 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 |