From e2278d444c17dc6e42a4b7e7c9e8a5d8be188c82 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 29 Apr 2013 14:13:23 +0200 Subject: ltp: follow OE update to 20130109 version Signed-off-by: Marcin Juszkiewicz --- .../recipes-extended/ltp/files/ltp-arm64.patch | 410 ++++++++++++--------- .../recipes-extended/ltp/ltp_20120903.bbappend | 3 - .../recipes-extended/ltp/ltp_20130109.bbappend | 3 + 3 files changed, 239 insertions(+), 177 deletions(-) delete mode 100644 meta-aarch64/recipes-extended/ltp/ltp_20120903.bbappend create mode 100644 meta-aarch64/recipes-extended/ltp/ltp_20130109.bbappend diff --git a/meta-aarch64/recipes-extended/ltp/files/ltp-arm64.patch b/meta-aarch64/recipes-extended/ltp/files/ltp-arm64.patch index 8911fb7..43c9de0 100644 --- a/meta-aarch64/recipes-extended/ltp/files/ltp-arm64.patch +++ b/meta-aarch64/recipes-extended/ltp/files/ltp-arm64.patch @@ -1,6 +1,23 @@ -diff -urN ltp-full-20120903.orig/testcases/kernel/include/aarch64.in ltp-full-20120903/testcases/kernel/include/aarch64.in ---- ltp-full-20120903.orig/testcases/kernel/include/aarch64.in 1970-01-01 02:00:00.000000000 +0200 -+++ ltp-full-20120903/testcases/kernel/include/aarch64.in 2012-10-15 17:05:24.153016081 +0300 +--- + testcases/kernel/include/aarch64.in | 257 ++++++++++++++++++++ + testcases/kernel/include/order | 1 + testcases/kernel/include/regen.sh | 5 + testcases/kernel/mem/shmt/shmt09.c | 4 + testcases/kernel/syscalls/cacheflush/cacheflush01.c | 27 +- + testcases/kernel/syscalls/getdents/getdents.h | 73 +---- + testcases/kernel/syscalls/getdents/getdents01.c | 15 + + testcases/kernel/syscalls/getdents/getdents02.c | 27 +- + testcases/kernel/syscalls/getdents/getdents03.c | 27 +- + testcases/kernel/syscalls/getdents/getdents04.c | 26 +- + testcases/kernel/syscalls/profil/profil01.c | 2 + testcases/kernel/syscalls/sysctl/sysctl01.c | 4 + testcases/kernel/syscalls/sysctl/sysctl03.c | 4 + testcases/kernel/syscalls/sysctl/sysctl04.c | 4 + testcases/kernel/syscalls/sysctl/sysctl05.c | 4 + 15 files changed, 403 insertions(+), 77 deletions(-) + +--- /dev/null ++++ ltp-20130109/testcases/kernel/include/aarch64.in @@ -0,0 +1,257 @@ +io_setup 0 +io_destroy 1 @@ -259,18 +276,20 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/include/aarch64.in ltp-full-20 +sendmmsg 269 +cacheflush 0x1002 +set_tls 0x1005 -diff -urN ltp-full-20120903.orig/testcases/kernel/include/order ltp-full-20120903/testcases/kernel/include/order ---- ltp-full-20120903.orig/testcases/kernel/include/order 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/include/order 2012-10-15 17:05:24.169015861 +0300 -@@ -1,3 +1,4 @@ +--- ltp-20130109.orig/testcases/kernel/include/order ++++ ltp-20130109/testcases/kernel/include/order +@@ -1,5 +1,6 @@ +aarch64 arm hppa i386 -diff -urN ltp-full-20120903.orig/testcases/kernel/include/regen.sh ltp-full-20120903/testcases/kernel/include/regen.sh ---- ltp-full-20120903.orig/testcases/kernel/include/regen.sh 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/include/regen.sh 2012-10-15 17:05:24.169015861 +0300 -@@ -27,7 +27,7 @@ + ia64 + powerpc64 +--- ltp-20130109.orig/testcases/kernel/include/regen.sh ++++ ltp-20130109/testcases/kernel/include/regen.sh +@@ -25,11 +25,11 @@ cat << EOF > "${output_pid}" + #include + #include "cleanup.c" #define syscall(NR, ...) ({ \\ int __ret; \\ @@ -279,7 +298,11 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/include/regen.sh ltp-full-2012 errno = ENOSYS; \\ __ret = -1; \\ } else { \\ -@@ -71,11 +71,12 @@ + __ret = syscall(NR, ##__VA_ARGS__); \\ + } \\ +@@ -69,15 +69,16 @@ for arch in $(cat "${srcdir}/order") ; d + done + echo -n "Generating stub list ... " echo "" >> "${output_pid}" echo "/* Common stubs */" >> "${output_pid}" @@ -293,19 +316,26 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/include/regen.sh ltp-full-2012 # endif EOF done -diff -urN ltp-full-20120903.orig/testcases/kernel/mem/shmt/shmt09.c ltp-full-20120903/testcases/kernel/mem/shmt/shmt09.c ---- ltp-full-20120903.orig/testcases/kernel/mem/shmt/shmt09.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/mem/shmt/shmt09.c 2012-10-15 17:05:24.169015861 +0300 -@@ -61,7 +61,7 @@ + echo "#endif" >> "${output_pid}" + +--- ltp-20130109.orig/testcases/kernel/mem/shmt/shmt09.c ++++ ltp-20130109/testcases/kernel/mem/shmt/shmt09.c +@@ -59,11 +59,11 @@ int TST_TOTAL = 4; /* Total number of t + + #ifdef __ia64__ #define INCREMENT 8388608 /* 8Mb */ #elif defined (__mips__) || defined (__hppa__) || defined (__sparc__) #define INCREMENT 262144 /* 256Kb */ -#elif defined __sh__ || defined (__arm__) +#elif defined __sh__ || defined (__arm__) || defined(__aarch64__) - #define INCREMENT 16384 /* 16kb */ + #define INCREMENT 16384 /* 16kb */ #else #define INCREMENT SHMLBA -@@ -162,7 +162,7 @@ + #endif + +@@ -160,11 +160,11 @@ int main() + } + tst_resm(TPASS, "sbrk, shmat"); /*--------------------------------------------------------*/ @@ -314,10 +344,13 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/mem/shmt/shmt09.c ltp-full-201 while ((vp = sbrk(INCREMENT)) != (void *)-1) ; if (errno != ENOMEM) { tst_resm(TFAIL, "Error: sbrk failed, errno = %d\n", errno); -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/cacheflush/cacheflush01.c ltp-full-20120903/testcases/kernel/syscalls/cacheflush/cacheflush01.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/cacheflush/cacheflush01.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/cacheflush/cacheflush01.c 2012-10-15 17:05:12.529177068 +0300 -@@ -44,16 +44,9 @@ + rm_shm(shmid); + tst_exit(); +--- ltp-20130109.orig/testcases/kernel/syscalls/cacheflush/cacheflush01.c ++++ ltp-20130109/testcases/kernel/syscalls/cacheflush/cacheflush01.c +@@ -42,29 +42,38 @@ + #include + #include #include #include @@ -334,9 +367,11 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/cacheflush/cacheflush -/* Fake linux_syscall_numbers.h */ -#define __NR_cacheflush 0 #ifndef ICACHE - #define ICACHE (1<<0) /* flush instruction cache */ + #define ICACHE (1<<0) /* flush instruction cache */ + #endif + #ifndef DCACHE + #define DCACHE (1<<1) /* writeback and flush data cache */ #endif -@@ -63,6 +56,22 @@ #ifndef BCACHE #define BCACHE (ICACHE|DCACHE) /* flush both caches */ #endif @@ -359,10 +394,98 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/cacheflush/cacheflush #endif /* Extern Global Variables */ -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents01.c ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents01.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents01.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents01.c 2012-10-15 17:05:24.169015861 +0300 -@@ -81,6 +81,21 @@ + + /* Global Variables */ +--- ltp-20130109.orig/testcases/kernel/syscalls/getdents/getdents.h ++++ ltp-20130109/testcases/kernel/syscalls/getdents/getdents.h +@@ -21,64 +21,27 @@ + * getdents.h - common definitions for the getdents() tests. + */ + + #ifndef __GETDENTS_H + #define __GETDENTS_H 1 +- +-#include +-#include +-#include +-#include + #include + +-/* +- * The dirent struct that the C library exports is not the same +- * as the kernel ABI, so we can't include dirent.h and use the +- * dirent struct from there. Further, since the Linux headers +- * don't export their vision of the struct either, we have to +- * declare our own here. Wheeeeee. +- */ +- +-struct linux_dirent { +- unsigned long d_ino; +- unsigned long d_off; +- unsigned short d_reclen; +- char d_name[]; +-}; +- +-static inline int +-getdents(unsigned int fd, struct dirent *dirp, unsigned int count) +-{ +- union { +- struct linux_dirent *dirp; +- char *buf; +- } ptrs; +- char buf[count]; +- long ret; +- unsigned int i; +- +- ptrs.buf = buf; +- ret = syscall(SYS_getdents, fd, buf, count); +- if (ret < 0) +- return ret; +- +-#define kdircpy(field) memcpy(&dirp[i].field, &ptrs.dirp->field, sizeof(dirp[i].field)) +- +- i = 0; +- while (i < count && i < ret) { +- unsigned long reclen; +- +- kdircpy(d_ino); +- kdircpy(d_reclen); +- reclen = dirp[i].d_reclen; +- kdircpy(d_off); +- strcpy(dirp[i].d_name, ptrs.dirp->d_name); +- +- ptrs.buf += reclen; +- +- i += reclen; +- } +- +- return ret; +-} ++#ifdef __i386__ ++ #define GETDENTS_ASM() ({ int __rval; \ ++ __asm__ __volatile__(" \ ++ movl %4, %%edx \n \ ++ movl %3, %%ecx \n \ ++ movl %2, %%ebx \n \ ++ movl %1, %%eax \n \ ++ int $0x80 \n \ ++ movl %%eax, %0" \ ++ : "=a" (__rval) \ ++ : "a" (cnum), "b" (fd), "c" (dirp), "d" (count)\ ++ : "memory" \ ++ ); \ ++ __rval; \ ++ }) ++#else ++ #define GETDENTS_ASM() 0 ++#endif /* __i386__ */ + + #endif /* getdents.h */ +--- ltp-20130109.orig/testcases/kernel/syscalls/getdents/getdents01.c ++++ ltp-20130109/testcases/kernel/syscalls/getdents/getdents01.c +@@ -79,10 +79,25 @@ int main(int ac, char **av) + int count; + size_t size = 0; char *dir_name = NULL; struct dirent *dirp; @@ -384,31 +507,13 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents01.c if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); -@@ -109,14 +124,17 @@ - rval = getdents(fd, dirp, count); - if (rval < 0) { - -- TEST_ERROR_LOG(errno); -+ rval *= -1; -+ TEST_ERROR_LOG(rval); - -- tst_resm(TFAIL|TERRNO, "getdents failed unexpectedly"); -+ tst_resm(TFAIL, "%s call failed - errno = %d " -+ ": %s", TCID, rval, strerror(rval)); - continue; - } - - if (rval == 0) { -- tst_resm(TFAIL, "getdents failed - returned end of directory"); -+ tst_resm(TFAIL, "%s call failed - returned " -+ "end of directory", TCID); - continue; - } + setup(); -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents02.c ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents02.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents02.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents02.c 2012-10-15 17:05:18.189098682 +0300 -@@ -69,12 +69,21 @@ +--- ltp-20130109.orig/testcases/kernel/syscalls/getdents/getdents02.c ++++ ltp-20130109/testcases/kernel/syscalls/getdents/getdents02.c +@@ -67,16 +67,25 @@ void setup(void); + char *TCID = "getdents02"; + int TST_TOTAL = 1; int exp_enos[] = { EBADF, 0 }; /* 0 terminated list of expected errnos */ @@ -430,7 +535,11 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents02.c size_t size = 0; char *dir_name = NULL; struct dirent *dirp; -@@ -100,15 +109,25 @@ + + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) +@@ -98,19 +107,29 @@ int main(int ac, char **av) + + /* set up a bad file descriptor */ fd = -5; @@ -458,17 +567,22 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents02.c + switch (rval) { case EBADF: tst_resm(TPASS, - "failed as expected with EBADF"); -@@ -151,3 +170,5 @@ + "failed as expected with EBADF"); + break; + default: +@@ -149,5 +168,7 @@ void cleanup(void) + + TEST_CLEANUP; tst_rmdir(); } + +#endif /* __i386__ */ -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents03.c ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents03.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents03.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents03.c 2012-10-15 17:05:18.189098682 +0300 -@@ -72,12 +72,21 @@ +--- ltp-20130109.orig/testcases/kernel/syscalls/getdents/getdents03.c ++++ ltp-20130109/testcases/kernel/syscalls/getdents/getdents03.c +@@ -70,16 +70,25 @@ void setup(void); + char *TCID = "getdents03"; + int TST_TOTAL = 1; int exp_enos[] = { EINVAL, 0 }; /* 0 terminated list of expected errnos */ @@ -490,7 +604,11 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents03.c size_t size = 0; char *dir_name = NULL; struct dirent *dirp; -@@ -105,16 +114,26 @@ + + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) +@@ -102,20 +111,30 @@ int main(int ac, char **av) + count = 1; + if ((fd = open(dir_name, O_RDONLY)) == -1) tst_brkm(TBROK, cleanup, "open of directory failed"); @@ -519,17 +637,22 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents03.c + switch (rval) { case EINVAL: tst_resm(TPASS, - "getdents failed with EINVAL as expected"); -@@ -162,3 +181,5 @@ + "getdents failed with EINVAL as expected"); + break; + default: +@@ -159,5 +178,7 @@ void cleanup(void) + + TEST_CLEANUP; tst_rmdir(); } + +#endif /* __i386__ */ -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents04.c ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents04.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents04.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents04.c 2012-10-15 17:05:18.193098626 +0300 -@@ -73,11 +73,20 @@ +--- ltp-20130109.orig/testcases/kernel/syscalls/getdents/getdents04.c ++++ ltp-20130109/testcases/kernel/syscalls/getdents/getdents04.c +@@ -71,15 +71,24 @@ void setup(void); + char *TCID = "getdents04"; + int TST_TOTAL = 1; int exp_enos[] = { ENOTDIR, 0 }; /* 0 terminated list of expected errnos */ @@ -550,7 +673,11 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents04.c size_t size = 0; char *dir_name = NULL; struct dirent *dirp; -@@ -122,7 +131,15 @@ + struct stat *sbuf; + char *newfile; +@@ -121,21 +130,30 @@ int main(int ac, char **av) + tst_brkm(TBROK, cleanup, "fstat failed"); + if (S_ISDIR(sbuf->st_mode)) tst_brkm(TBROK, cleanup, "fd is a directory"); @@ -567,7 +694,7 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents04.c /* * Calling with a non directory file descriptor should give -@@ -130,9 +147,10 @@ + * an ENOTDIR error. */ if (rval < 0) { @@ -579,101 +706,22 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents04.c + switch (rval) { case ENOTDIR: tst_resm(TPASS, - "getdents failed as expected with ENOTDIR"); -@@ -180,3 +198,5 @@ + "getdents failed as expected with ENOTDIR"); + break; + default: +@@ -179,5 +197,7 @@ void cleanup(void) + + TEST_CLEANUP; tst_rmdir(); } + +#endif /* __i386__ */ -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents.h ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents.h ---- ltp-full-20120903.orig/testcases/kernel/syscalls/getdents/getdents.h 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/getdents/getdents.h 2012-10-15 17:05:18.189098682 +0300 -@@ -23,62 +23,25 @@ +--- ltp-20130109.orig/testcases/kernel/syscalls/profil/profil01.c ++++ ltp-20130109/testcases/kernel/syscalls/profil/profil01.c +@@ -56,10 +56,12 @@ char *TCID = "profil01"; - #ifndef __GETDENTS_H - #define __GETDENTS_H 1 -- --#include --#include --#include --#include - #include - --/* -- * The dirent struct that the C library exports is not the same -- * as the kernel ABI, so we can't include dirent.h and use the -- * dirent struct from there. Further, since the Linux headers -- * don't export their vision of the struct either, we have to -- * declare our own here. Wheeeeee. -- */ -- --struct linux_dirent { -- unsigned long d_ino; -- unsigned long d_off; -- unsigned short d_reclen; -- char d_name[]; --}; -- --static inline int --getdents(unsigned int fd, struct dirent *dirp, unsigned int count) --{ -- union { -- struct linux_dirent *dirp; -- char *buf; -- } ptrs; -- char buf[count]; -- long ret; -- unsigned int i; -- -- ptrs.buf = buf; -- ret = syscall(SYS_getdents, fd, buf, count); -- if (ret < 0) -- return ret; -- --#define kdircpy(field) memcpy(&dirp[i].field, &ptrs.dirp->field, sizeof(dirp[i].field)) -- -- i = 0; -- while (i < count && i < ret) { -- unsigned long reclen; -- -- kdircpy(d_ino); -- kdircpy(d_reclen); -- reclen = dirp[i].d_reclen; -- kdircpy(d_off); -- strcpy(dirp[i].d_name, ptrs.dirp->d_name); -- -- ptrs.buf += reclen; -- -- i += reclen; -- } -- -- return ret; --} -+#ifdef __i386__ -+ #define GETDENTS_ASM() ({ int __rval; \ -+ __asm__ __volatile__(" \ -+ movl %4, %%edx \n \ -+ movl %3, %%ecx \n \ -+ movl %2, %%ebx \n \ -+ movl %1, %%eax \n \ -+ int $0x80 \n \ -+ movl %%eax, %0" \ -+ : "=a" (__rval) \ -+ : "a" (cnum), "b" (fd), "c" (dirp), "d" (count)\ -+ : "memory" \ -+ ); \ -+ __rval; \ -+ }) -+#else -+ #define GETDENTS_ASM() 0 -+#endif /* __i386__ */ - - #endif /* getdents.h */ -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/profil/profil01.c ltp-full-20120903/testcases/kernel/syscalls/profil/profil01.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/profil/profil01.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/profil/profil01.c 2012-10-15 17:05:24.173015806 +0300 -@@ -58,6 +58,8 @@ + #ifndef __UCLIBC__ #ifdef __arm__ #define ADDRESS_OFFSET 0x8000 @@ -682,12 +730,15 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/profil/profil01.c ltp #else #define ADDRESS_OFFSET 0 #endif -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl01.c ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl01.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl01.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl01.c 2012-10-15 17:05:24.173015806 +0300 -@@ -58,9 +58,13 @@ + + #define FAILED 0 +--- ltp-20130109.orig/testcases/kernel/syscalls/sysctl/sysctl01.c ++++ ltp-20130109/testcases/kernel/syscalls/sysctl/sysctl01.c +@@ -56,13 +56,17 @@ char *TCID = "sysctl01"; + int TST_TOTAL = 3; + static int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp, - void *newval, size_t newlen) + void *newval, size_t newlen) { +#ifdef __NR__sysctl struct __sysctl_args args = @@ -699,10 +750,13 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl01.c ltp } #define SIZE(x) sizeof(x)/sizeof(x[0]) -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl03.c ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl03.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl03.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl03.c 2012-10-15 17:05:24.173015806 +0300 -@@ -78,9 +78,13 @@ + + struct utsname buf; +--- ltp-20130109.orig/testcases/kernel/syscalls/sysctl/sysctl03.c ++++ ltp-20130109/testcases/kernel/syscalls/sysctl/sysctl03.c +@@ -76,13 +76,17 @@ char *TCID = "sysctl03"; + int TST_TOTAL = 2; + int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp, void *newval, size_t newlen) { @@ -716,10 +770,13 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl03.c ltp } #define SIZE(x) sizeof(x)/sizeof(x[0]) -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl04.c ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl04.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl04.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl04.c 2012-10-15 17:05:24.173015806 +0300 -@@ -59,9 +59,13 @@ + #define OSNAMESZ 100 + +--- ltp-20130109.orig/testcases/kernel/syscalls/sysctl/sysctl04.c ++++ ltp-20130109/testcases/kernel/syscalls/sysctl/sysctl04.c +@@ -57,13 +57,17 @@ char *TCID = "sysctl04"; + int TST_TOTAL = 2; + int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp, void *newval, size_t newlen) { @@ -733,10 +790,13 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl04.c ltp } #define SIZE(x) sizeof(x)/sizeof(x[0]) -diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl05.c ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl05.c ---- ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl05.c 2012-09-03 07:39:27.000000000 +0300 -+++ ltp-full-20120903/testcases/kernel/syscalls/sysctl/sysctl05.c 2012-10-15 17:05:24.173015806 +0300 -@@ -61,9 +61,13 @@ + #define OSNAMESZ 100 + +--- ltp-20130109.orig/testcases/kernel/syscalls/sysctl/sysctl05.c ++++ ltp-20130109/testcases/kernel/syscalls/sysctl/sysctl05.c +@@ -59,13 +59,17 @@ char *TCID = "sysctl05"; + int TST_TOTAL = 2; + int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp, void *newval, size_t newlen) { @@ -750,3 +810,5 @@ diff -urN ltp-full-20120903.orig/testcases/kernel/syscalls/sysctl/sysctl05.c ltp } #define SIZE(x) sizeof(x)/sizeof(x[0]) + + char osname[BUFSIZ]; diff --git a/meta-aarch64/recipes-extended/ltp/ltp_20120903.bbappend b/meta-aarch64/recipes-extended/ltp/ltp_20120903.bbappend deleted file mode 100644 index b0cc8fe..0000000 --- a/meta-aarch64/recipes-extended/ltp/ltp_20120903.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append = " file://ltp-arm64.patch" diff --git a/meta-aarch64/recipes-extended/ltp/ltp_20130109.bbappend b/meta-aarch64/recipes-extended/ltp/ltp_20130109.bbappend new file mode 100644 index 0000000..b0cc8fe --- /dev/null +++ b/meta-aarch64/recipes-extended/ltp/ltp_20130109.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = " file://ltp-arm64.patch" -- cgit v1.2.3