From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f176.google.com (mail-io0-f176.google.com [209.85.223.176]) by mail.openembedded.org (Postfix) with ESMTP id 5355A71AE4 for ; Wed, 9 Aug 2017 20:47:38 +0000 (UTC) Received: by mail-io0-f176.google.com with SMTP id m88so2708675iod.2 for ; Wed, 09 Aug 2017 13:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IVs1kJuN8vsCbZG4GYV01NBcUKM/qI2XRkDbg7qMljE=; b=AgXcmqn0uSKSvm6ffU+pnZxMXbtvNxG5aRIHAZGytxuTqfSA5G+PSQvKAHPdkEg2Md fQM7+HV4jxZKbnzYjh8KZ4zlaHuPH2XuXROX5D8yLhdi+PS2dVcrTbtS+BprgIlUZoqO 52nJkltX+U2i5CDrRaup9cnb0hZawhRIyTjPnvuaViDe1U8Wfs4osIH5AWWjWcPB7weI Q5STp673fwZVAlxJoX2xTInHFYDhRZHZ/4+8X6m5+evvq/YKgt5MJXpyC2Irs1L8+8+H J6DAQwZ3j7dxKVfPWdjKAbWv959kQKWPowgzYKcRvs1fRWl2fVA70VEwm19sHypGrgtF 4QFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=IVs1kJuN8vsCbZG4GYV01NBcUKM/qI2XRkDbg7qMljE=; b=uWek/9FuAYC1KQ46rQJ38gI8qWoBE5L0CFpzPWDHq4EDZk6TXuzy47iU5vNlYj/tCK vee0PrajcxCCfDbedA77TnyxHo7m5B9Z6eFJ5S5/qU00EuRUxlKetE3WtG8bTXp8PTE4 gywptrSv/w+BKjxm+ZQT7TO40R4+AfX6xq1PAJK2TUrCDGJtZLmwd1B5emx4Ha/tFRAk RRkHXLaZVJl0qqYKgWJP+n8olm0ncpZMmp+Gy/SGWoUF9WJG1QmtLKoFJ4WPWHsDQR7g IpdULhe1k86U+6heP5t+7C3t0poJv1uzCTY283ssggro+Stuvt3yUqYHJpGv0ihw1i2F n+yg== X-Gm-Message-State: AIVw111IjK4lww1bApZ0RT/ODdNfPo8wz927h3e+Xf4h3+yWwY+AzlMk q97kirMyEtb4Ov6LqTz6YJ7SXFPsXzkQ X-Received: by 10.107.171.69 with SMTP id u66mr8161440ioe.231.1502311660284; Wed, 09 Aug 2017 13:47:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.135.234 with HTTP; Wed, 9 Aug 2017 13:47:19 -0700 (PDT) In-Reply-To: References: From: "Burton, Ross" Date: Wed, 9 Aug 2017 21:47:19 +0100 Message-ID: To: Dengke Du Cc: OE-core Subject: Re: [PATCH V2 1/1] ltp: upgrade to upstream latest commit on 20170804 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2017 20:47:39 -0000 Content-Type: multipart/alternative; boundary="94eb2c05b4bada875d0556583041" --94eb2c05b4bada875d0556583041 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Breaks with musl: http://errors.yoctoproject.org/Errors/Details/150199/ Ross On 4 August 2017 at 11:00, Dengke Du wrote: > drop 4 patches because the upstream already contains them: > > 0001-dirtyc0w-Include-stdint.h.patch > 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch > 0037-faccessat-and-fchmodat-Fix-build-warnings.patch > 0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch > > drop the do_compile_prepend function, because the upstream already fix > the parallel make race, we can check it here: > > https://github.com/linux-test-project/ltp/commit/ > 3f385652efe811fe7491474f8513baf44cf0a12d > > Signed-off-by: Dengke Du > --- > .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 ------ > ...TH_MAX-undeclared-when-building-with-musl.patch | 31 ----- > ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 ----------- > ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 > --------------------- > meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- > 5 files changed, 1 insertion(+), 282 deletions(-) > delete mode 100644 meta/recipes-extended/ltp/ltp/ > 0001-dirtyc0w-Include-stdint.h.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/ > 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/ > 0037-faccessat-and-fchmodat-Fix-build-warnings.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02= - > update-to-test-fix-for-nonempty-N.patch > > diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h= .patch > b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch > deleted file mode 100644 > index 5c73be4..0000000 > --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Fri, 9 Jun 2017 09:32:13 -0700 > -Subject: [PATCH] dirtyc0w: Include stdint.h > - > -uintptr_t is defined in stdint.h > - > -Fixes > -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in > this function); did you mean 'intptr_t'? > -| lseek(mfd, (uintptr_t) map, SEEK_SET); > -| ^~~~~~~~~ > - > -Signed-off-by: Khem Raj > ---- > -Upstream-Status: Submitted > - > - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c > b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c > -index 5328a9bc4..49abdd6ba 100644 > ---- a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c > -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c > -@@ -23,6 +23,7 @@ > - #include > - #include > - #include > -+#include > - #include > - > - #include "tst_safe_pthread.h" > --- > -2.13.1 > - > diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX- > undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ > ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch > deleted file mode 100644 > index 020ddfe..0000000 > --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX- > undeclared-when-building-with-musl.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 > -From: Dengke Du > -Date: Thu, 9 Feb 2017 16:41:12 +0800 > -Subject: [PATCH] fix PATH_MAX undeclared when building with musl > - > -fix PATH_MAX undeclared when building with musl. > - > -Upstream-Status: Submitted [https://github.com/linux- > test-project/ltp/pull/176] > - > -Signed-off-by: Dengke Du > ---- > - include/tst_test.h | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/include/tst_test.h b/include/tst_test.h > -index 335c82684..4dfa1511b 100644 > ---- a/include/tst_test.h > -+++ b/include/tst_test.h > -@@ -23,6 +23,9 @@ > - #endif /* __TEST_H__ */ > - > - #include > -+#ifndef __GLIBC__ > -+#include > -+#endif > - > - #include "tst_common.h" > - #include "tst_res_flags.h" > --- > -2.11.0 > - > diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and- > fchmodat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ > ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch > deleted file mode 100644 > index 99497d6..0000000 > --- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and- > fchmodat-Fix-build-warnings.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 2001 > -From: Naresh Kamboju > -Date: Mon, 19 Jun 2017 19:01:21 +0530 > -Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=3DUTF-8 > -Content-Transfer-Encoding: 8bit > - > -Fixing below build warnings. > - > -ltp-full-20170516/testcases/kernel/syscalls/faccessat$ make > -In file included from ../../../../include/old/test.h:51:0, > - from faccessat01.c:44: > -faccessat01.c: In function =E2=80=98setup=E2=80=99: > -../../../../include/old/old_safe_file_ops.h:55:27: > -warning: format not a string literal and no format arguments > [-Wformat-security] > - (path), (fmt), ## __VA_ARGS__) > - ^ > -faccessat01.c:132:2: note: in expansion of macro =E2=80=98SAFE_FILE_PRIN= TF=E2=80=99 > - SAFE_FILE_PRINTF(cleanup, testfile, testfile); > - ^ > -../../../../include/old/old_safe_file_ops.h:55:27: > -warning: format not a string literal and no format arguments > [-Wformat-security] > - (path), (fmt), ## __VA_ARGS__) > - ^ > -faccessat01.c:133:2: note: in expansion of macro =E2=80=98SAFE_FILE_PRIN= TF=E2=80=99 > - SAFE_FILE_PRINTF(cleanup, testfile2, testfile2); > - > -Signed-off-by: Naresh Kamboju > -Upstream-Status: Accepted [https://github.com/linux- > test-project/ltp/commit/4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647] > ---- > - testcases/kernel/syscalls/faccessat/faccessat01.c | 4 ++-- > - testcases/kernel/syscalls/fchmodat/fchmodat01.c | 4 ++-- > - 2 files changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c > b/testcases/kernel/syscalls/faccessat/faccessat01.c > -index 622dfd3b0..def7fa755 100644 > ---- a/testcases/kernel/syscalls/faccessat/faccessat01.c > -+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c > -@@ -129,8 +129,8 @@ void setup(void) > - fds[0] =3D SAFE_OPEN(cleanup, pathname, O_DIRECTORY); > - fds[1] =3D fds[4] =3D fds[0]; > - > -- SAFE_FILE_PRINTF(cleanup, testfile, testfile); > -- SAFE_FILE_PRINTF(cleanup, testfile2, testfile2); > -+ SAFE_FILE_PRINTF(cleanup, testfile, "%s", testfile); > -+ SAFE_FILE_PRINTF(cleanup, testfile2, "%s", testfile2); > - > - fds[2] =3D SAFE_OPEN(cleanup, testfile3, O_CREAT | O_RDWR, 0600); > - > -diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c > b/testcases/kernel/syscalls/fchmodat/fchmodat01.c > -index 6bf66d8b8..7856ed3fa 100644 > ---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c > -+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c > -@@ -127,8 +127,8 @@ void setup(void) > - fds[0] =3D SAFE_OPEN(cleanup, pathname, O_DIRECTORY); > - fds[1] =3D fds[4] =3D fds[0]; > - > -- SAFE_FILE_PRINTF(cleanup, testfile, testfile); > -- SAFE_FILE_PRINTF(cleanup, testfile2, testfile2); > -+ SAFE_FILE_PRINTF(cleanup, testfile, "%s", testfile); > -+ SAFE_FILE_PRINTF(cleanup, testfile2, "%s", testfile2); > - > - fds[2] =3D SAFE_OPEN(cleanup, testfile3, O_CREAT | O_RDWR, 0600); > - fds[3] =3D 100; > --- > -2.13.0 > - > diff --git a/meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02- > update-to-test-fix-for-nonempty-N.patch b/meta/recipes-extended/ltp/ > ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch > deleted file mode 100644 > index 3759e1f..0000000 > --- a/meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02- > update-to-test-fix-for-nonempty-N.patch > +++ /dev/null > @@ -1,136 +0,0 @@ > -From 25045624e941ee76a13febd36187e23c6c435507 Mon Sep 17 00:00:00 2001 > -From: Eric Biggers > -Date: Mon, 12 Jun 2017 11:55:21 -0700 > -Subject: [PATCH 01/39] syscalls/add_key02: update to test fix for nonemp= ty > - NULL payload > - > -add_key02 was supposed to be a "Basic test for the add_key() syscall", > -but it actually happened to test the obscure case of passing a NULL > -payload with nonzero length. This case was mishandled by the kernel, > -which either returned EINVAL or crashed with a NULL pointer dereference, > -depending on the key type. (The former applied to the test, as it used > -the "user" key type.) The expected behavior in this case is that the > -syscall fail with EFAULT. > - > -Update the test to expect the fixed behavior from v4.12-rc5, and make > -the test more thorough by testing additional key types, including ones > -that caused a NULL pointer dereference in unfixed kernels. > - > -Signed-off-by: Eric Biggers > -Upstream-Status: Accepted [https://github.com/linux- > test-project/ltp/commit/25045624e941ee76a13febd36187e23c6c435507] > ---- > - testcases/kernel/syscalls/add_key/add_key02.c | 69 > ++++++++++++++++++++------- > - 1 file changed, 51 insertions(+), 18 deletions(-) > - > -diff --git a/testcases/kernel/syscalls/add_key/add_key02.c > b/testcases/kernel/syscalls/add_key/add_key02.c > -index 866800d6f..2e3308dcd 100644 > ---- a/testcases/kernel/syscalls/add_key/add_key02.c > -+++ b/testcases/kernel/syscalls/add_key/add_key02.c > -@@ -1,5 +1,6 @@ > - /*********************************************************** > ******************* > - * Copyright (c) Crackerjack Project., 2007 > * > -+ * Copyright (c) 2017 Google, Inc. > * > - * > * > - * This program is free software; you can redistribute it and/or > modify * > - * it under the terms of the GNU General Public License as published by > * > -@@ -18,10 +19,17 @@ > - ************************************************************ > ******************/ > - > - /* > -- * Basic test for the add_key() syscall. > -+ * Test that the add_key() syscall correctly handles a NULL payload wit= h > nonzero > -+ * length. Specifically, it should fail with EFAULT rather than oopsin= g > the > -+ * kernel with a NULL pointer dereference or failing with EINVAL, as it > did > -+ * before (depending on the key type). This is a regression test for > commit > -+ * 5649645d725c ("KEYS: fix dereferencing NULL payload with nonzero > length"). > - * > -- * History: Porting from Crackerjack to LTP is done by > -- * Manas Kumar Nayak maknayak@in.ibm.com> > -+ * Note that none of the key types that exhibited the NULL pointer > dereference > -+ * are guaranteed to be built into the kernel, so we just test as many > as we > -+ * can, in the hope of catching one. We also test with the "user" key > type for > -+ * good measure, although it was one of the types that failed with > EINVAL rather > -+ * than dereferencing NULL. > - */ > - > - #include "config.h" > -@@ -33,36 +41,61 @@ > - > - #ifdef HAVE_LINUX_KEYCTL_H > - struct tcase { > -- char *type; > -- char *desc; > -- void *payload; > -- int plen; > -- int exp_errno; > -+ const char *type; > -+ size_t plen; > - } tcases[] =3D { > -- {"user", "firstkey", NULL, 1, EINVAL} > -+ /* > -+ * The payload length we test for each key type needs to pass > initial > -+ * validation but is otherwise arbitrary. Note: the "rxrpc_s" ke= y > type > -+ * requires a payload of exactly 8 bytes. > -+ */ > -+ { "asymmetric", 64 }, > -+ { "cifs.idmap", 64 }, > -+ { "cifs.spnego", 64 }, > -+ { "pkcs7_test", 64 }, > -+ { "rxrpc", 64 }, > -+ { "rxrpc_s", 8 }, > -+ { "user", 64 }, > - }; > - #endif /* HAVE_LINUX_KEYCTL_H */ > - > - static void verify_add_key(unsigned int i) > - { > - #ifdef HAVE_LINUX_KEYCTL_H > -- TEST(tst_syscall(__NR_add_key, tcases[i].type, tcases[i].desc, > -- tcases[i].payload, tcases[i].plen, > -- KEY_SPEC_USER_KEYRING)); > -+ TEST(tst_syscall(__NR_add_key, tcases[i].type, "abc:def", > -+ NULL, tcases[i].plen, KEY_SPEC_PROCESS_KEYRING))= ; > - > - if (TEST_RETURN !=3D -1) { > -- tst_res(TFAIL, "add_key() passed unexpectedly"); > -+ tst_res(TFAIL, > -+ "add_key() with key type '%s' unexpectedly > succeeded", > -+ tcases[i].type); > - return; > - } > - > -- if (TEST_ERRNO =3D=3D tcases[i].exp_errno) { > -- tst_res(TPASS | TTERRNO, "add_key() failed expectedly"); > -+ if (TEST_ERRNO =3D=3D EFAULT) { > -+ tst_res(TPASS, "received expected EFAULT with key type > '%s'", > -+ tcases[i].type); > - return; > - } > - > -- tst_res(TFAIL | TTERRNO, > -- "add_key() failed unexpectedly, expected %s", > -- tst_strerrno(tcases[i].exp_errno)); > -+ if (TEST_ERRNO =3D=3D ENODEV) { > -+ tst_res(TCONF, "kernel doesn't support key type '%s'", > -+ tcases[i].type); > -+ return; > -+ } > -+ > -+ /* > -+ * It's possible for the "asymmetric" key type to be supported, > but with > -+ * no asymmetric key parsers registered. In that case, attemptin= g > to > -+ * add a key of type asymmetric will fail with EBADMSG. > -+ */ > -+ if (TEST_ERRNO =3D=3D EBADMSG && !strcmp(tcases[i].type, > "asymmetric")) { > -+ tst_res(TCONF, "no asymmetric key parsers are registered"= ); > -+ return; > -+ } > -+ > -+ tst_res(TFAIL | TTERRNO, "unexpected error with key type '%s'", > -+ tcases[i].type); > - #else > - tst_brk(TCONF, "linux/keyctl.h was missing upon compilation."); > - #endif /* HAVE_LINUX_KEYCTL_H */ > --- > -2.13.0 > - > diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb > b/meta/recipes-extended/ltp/ltp_20170516.bb > index 86b8012..46c9741 100644 > --- a/meta/recipes-extended/ltp/ltp_20170516.bb > +++ b/meta/recipes-extended/ltp/ltp_20170516.bb > @@ -21,7 +21,7 @@ DEPENDS_append_libc-musl =3D " fts " > EXTRA_OEMAKE_append_libc-musl =3D " LIBC=3Dmusl " > CFLAGS_append_powerpc64 =3D " -D__SANE_USERSPACE_TYPES__" > CFLAGS_append_mipsarchn64 =3D " -D__SANE_USERSPACE_TYPES__" > -SRCREV =3D "6c6c6ca40afb3611e52486f670085762ff451e91" > +SRCREV =3D "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22" > > SRC_URI =3D "git://github.com/linux-test-project/ltp.git \ > file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ > @@ -29,7 +29,6 @@ SRC_URI =3D "git://github.com/linux-test-project/ltp.gi= t \ > file://0003-Add-knob-to-control-tirpc-support.patch \ > file://0004-build-Add-option-to-select-libc-implementation.pa= tch > \ > file://0005-kernel-controllers-Link-with-libfts-explicitly-on= -mu.patch > \ > - file://0006-fix-PATH_MAX-undeclared-when-building-with-musl.p= atch > \ > file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl= .patch > \ > file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-i= t.patch > \ > file://0009-fix-redefinition-of-struct-msgbuf-error-building-= wit.patch > \ > @@ -49,9 +48,6 @@ SRC_URI =3D "git://github.com/linux-test-project/ltp.gi= t \ > file://0034-periodic_output.patch \ > file://0035-fix-test_proc_kill-hang.patch \ > file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-o= n-s.patch > \ > - file://0001-dirtyc0w-Include-stdint.h.patch \ > - file://0037-faccessat-and-fchmodat-Fix-build-warnings.patch \ > - file://0038-syscalls-add_key02-update-to-test-fix-for-nonempt= y-N.patch > \ > " > > S =3D "${WORKDIR}/git" > @@ -69,14 +65,6 @@ EXTRA_OECONF =3D " --with-power-management-testsuite > --with-realtime-testsuite " > # ltp network/rpc test cases ftbfs when libtirpc is found > EXTRA_OECONF +=3D " --without-tirpc " > > -# The makefiles make excessive use of make -C and several include > testcases.mk > -# which triggers a build of the syscall header. To reproduce, build ltp, > -# then delete the header, then "make -j XX" and watch regen.sh run > multiple > -# times. Its easier to generate this once here instead. > -do_compile_prepend () { > - ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) > -} > - > do_install(){ > install -d ${D}/opt/ltp/ > oe_runmake DESTDIR=3D${D} SKIP_IDCHECK=3D1 install > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > --94eb2c05b4bada875d0556583041 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On 4 August 2017 at= 11:00, Dengke Du <dengke.du@windriver.com> wrote:
=
drop 4 patches because the upstream already = contains them:

