<div dir="ltr">Can someone please send an update to remove those patches, as this ltp upgrade has already merged to master.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 30 January 2018 at 03:26, Yi Zhao <span dir="ltr"><<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
在 2018年01月29日 22:19, Anders Roxell 写道:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Removed 3 patches that have been upstreamed:<br>
- 0030-lib-Use-PTHREAD_MUTEX_REC<wbr>URSIVE-in-place-of-PTHREAD_.<wbr>patch<br>
- 0037-ltp-fix-format-security-e<wbr>rror.patch<br>
- 0038-generate-reproducible-gzi<wbr>p.patch<br>
</blockquote>
<br></span>
I'm also working on this these days.<br>
<br>
The following patches can also be removed since the issues have been fixed upstream:<br>
0001-add-_GNU_SOURCE-to-pec_li<wbr>stener.c.patch<br>
0011-Rename-sigset-variable-to<wbr>-sigset1.patch<br>
0025-mc_gethost-include-sys-ty<wbr>pes.h.patch<br>
0027-sysconf01-Use-_SC_2_C_VER<wbr>SION-conditionally.patch<br>
0033-shmat1-Cover-GNU-specific<wbr>-code-under-__USE_GNU.patch<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Reworked path 0002-Add-knob-to-control-wheth<wbr>er-numa-support-should-be-c.<wbr>patch.<br>
</blockquote>
<br>
I tested this patch but seems like it doesn't work.<br>
Although --with-numa is passed to configure via PACKAGECONFIG="numa", it doesn't check numa headers and library, and doesn't link numa library when building.<span class="HOEnZb"><font color="#888888"><br>
<br>
<br>
//Yi</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Anders Roxell <<a href="mailto:anders.roxell@linaro.org" target="_blank">anders.roxell@linaro.org</a>><br>
---<br>
...-control-whether-numa-suppo<wbr>rt-should-be-c.patch | 39 +++++++++++-----------<br>
...READ_MUTEX_RECURSIVE-in-pla<wbr>ce-of-PTHREAD_.patch | 35 -------------------<br>
.../ltp/0037-ltp-fix-format-se<wbr>curity-error.patch | 36 --------------------<br>
.../ltp/ltp/0038-generate-repr<wbr>oducible-gzip.patch | 20 -----------<br>
.../ltp/{<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp_20170929.bb</a> => <a href="http://ltp_20180118.bb" rel="noreferrer" target="_blank">ltp_20180118.bb</a>} | 5 +--<br>
5 files changed, 21 insertions(+), 114 deletions(-)<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0030-lib-Use-PTHREAD_MUTEX_REC<wbr>URSIVE-in-place-of-PTHREAD_.<wbr>patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0037-ltp-fix-format-security-e<wbr>rror.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0038-generate-reproducible-gzi<wbr>p.patch<br>
rename meta/recipes-extended/ltp/{<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp<wbr>_20170929.bb</a> => <a href="http://ltp_20180118.bb" rel="noreferrer" target="_blank">ltp_20180118.bb</a>} (95%)<br>
<br>
diff --git a/meta/recipes-extended/ltp/lt<wbr>p/0002-Add-knob-to-control-whe<wbr>ther-numa-support-should-be-c.<wbr>patch b/meta/recipes-extended/ltp/lt<wbr>p/0002-Add-knob-to-control-whe<wbr>ther-numa-support-should-be-c.<wbr>patch<br>
index 9865020..31460b9 100644<br>
--- a/meta/recipes-extended/ltp/lt<wbr>p/0002-Add-knob-to-control-whe<wbr>ther-numa-support-should-be-c.<wbr>patch<br>
+++ b/meta/recipes-extended/ltp/lt<wbr>p/0002-Add-knob-to-control-whe<wbr>ther-numa-support-should-be-c.<wbr>patch<br>
@@ -9,34 +9,35 @@ during build depending upong numa being staged or not<br>
Signed-off-by: Roy.Li <<a href="mailto:rongqing.li@windriver.com" target="_blank">rongqing.li@windriver.com</a>><br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
+Signed-off-by: Anders Roxell <<a href="mailto:anders.roxell@linaro.org" target="_blank">anders.roxell@linaro.org</a>><br>
Upstream-Status: Pending<br>
---<br>
m4/ltp-numa.m4 | 10 +++++++++-<br>
1 file changed, 9 insertions(+), 1 deletion(-)<br>
diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4<br>
-index 60ae07b..ed7078d 100644<br>
+index fc3383e..44cb559 100644<br>
--- a/m4/ltp-numa.m4<br>
+++ b/m4/ltp-numa.m4<br>
-@@ -24,7 +24,13 @@ dnl ----------------------------<br>
+@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA<br>
+ dnl ----------------------------<br>
dnl<br>
- AC_DEFUN([LTP_CHECK_SYSCALL_NU<wbr>MA],<br>
- [dnl<br>
--AC_CHECK_HEADERS([linux/memp<wbr>olicy.h numa.h numaif.h],[<br>
-+AC_MSG_CHECKING([for numa])<br>
-+AC_ARG_WITH(<br>
-+ [numa],<br>
-+ AC_HELP_STRING([--without-numa<wbr>],<br>
-+ [without numa support]),<br>
-+ [],<br>
-+ [AC_CHECK_HEADERS([linux/mempo<wbr>licy.h numa.h numaif.h],[<br>
- LTP_SYSCALL_NUMA_HEADERS=yes<br>
- AC_CHECK_LIB(numa,numa_alloc_<wbr>onnode,[have_numa_alloc_onnode<wbr>="yes"])<br>
- if test "x$have_numa_alloc_onnode" = "xyes"; then<br>
-@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then<br>
- AC_DEFINE(HAVE_MPOL_<wbr>CONSTANTS,1,[define to 1 if you have all constants required to use mbind tests])<br>
- fi<br>
- )])<br>
+ AC_DEFUN([LTP_CHECK_SYSCALL_NU<wbr>MA], [<br>
+- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])<br>
++ AC_MSG_CHECKING([for numa])<br>
++ AC_ARG_WITH(<br>
++ [numa],<br>
++ AC_HELP_STRING([--without-numa<wbr>],<br>
++ [without numa support]),<br>
++ [],<br>
++ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])<br>
+ AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no])<br>
+<br>
+ if test "x$have_numa_headers" != "xno"; then<br>
+@@ -42,3 +48,5 @@ exit(1);<br>
+ AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.])<br>
+ fi<br>
+ ])<br>
+AC_MSG_RESULT([$with_numa])<br>
+])<br>
--<br>
diff --git a/meta/recipes-extended/ltp/lt<wbr>p/0030-lib-Use-PTHREAD_MUTEX_<wbr>RECURSIVE-in-place-of-PTHREAD_<wbr>.patch b/meta/recipes-extended/ltp/lt<wbr>p/0030-lib-Use-PTHREAD_MUTEX_<wbr>RECURSIVE-in-place-of-PTHREAD_<wbr>.patch<br>
deleted file mode 100644<br>
index efa6d06..0000000<br>
--- a/meta/recipes-extended/ltp/lt<wbr>p/0030-lib-Use-PTHREAD_MUTEX_<wbr>RECURSIVE-in-place-of-PTHREAD_<wbr>.patch<br>
+++ /dev/null<br>
@@ -1,35 +0,0 @@<br>
-From 00ba7cdd0608b1507027428f9f87b1<wbr>cb9747372b Mon Sep 17 00:00:00 2001<br>
-From: Dengke Du <<a href="mailto:dengke.du@windriver.com" target="_blank">dengke.du@windriver.com</a>><br>
-Date: Thu, 9 Feb 2017 15:54:53 +0800<br>
-Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of<br>
- PTHREAD_RECURSIVE_MUTEX_INITIA<wbr>LIZER_NP for non-glibc<br>
-<br>
-e.g. musl does not implement the _NP mutex types<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com" target="_blank">dengke.du@windriver.com</a>><br>
-<br>
-Upstream-Status: Pending<br>
----<br>
- lib/tst_res.c | 4 ++++<br>
- 1 file changed, 4 insertions(+)<br>
-<br>
-diff --git a/lib/tst_res.c b/lib/tst_res.c<br>
-index 61daaeb..435224f 100644<br>
---- a/lib/tst_res.c<br>
-+++ b/lib/tst_res.c<br>
-@@ -79,7 +79,11 @@ int TEST_ERRNO;<br>
- assert(strlen(buf) > 0); \<br>
- } while (0)<br>
-<br>
-+#ifdef __GLIBC__<br>
- static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIA<wbr>LIZER_NP;<br>
-+#else<br>
-+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };<br>
-+#endif<br>
-<br>
- static void check_env(void);<br>
- static void tst_condense(int tnum, int ttype, const char *tmesg);<br>
---<br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-extended/ltp/lt<wbr>p/0037-ltp-fix-format-security<wbr>-error.patch b/meta/recipes-extended/ltp/lt<wbr>p/0037-ltp-fix-format-security<wbr>-error.patch<br>
deleted file mode 100644<br>
index 44d6990..0000000<br>
--- a/meta/recipes-extended/ltp/lt<wbr>p/0037-ltp-fix-format-security<wbr>-error.patch<br>
+++ /dev/null<br>
@@ -1,36 +0,0 @@<br>
-From 8eb3e111ae1b89e5afb249cf984d65<wbr>7f94da2385 Mon Sep 17 00:00:00 2001<br>
-From: Dengke Du <<a href="mailto:dengke.du@windriver.com" target="_blank">dengke.du@windriver.com</a>><br>
-Date: Tue, 17 Oct 2017 05:42:47 -0400<br>
-Subject: [PATCH] ltp: fix format security error<br>
-<br>
-When enable option: -Werror=format-security, the error like:<br>
-<br>
- | fcntl36.c: In function 'test_fn':<br>
- | fcntl36.c:303:2: error: format not a string literal and no format arguments [-Werror=format-security]<br>
- | tst_res(TINFO, msg);<br>
- | ^~~~~~~<br>
- | cc1: some warnings being treated as errors<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com" target="_blank">dengke.du@windriver.com</a>><br>
----<br>
- testcases/kernel/syscalls/fcnt<wbr>l/fcntl36.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/fc<wbr>ntl/fcntl36.c b/testcases/kernel/syscalls/fc<wbr>ntl/fcntl36.c<br>
-index 6f2eb6b..3246d13 100644<br>
---- a/testcases/kernel/syscalls/fc<wbr>ntl/fcntl36.c<br>
-+++ b/testcases/kernel/syscalls/fc<wbr>ntl/fcntl36.c<br>
-@@ -300,7 +300,7 @@ static void test_fn(void *f0(void *), void *f1(void *),<br>
- struct param p2[thread_cnt];<br>
- unsigned char buf[write_size];<br>
-<br>
-- tst_res(TINFO, msg);<br>
-+ tst_res(TINFO, "%s", msg);<br>
-<br>
- if (tst_fill_file(fname, 1, write_size, thread_cnt + 1))<br>
- tst_brk(TBROK, "Failed to create tst file");<br>
---<br>
-2.8.1<br>
-<br>
diff --git a/meta/recipes-extended/ltp/lt<wbr>p/0038-generate-reproducible-<wbr>gzip.patch b/meta/recipes-extended/ltp/lt<wbr>p/0038-generate-reproducible-<wbr>gzip.patch<br>
deleted file mode 100644<br>
index 0153ace..0000000<br>
--- a/meta/recipes-extended/ltp/lt<wbr>p/0038-generate-reproducible-<wbr>gzip.patch<br>
+++ /dev/null<br>
@@ -1,20 +0,0 @@<br>
-Do not generate timestamps in gzipped file headers.<br>
-The timestamps prevent reproducible build.<br>
-<br>
-Upstream-Status: Submitted [<a href="https://github.com/linux-test-project/ltp/pull/233" rel="noreferrer" target="_blank">https://github.com/linux-test<wbr>-project/ltp/pull/233</a>]<br>
-<br>
-Signed-off-by: Juro Bystricky <<a href="mailto:juro.bystricky@intel.com" target="_blank">juro.bystricky@intel.com</a>><br>
-<br>
-diff --git a/testcases/network/generate.s<wbr>h b/testcases/network/generate.s<wbr>h<br>
-index 00216a6..939f792 100755<br>
---- a/testcases/network/generate.s<wbr>h<br>
-+++ b/testcases/network/generate.s<wbr>h<br>
-@@ -55,7 +55,7 @@ fi<br>
- if [ ! -e "<a href="http://bin.sm" rel="noreferrer" target="_blank">bin.sm</a>" ] ; then<br>
- cnt=0<br>
- while [ $cnt -lt 5 ] ; do<br>
-- gzip -1 -c <a href="http://ascii.sm" rel="noreferrer" target="_blank">ascii.sm</a> >> "<a href="http://bin.sm" rel="noreferrer" target="_blank">bin.sm</a>"<br>
-+ gzip -1 -c -n <a href="http://ascii.sm" rel="noreferrer" target="_blank">ascii.sm</a> >> "<a href="http://bin.sm" rel="noreferrer" target="_blank">bin.sm</a>"<br>
- cnt=$(($cnt + 1))<br>
- done<br>
- fi<br>
diff --git a/meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170929.bb</a> b/meta/recipes-extended/ltp/<a href="http://ltp_20180118.bb" rel="noreferrer" target="_blank">lt<wbr>p_20180118.bb</a><br>
similarity index 95%<br>
rename from meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp_<wbr>20170929.bb</a><br>
rename to meta/recipes-extended/ltp/<a href="http://ltp_20180118.bb" rel="noreferrer" target="_blank">ltp_<wbr>20180118.bb</a><br>
index bc0ecdf..a4a2724 100644<br>
--- a/meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170929.bb</a><br>
+++ b/meta/recipes-extended/ltp/<a href="http://ltp_20180118.bb" rel="noreferrer" target="_blank">lt<wbr>p_20180118.bb</a><br>
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = " fts "<br>
EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "<br>
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"<br>
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"<br>
-SRCREV = "bac930f71b1e6786ebb8a89446350<wbr>3d07681ef6a"<br>
+SRCREV = "731cd34e682d297b207668be8b1d1<wbr>5320a9ac1b1"<br>
SRC_URI = "git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-p<wbr>roject/ltp.git</a> \<br>
file://0001-add-_GNU_SOURCE-t<wbr>o-pec_listener.c.patch \<br>
@@ -43,13 +43,10 @@ SRC_URI = "git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-p<wbr>roject/ltp.git</a> \<br>
file://0026-crash01-Define-_G<wbr>NU_SOURCE.patch \<br>
file://0027-sysconf01-Use-_<wbr>SC_2_C_VERSION-conditionally.p<wbr>atch \<br>
file://0028-rt_sigaction.h-Us<wbr>e-sighandler_t-instead-of-__si<wbr>ghand.patch \<br>
- file://0030-lib-Use-PTHREAD_M<wbr>UTEX_RECURSIVE-in-place-of-PTH<wbr>READ_.patch \<br>
file://0033-shmat1-Cover-GNU-<wbr>specific-code-under-__USE_GNU.<wbr>patch \<br>
file://0034-periodic_output.p<wbr>atch \<br>
file://0035-fix-test_proc_kil<wbr>l-hang.patch \<br>
file://0036-testcases-<wbr>network-nfsv4-acl-acl1.c-<wbr>Security-fix-on-s.patch \<br>
- file://0037-ltp-fix-format-se<wbr>curity-error.patch \<br>
- file://0038-generate-reproduc<wbr>ible-gzip.patch \<br>
file://0039-commands-ar01-<wbr>Fix-for-test-in-deterministic-<wbr>mode.patch \<br>
"<br>
<br>
</blockquote>
<br>
-- <br></div></div><div class="HOEnZb"><div class="h5">
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</div></div></blockquote></div><br></div>