On Thu, 2008-07-03 at 11:52 -0400, Nate Straz wrote: > Sorry, I haven't had a chance to get back to this one. Can you see if > it still applies to your trees? It took me a little work to resolve > some conflicts. I think the changes are good, but I want to go back > through it and make sure the build is working the way it was before the > patch.
The Patch is not applying fine as i doubt it was against April LTP release. And within this period, some of the LTP Makefile(s) were changed. Please see the error below: $ patch --dry-run -p1 <../04_06_2008-\([EMAIL PROTECTED] \)-lib_cleanup.patch patching file Makefile patching file include/hugemap_defines.h patching file include/ipcmsg.h patching file include/ipcsem.h patching file include/ipcshm.h patching file include/libclone.h patching file include/libipc.h patching file lib/Makefile Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file lib/Makefile.rej patching file lib/dataascii.c patching file lib/databin.c patching file lib/datapid.c patching file lib/file_lock.c patching file lib/forker.c patching file lib/get_high_address.c patching file lib/libclone/Makefile patching file lib/libclone/libclone.c patching file lib/libipc/Makefile patching file lib/libipc/core/libipc.c patching file lib/libipc/hugemap/Makefile patching file lib/libipc/hugemap/genkey.c patching file lib/libipc/libipc.diff patching file lib/libipc/syscalls/Makefile patching file lib/libipc/syscalls/genkey.c patching file lib/libipc/syscalls/utils.c patching file lib/libtestsuite.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file lib/libtestsuite.c.rej patching file lib/ltp/Makefile patching file lib/ltp/dataascii.c patching file lib/ltp/databin.c patching file lib/ltp/datapid.c patching file lib/ltp/file_lock.c patching file lib/ltp/forker.c patching file lib/ltp/get_high_address.c patching file lib/ltp/libtestsuite.c patching file lib/ltp/ltp.pc patching file lib/ltp/open_flags.c patching file lib/ltp/parse_opts.c patching file lib/ltp/pattern.c patching file lib/ltp/random_range.c patching file lib/ltp/rmobj.c patching file lib/ltp/search_path.c patching file lib/ltp/self_exec.c patching file lib/ltp/str_to_bytes.c patching file lib/ltp/string_to_tokens.c patching file lib/ltp/tlibio.c patching file lib/ltp/tst_cwd_has_free.c patching file lib/ltp/tst_is_cwd_nfs.c patching file lib/ltp/tst_is_cwd_tmpfs.c patching file lib/ltp/tst_kvercmp.c patching file lib/ltp/tst_res.c patching file lib/ltp/tst_res.c.orig patching file lib/ltp/tst_sig.c patching file lib/ltp/tst_tmpdir.c patching file lib/ltp/write_log.c patching file lib/ltp.pc patching file lib/open_flags.c patching file lib/parse_opts.c patching file lib/pattern.c patching file lib/random_range.c patching file lib/rmobj.c patching file lib/search_path.c patching file lib/self_exec.c patching file lib/str_to_bytes.c patching file lib/string_to_tokens.c patching file lib/testsuite/Makefile patching file lib/testsuite/libtestsuite.c patching file lib/testsuite/libtestsuite.h patching file lib/tlibio.c patching file lib/tst_cwd_has_free.c patching file lib/tst_is_cwd_nfs.c patching file lib/tst_is_cwd_tmpfs.c patching file lib/tst_kvercmp.c patching file lib/tst_res.c patching file lib/tst_sig.c patching file lib/tst_tmpdir.c patching file lib/write_log.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file lib/write_log.c.rej The next patch would create the file testcases/ballista/ballista/MakefileHost, which already exists! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file testcases/ballista/ballista/MakefileHost.rej The next patch would create the file testcases/ballista/ballista/MakefileTarget, which already exists! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file testcases/ballista/ballista/MakefileTarget.rej patching file testcases/kernel/containers/Makefile patching file testcases/kernel/containers/libclone/Makefile patching file testcases/kernel/containers/libclone/libclone.c patching file testcases/kernel/containers/libclone/libclone.h patching file testcases/kernel/containers/pidns/Makefile patching file testcases/kernel/containers/pidns/check_pidns_enabled.c patching file testcases/kernel/containers/pidns/pidns01.c patching file testcases/kernel/containers/pidns/pidns02.c patching file testcases/kernel/containers/pidns/pidns03.c patching file testcases/kernel/containers/sysvipc/Makefile patching file testcases/kernel/containers/sysvipc/check_ipcns_enabled.c patching file testcases/kernel/containers/sysvipc/shmnstest.c patching file testcases/kernel/containers/utsname/Makefile patching file testcases/kernel/containers/utsname/check_utsns_enabled.c patching file testcases/kernel/containers/utsname/utstest.c patching file testcases/kernel/mem/hugetlb/Makefile patching file testcases/kernel/mem/hugetlb/hugeshmat/Makefile patching file testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c patching file testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c patching file testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c patching file testcases/kernel/mem/hugetlb/hugeshmctl/Makefile patching file testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c patching file testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c patching file testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c patching file testcases/kernel/mem/hugetlb/hugeshmdt/Makefile patching file testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c patching file testcases/kernel/mem/hugetlb/hugeshmget/Makefile patching file testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c patching file testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c patching file testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c patching file testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c patching file testcases/kernel/mem/hugetlb/lib/Makefile patching file testcases/kernel/mem/hugetlb/lib/ipcmsg.h patching file testcases/kernel/mem/hugetlb/lib/ipcsem.h patching file testcases/kernel/mem/hugetlb/lib/ipcshm.h patching file testcases/kernel/mem/hugetlb/lib/libipc.c patching file testcases/kernel/syscalls/Makefile patching file testcases/kernel/syscalls/ipc/lib/Makefile patching file testcases/kernel/syscalls/ipc/lib/ipcmsg.h patching file testcases/kernel/syscalls/ipc/lib/ipcsem.h patching file testcases/kernel/syscalls/ipc/lib/ipcshm.h patching file testcases/kernel/syscalls/ipc/lib/libipc.c patching file testcases/kernel/syscalls/ipc/msgctl/Makefile patching file testcases/kernel/syscalls/ipc/msgget/Makefile patching file testcases/kernel/syscalls/ipc/msgrcv/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file testcases/kernel/syscalls/ipc/msgrcv/Makefile.rej patching file testcases/kernel/syscalls/ipc/msgsnd/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file testcases/kernel/syscalls/ipc/msgsnd/Makefile.rej patching file testcases/kernel/syscalls/ipc/semctl/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file testcases/kernel/syscalls/ipc/semctl/Makefile.rej patching file testcases/kernel/syscalls/ipc/semget/Makefile patching file testcases/kernel/syscalls/ipc/semget/semget01.c patching file testcases/kernel/syscalls/ipc/semget/semget02.c patching file testcases/kernel/syscalls/ipc/semget/semget03.c patching file testcases/kernel/syscalls/ipc/semget/semget05.c patching file testcases/kernel/syscalls/ipc/semget/semget06.c patching file testcases/kernel/syscalls/ipc/semop/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file testcases/kernel/syscalls/ipc/semop/Makefile.rej patching file testcases/kernel/syscalls/ipc/shmat/Makefile patching file testcases/kernel/syscalls/ipc/shmctl/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file testcases/kernel/syscalls/ipc/shmctl/Makefile.rej patching file testcases/kernel/syscalls/ipc/shmdt/Makefile patching file testcases/kernel/syscalls/ipc/shmget/Makefile patching file testcases/kernel/syscalls/kill/Makefile The next patch would delete the file testcases/kernel/syscalls/lib/Makefile, which does not exist! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored The next patch would delete the file testcases/kernel/syscalls/lib/libtestsuite.c, which does not exist! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored The next patch would delete the file testcases/kernel/syscalls/lib/libtestsuite.h, which does not exist! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored patching file testcases/kernel/syscalls/mremap/Makefile patching file testcases/realtime/Makefile patching file testcases/realtime/lib/Makefile Regards-- Subrata > > Nate > > On Jul 3 18:28, Subrata Modak wrote: > > Nate, > > > > And this one too. > > > > Regards-- > > Subrata > > > > -------- Forwarded Message -------- > > From: Garrett Cooper <[EMAIL PROTECTED]> > > To: ltp-list <[email protected]> > > Subject: [LTP] [PATCH] include / lib cleanup and minor improvements to > > makefiles > > Date: Wed, 18 Jun 2008 17:44:49 -0700 > > > > Summary of changes: > > > > 1. Move lib/* to lib/ltp; included non-m function fixes. > > 2. Move several lib/*.h files to include/ (simplifies) > > 3. Separate out libipc code used by hugemap and syscalls into > > lib/ipc/{hugemap,syscalls} for modularity's sake. Remove relevant > > directories and makefile refs. This was only done for modules with > > present in ltp-base, not sctp/lib or kdump/lib. > > 4. Move testcases/kernel/syscalls/lib to lib/testsuite. > > 5. Remove relative path #includes muck for all test cases in > > testcases/kernel/syscalls/ipc/. > > 6. Insert "ia64 arch dependent" #warning's so that the compiling > > individual is aware of some arch dependent assumptions in ipc syscalls > > sourcecode. > > 7. Punted a few noltp / uclinux targets in the process. > > 8. Yanked out informational "type in make install" message. > > > > Questions and comments, welcome, > > -Garrett > > ------------------------------------------------------------------------- > > Check out the new SourceForge.net Marketplace. > > It's the best place to buy or sell services for > > just about anything Open Source. > > http://sourceforge.net/services/buy/index.php > > _______________________________________________ Ltp-list mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/ltp-list > > ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
