From patchwork Thu Apr 12 13:08:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] :Package eglibc: Re-execution of do_patch task is giving error. Date: Thu, 12 Apr 2012 13:08:14 -0000 From: Venkata ramana gollamudi X-Patchwork-Id: 25665 Message-Id: <36ED13F3654AE54CA763E6821D93A57110438F53@szxeml534-mbs.china.huawei.com> To: "'openembedded-core@lists.openembedded.org'" <'openembedded-core@lists.openembedded.org'> Cc: Sanil kumar Failure: Eglibc package : Re-execution of do_patch task is giving error. | ERROR: Function failed: do_fix_ia_headers (see /home/jxu49/osel/sstate-test/build/tmp/work/i586-poky-linux/eglibc-2.13-r20+svnr15508/temp/log.do_patch.15498 for further information) | rm: cannot remove `/home/jxu49/osel/sstate-test/build/tmp/work/i586-poky-linux/eglibc-2.13-r20+svnr15508/eglibc-2_13/libc/sysdeps/i386/bits/huge_vall.h': No such file or directory Steps to reproduce: 1> bitbake -c cleansstate eglibc 2> bitbake eglibc 3> bitbake -c patch eglibc -f Defect: As part of defect https://bugzilla.yoctoproject.org/show_bug.cgi?id=2194 Fix details: eglibc package 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 pass, while send execution of patch task without cleaning tries to remove the files already removed. So changed "rm" to "rm -f". Please find the below patch : -------------------------------------------------------------- diff -Nupr prev/meta/recipes-core/eglibc/eglibc_2.13.bb new/meta/recipes-core/eglibc/eglibc_2.13.bb --- prev/meta/recipes-core/eglibc/eglibc_2.13.bb 2012-04-10 11:12:24.251806908 +0530 +++ new/meta/recipes-core/eglibc/eglibc_2.13.bb 2012-04-10 20:48:08.840802762 +0530 @@ -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 -Nupr prev/meta/recipes-core/eglibc/eglibc_2.15.bb new/meta/recipes-core/eglibc/eglibc_2.15.bb --- prev/meta/recipes-core/eglibc/eglibc_2.15.bb 2012-04-10 11:12:24.214806882 +0530 +++ new/meta/recipes-core/eglibc/eglibc_2.15.bb 2012-04-10 20:50:24.657802746 +0530 @@ -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