=C2=A0 =C2=A0 0001-dirtyc0w-Include-stdint.h.patch
=C2=A0 =C2=A0 0006-fix-PATH_MAX-undeclared-when-building-with-musl.pat= ch
=C2=A0 =C2=A0 0037-faccessat-and-fchmodat-Fix-build-warnings.patch
=C2=A0 =C2=A0 0038-syscalls-add_key02-update-to-test-fix-for-none= mpty-N.patch

drop the do_compile_prepend function, because the upstream already fix
the parallel make race, we can check it here:

=C2=A0 =C2=A0 https://github.com/linux-test-project/ltp/commit/3f385652efe81= 1fe7491474f8513baf44cf0a12d

Signed-off-by: Dengke Du <den= gke.du@windriver.com>
---
=C2=A0.../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch=C2=A0 =C2=A0|= =C2=A0 34 ------
=C2=A0...TH_MAX-undeclared-when-building-with-musl.patch |=C2=A0 31 --= ---
=C2=A0...faccessat-and-fchmodat-Fix-build-warnings.patch |=C2=A0 68 --= ---------
=C2=A0...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 -------= --------------
=C2=A0meta/recipes-extended/ltp/ltp_20170516.bb=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 14 +--
=C2=A05 files changed, 1 insertion(+), 282 deletions(-)
=C2=A0delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-I= nclude-stdint.h.patch
=C2=A0delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_M= AX-undeclared-when-building-with-musl.patch
=C2=A0delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-= and-fchmodat-Fix-build-warnings.patch
=C2=A0delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-a= dd_key02-update-to-test-fix-for-nonempty-N.patch

diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-= stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-<= wbr>stdint.h.patch
deleted file mode 100644
index 5c73be4..0000000
--- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.= h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 200= 1
-From: Khem Raj <raj.khem@gmail.co= m>
-Date: Fri, 9 Jun 2017 09:32:13 -0700
-Subject: [PATCH] dirtyc0w: Include stdint.h
-
-uintptr_t is defined in stdint.h
-
-Fixes
-| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use= in this function); did you mean 'intptr_t'?
-|=C2=A0 =C2=A0 lseek(mfd, (uintptr_t) map, SEEK_SET);
-|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^~~~~~~~~
-
-Signed-off-by: Khem Raj <raj.khem= @gmail.com>
----
-Upstream-Status: Submitted
-
- testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/te= stcases/kernel/security/dirtyc0w/dirtyc0w_child.c
-index 5328a9bc4..49abdd6ba 100644
---- a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c
-+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c
-@@ -23,6 +23,7 @@
- #include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <pwd.h>
-
- #include "tst_safe_pthread.h"
---
-2.13.1
-
diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-unde= clared-when-building-with-musl.patch b/meta/recipes-extended/ltp/= ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644
index 020ddfe..0000000
--- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-= when-building-with-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 200= 1
-From: Dengke Du <dengke.du@w= indriver.com>
-Date: Thu, 9 Feb 2017 16:41:12 +0800
-Subject: [PATCH] fix PATH_MAX undeclared when building with musl
-
-fix PATH_MAX undeclared when building with musl.
-
-Upstream-Status: Submitted [https://github.com/li= nux-test-project/ltp/pull/176]
-
-Signed-off-by: Dengke Du <de= ngke.du@windriver.com>
----
- include/tst_test.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/tst_test.h b/include/tst_test.h
-index 335c82684..4dfa1511b 100644
---- a/include/tst_test.h
-+++ b/include/tst_test.h
-@@ -23,6 +23,9 @@
- #endif /* __TEST_H__ */
-
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <limits.h>
-+#endif
-
- #include "tst_common.h"
- #include "tst_res_flags.h"
---
-2.11.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fch= modat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ltp/00= 37-faccessat-and-fchmodat-Fix-build-warnings.patch
deleted file mode 100644
index 99497d6..0000000
--- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-F= ix-build-warnings.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 200= 1
-From: Naresh Kamboju <nare= sh.kamboju@linaro.org>
-Date: Mon, 19 Jun 2017 19:01:21 +0530
-Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=3DUTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixing below build warnings.
-
-ltp-full-20170516/testcases/kernel/syscalls/faccessat$ make
-In file included from ../../../../include/old/test.h:51:0,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0from faccess= at01.c:44:
-faccessat01.c: In function =E2=80=98setup=E2=80=99:
-../../../../include/old/old_safe_file_ops.h:55:27:
-warning: format not a string literal and no format arguments [-Wformat-sec= urity]
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(path= ), (fmt), ## __VA_ARGS__)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0^
-faccessat01.c:132:2: note: in expansion of macro =E2=80=98SAFE_FILE_PRINTF= =E2=80=99
-=C2=A0 SAFE_FILE_PRINTF(cleanup, testfile, testfile);
-=C2=A0 ^
-../../../../include/old/old_safe_file_ops.h:55:27:
-warning: format not a string literal and no format arguments [-Wformat-sec= urity]
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(path= ), (fmt), ## __VA_ARGS__)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0^
-faccessat01.c:133:2: note: in expansion of macro =E2=80=98SAFE_FILE_PRINTF= =E2=80=99
-=C2=A0 SAFE_FILE_PRINTF(cleanup, testfile2, testfile2);
-
-Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
-Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647]
----
- testcases/kernel/syscalls/faccessat/faccessat01.c | 4 ++--
- testcases/kernel/syscalls/fchmodat/fchmodat01.c=C2=A0 =C2=A0| 4 ++--=
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/test= cases/kernel/syscalls/faccessat/faccessat01.c
-index 622dfd3b0..def7fa755 100644
---- a/testcases/kernel/syscalls/faccessat/faccessat01.c
-+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
-@@ -129,8 +129,8 @@ void setup(void)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[0] =3D SAFE_OPEN(cleanup, pathname, O_DIREC= TORY);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[1] =3D fds[4] =3D fds[0];
-
--=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile, testfile);
--=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile2, testfile2);
-+=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile, "%s", = testfile);
-+=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile2, "%s",= testfile2);
-
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[2] =3D SAFE_OPEN(cleanup, testfile3, O_CREA= T | O_RDWR, 0600);
-
-diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testca= ses/kernel/syscalls/fchmodat/fchmodat01.c
-index 6bf66d8b8..7856ed3fa 100644
---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-@@ -127,8 +127,8 @@ void setup(void)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[0] =3D SAFE_OPEN(cleanup, pathname, O_DIREC= TORY);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[1] =3D fds[4] =3D fds[0];
-
--=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile, testfile);
--=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile2, testfile2);
-+=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile, "%s", = testfile);
-+=C2=A0 =C2=A0 =C2=A0 SAFE_FILE_PRINTF(cleanup, testfile2, "%s",= testfile2);
-
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[2] =3D SAFE_OPEN(cleanup, testfile3, O_CREA= T | O_RDWR, 0600);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fds[3] =3D 100;
---
-2.13.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch b/meta/recipes-extended/ltp/= ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-= N.patch
deleted file mode 100644
index 3759e1f..0000000
--- a/meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-updat= e-to-test-fix-for-nonempty-N.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 25045624e941ee76a13febd36187e23c6c435507 Mon Sep 17 00:00:00 200= 1
-From: Eric Biggers <ebiggers@goo= gle.com>
-Date: Mon, 12 Jun 2017 11:55:21 -0700
-Subject: [PATCH 01/39] syscalls/add_key02: update to test fix for nonempty=
- NULL payload
-
-add_key02 was supposed to be a "Basic test for the add_key() syscall&= quot;,
-but it actually happened to test the obscure case of passing a NULL
-payload with nonzero length.=C2=A0 This case was mishandled by the kernel,=
-which either returned EINVAL or crashed with a NULL pointer dereference, -depending on the key type.=C2=A0 (The former applied to the test, as it us= ed
-the "user" key type.)=C2=A0 The expected behavior in this case i= s that the
-syscall fail with EFAULT.
-
-Update the test to expect the fixed behavior from v4.12-rc5, and make
-the test more thorough by testing additional key types, including ones
-that caused a NULL pointer dereference in unfixed kernels.
-
-Signed-off-by: Eric Biggers <ebi= ggers@google.com>
-Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/25045624e941ee76a13febd36187e23c6c435507]
----
- testcases/kernel/syscalls/add_key/add_key02.c | 69 +++++++++++++++++= +++-------
- 1 file changed, 51 insertions(+), 18 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/add_key/add_key02.c b/testcase= s/kernel/syscalls/add_key/add_key02.c
-index 866800d6f..2e3308dcd 100644
---- a/testcases/kernel/syscalls/add_key/add_key02.c
-+++ b/testcases/kernel/syscalls/add_key/add_key02.c
-@@ -1,5 +1,6 @@
- /**************************************************************= ****************
-=C2=A0 * Copyright (c) Crackerjack Project., 2007=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0*
-+ * Copyright (c) 2017 Google, Inc.=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *
-=C2=A0 *=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *
-=C2=A0 * This program is free software;=C2=A0 you can redistribute it and/= or modify=C2=A0 =C2=A0 =C2=A0 *
-=C2=A0 * it under the terms of the GNU General Public License as published= by=C2=A0 =C2=A0 =C2=A0 =C2=A0*
-@@ -18,10 +19,17 @@
-=C2=A0 ******************************************************************************/
-
- /*
-- * Basic test for the add_key() syscall.
-+ * Test that the add_key() syscall correctly handles a NULL payload with = nonzero
-+ * length.=C2=A0 Specifically, it should fail with EFAULT rather than oop= sing the
-+ * kernel with a NULL pointer dereference or failing with EINVAL, as it d= id
-+ * before (depending on the key type).=C2=A0 This is a regression test fo= r commit
-+ * 5649645d725c ("KEYS: fix dereferencing NULL payload with nonzero = length").
-=C2=A0 *
-- * History:=C2=A0 =C2=A0Porting from Crackerjack to LTP is done by
-- *=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Manas Kumar Nayak maknayak@in.ibm.com>
-+ * Note that none of the key types that exhibited the NULL pointer derefe= rence
-+ * are guaranteed to be built into the kernel, so we just test as many as= we
-+ * can, in the hope of catching one.=C2=A0 We also test with the "us= er" key type for
-+ * good measure, although it was one of the types that failed with EINVAL= rather
-+ * than dereferencing NULL.
-=C2=A0 */
-
- #include "config.h"
-@@ -33,36 +41,61 @@
-
- #ifdef HAVE_LINUX_KEYCTL_H
- struct tcase {
--=C2=A0 =C2=A0 =C2=A0 char *type;
--=C2=A0 =C2=A0 =C2=A0 char *desc;
--=C2=A0 =C2=A0 =C2=A0 void *payload;
--=C2=A0 =C2=A0 =C2=A0 int plen;
--=C2=A0 =C2=A0 =C2=A0 int exp_errno;
-+=C2=A0 =C2=A0 =C2=A0 const char *type;
-+=C2=A0 =C2=A0 =C2=A0 size_t plen;
- } tcases[] =3D {
--=C2=A0 =C2=A0 =C2=A0 {"user", "firstkey", NULL, 1, EI= NVAL}
-+=C2=A0 =C2=A0 =C2=A0 /*
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* The payload length we test for each key type= needs to pass initial
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* validation but is otherwise arbitrary.=C2=A0= Note: the "rxrpc_s" key type
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* requires a payload of exactly 8 bytes.
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0*/
-+=C2=A0 =C2=A0 =C2=A0 { "asymmetric",=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A064 },
-+=C2=A0 =C2=A0 =C2=A0 { "cifs.idmap",=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A064 },
-+=C2=A0 =C2=A0 =C2=A0 { "cifs.spnego",=C2=A0 =C2=A0 =C2=A0 =C2= =A0 64 },
-+=C2=A0 =C2=A0 =C2=A0 { "pkcs7_test",=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A064 },
-+=C2=A0 =C2=A0 =C2=A0 { "rxrpc",=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 64 },
-+=C2=A0 =C2=A0 =C2=A0 { "rxrpc_s",=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A08 },
-+=C2=A0 =C2=A0 =C2=A0 { "user",=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A064 },
- };
- #endif /* HAVE_LINUX_KEYCTL_H */
-
- static void verify_add_key(unsigned int i)
- {
- #ifdef HAVE_LINUX_KEYCTL_H
--=C2=A0 =C2=A0 =C2=A0 TEST(tst_syscall(__NR_add_key, tcases[i].type, tcase= s[i].desc,
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0tcases[i].payload, tcases[i].plen,
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0KEY_SPEC_USER_KEYRING));
-+=C2=A0 =C2=A0 =C2=A0 TEST(tst_syscall(__NR_add_key, tcases[i].type, "= ;abc:def",
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0NULL, tcases[i].plen, KEY_SPEC_PROCESS_KEYRING));
-
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (TEST_RETURN !=3D -1) {
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TFAIL, "add= _key() passed unexpectedly");
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TFAIL,
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "add_key() with key type '%s' unexpectedly succeeded"= ,
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 tcases[i].type);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
--=C2=A0 =C2=A0 =C2=A0 if (TEST_ERRNO =3D=3D tcases[i].exp_errno) {
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TPASS | TTERRNO,= "add_key() failed expectedly");
-+=C2=A0 =C2=A0 =C2=A0 if (TEST_ERRNO =3D=3D EFAULT) {
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TPASS, "rec= eived expected EFAULT with key type '%s'",
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 tcases[i].type);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
--=C2=A0 =C2=A0 =C2=A0 tst_res(TFAIL | TTERRNO,
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "add_key() failed u= nexpectedly, expected %s",
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_strerrno(tcases[i].e= xp_errno));
-+=C2=A0 =C2=A0 =C2=A0 if (TEST_ERRNO =3D=3D ENODEV) {
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TCONF, "ker= nel doesn't support key type '%s'",
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 tcases[i].type);
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
-+=C2=A0 =C2=A0 =C2=A0 }
-+
-+=C2=A0 =C2=A0 =C2=A0 /*
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* It's possible for the "asymmetric&q= uot; key type to be supported, but with
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* no asymmetric key parsers registered.=C2=A0 = In that case, attempting to
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0* add a key of type asymmetric will fail with = EBADMSG.
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0*/
-+=C2=A0 =C2=A0 =C2=A0 if (TEST_ERRNO =3D=3D EBADMSG && !strcmp(tca= ses[i].type, "asymmetric")) {
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tst_res(TCONF, "no = asymmetric key parsers are registered");
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
-+=C2=A0 =C2=A0 =C2=A0 }
-+
-+=C2=A0 =C2=A0 =C2=A0 tst_res(TFAIL | TTERRNO, "unexpected error with= key type '%s'",
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tcases[i].type);
- #else
-=C2=A0 =C2=A0 =C2=A0 =C2=A0tst_brk(TCONF, "linux/keyctl.h was missing= upon compilation.");
- #endif /* HAVE_LINUX_KEYCTL_H */
---
-2.13.0
-
diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes= -extended/ltp/ltp_20170516.bb
index 86b8012..46c9741 100644
--- a/meta/recipes-extended/ltp/ltp_20170516.bb
+++ b/meta/recipes-extended/ltp/ltp_20170516.bb
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl =3D " fts "
=C2=A0EXTRA_OEMAKE_append_libc-musl =3D " LIBC=3Dmusl "
=C2=A0CFLAGS_append_powerpc64 =3D " -D__SANE_USERSPACE_TYPES__" =C2=A0CFLAGS_append_mipsarchn64 =3D " -D__SANE_USERSPACE_TYPES__"=
-SRCREV =3D "6c6c6ca40afb3611e52486f670085762ff451e91"<= br> +SRCREV =3D "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"<= br>
=C2=A0SRC_URI =3D "git://github.com/linux-test-project/ltp.git \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-add-_GNU_SOURCE-= to-pec_listener.c.patch \
@@ -29,7 +29,6 @@ SRC_URI =3D "git://github.com/lin= ux-test-project/ltp.git \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0003-Add-knob-to-cont= rol-tirpc-support.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0004-build-Add-option-to-select-libc-implementation.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0005-kernel-controlle= rs-Link-with-libfts-explicitly-on-mu.patch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0006-fix-PATH_MAX-und= eclared-when-building-with-musl.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0007-fix-__WORDSIZE-u= ndeclared-when-building-with-musl.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \
@@ -49,9 +48,6 @@ SRC_URI =3D "git://github.com/lin= ux-test-project/ltp.git \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0034-periodic_output.= patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0035-fix-test_proc_ki= ll-hang.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-dirtyc0w-Include-stdint.h.patch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0037-faccessat-and-fc= hmodat-Fix-build-warnings.patch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0038-syscalls-add_key= 02-update-to-test-fix-for-nonempty-N.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0S =3D "${WORKDIR}/git"
@@ -69,14 +65,6 @@ EXTRA_OECONF =3D " --with-power-management-tes= tsuite --with-realtime-testsuite "
=C2=A0# ltp network/rpc test cases ftbfs when libtirpc is found
=C2=A0EXTRA_OECONF +=3D " --without-tirpc "

-# The makefiles make excessive use of make -C and several include testcases.mk<= /a>
-# which triggers a build of the syscall header. To reproduce, build ltp, -# then delete the header, then "make -j XX" and watch regen.sh r= un multiple
-# times. Its easier to generate this once here instead.
-do_compile_prepend () {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0( make -C ${B}/testcases/kernel include/linux_s= yscall_numbers.h )
-}
-
=C2=A0do_install(){
=C2=A0 =C2=A0 =C2=A0install -d ${D}/opt/ltp/
=C2=A0 =C2=A0 =C2=A0oe_runmake DESTDIR=3D${D} SKIP_IDCHECK=3D1 install
--
2.7.4

--
_______________________________________________
Openembedded-core mailing list
Openembedded-co= re@lists.openembedded.org
http://lists.openembedded.org/m= ailman/listinfo/openembedded-core

--94eb2c05b4bada875d0556583041--