[PATCH 1/3] site/ix86-common: Drop ac_cv_sizeof_ino_t as it can be incorrect with large file support

[PATCH 1/3] site/ix86-common: Drop ac_cv_sizeof_ino_t as it can be incorrect with large file support

[Richard Purdie]

Depending on whether large file support is enabled, the size of ino_t can
be 4 or 8 on 32 bit x86. Drop the value from the site cache and allow the
system to vary it depending on configuration. Very few other arches actually set
this so its likely obsolete and doesn't need to be hardcoded anymore.

Also drop the 64 bit and x32 variants since autodetection of this value appears
to work fine and this avoids any confusion or sizing errors depending on large
file support.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/site/ix86-common  | 1 -
 meta/site/x32-linux    | 1 -
 meta/site/x86_64-linux | 1 -
 3 files changed, 3 deletions(-)

diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index f4cf0b8..4fbf58c 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -19,7 +19,6 @@ ac_cv_sizeof_long_p=${ac_cv_sizeof_long_p=4}
 ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
 ac_cv_sizeof_uid_t=${ac_cv_sizeof_uid_t=4}
 ac_cv_sizeof_gid_t=${ac_cv_sizeof_gid_t=4}
-ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=4}
 ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
 ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
 ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
diff --git a/meta/site/x32-linux b/meta/site/x32-linux
index 308d6e2..4b70422 100644
--- a/meta/site/x32-linux
+++ b/meta/site/x32-linux
@@ -1,6 +1,5 @@
 # general
 ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
-ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
 ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
 ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
 ac_cv_alignof_double=8
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index ebdcf69..778e2c5 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -24,7 +24,6 @@ ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
 ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=8}
 ac_cv_sizeof_uid_t=${ac_cv_sizeof_uid_t=4}
 ac_cv_sizeof_gid_t=${ac_cv_sizeof_gid_t=4}
-ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
 ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
 ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8}
 ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
-- 
2.7.4

[PATCH 2/3] expat: Don't use getrandom() in the -native case

[Richard Purdie]

getrandom() is only available in glibc 2.25+ and uninative may relocate
binaries onto systems that don't have this function. For now, force
the code to the older codepath until we can come up with a better solution
for this kind of issue.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/expat/expat.inc                |  3 +++
 meta/recipes-core/expat/expat/no_getrandom.patch | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 meta/recipes-core/expat/expat/no_getrandom.patch

diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 067687e..0ee6c27 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -8,6 +8,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
            file://autotools.patch \
            file://libtool-tag.patch \
 	  "
+
+SRC_URI_append_class-native = " file://no_getrandom.patch"
+
 inherit autotools lib_package
 
 # This package uses an archive format known to have issue with some
diff --git a/meta/recipes-core/expat/expat/no_getrandom.patch b/meta/recipes-core/expat/expat/no_getrandom.patch
new file mode 100644
index 0000000..d64f1bf
--- /dev/null
+++ b/meta/recipes-core/expat/expat/no_getrandom.patch
@@ -0,0 +1,23 @@
+The native version of expat may be used on older systems which dont have glibc 2.25
+and hence don't have getrandom() thanks to uninative. Disable the libc call and
+use the syscall instead to avoid a compatibility issue until we have 2.25 everywhere
+we support with uninative.
+
+RP
+2017/8/14
+
+Upstream-Status: Inappropriate
+
+Index: expat-2.2.3/configure.ac
+===================================================================
+--- expat-2.2.3.orig/configure.ac
++++ expat-2.2.3/configure.ac
+@@ -151,7 +151,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
+   #include <stdlib.h>  /* for NULL */
+   #include <sys/random.h>
+   int main() {
+-    return getrandom(NULL, 0U, 0U);
++    return getrandomBREAKME(NULL, 0U, 0U);
+   }
+ ])], [
+     AC_DEFINE([HAVE_GETRANDOM], [1],
-- 
2.7.4

[PATCH 3/3] selftest/tinfoil: Filter LogRecords in test_event_wait

[Richard Purdie]

As the code stands today, an event mask does not mask LogRecord events
since the log levels are controlled separately. We therefore need to
accept (and ignore) LogRecord events in this test to avoid errors.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oeqa/selftest/cases/tinfoil.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py
index aa1af7e..471517f 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -1,6 +1,7 @@
 import os
 import re
 import time
+import logging
 import bb.tinfoil
 
 from oeqa.selftest.case import OESelftestTestCase
@@ -127,6 +128,8 @@ class TinfoilTests(OESelftestTestCase):
                         self.assertEqual(pattern, event._pattern)
                         self.assertIn('qemuarm.conf', event._matches)
                         eventreceived = True
+                    elif isinstance(event, logging.LogRecord):
+                        continue
                     else:
                         self.fail('Unexpected event: %s' % event)
 
-- 
2.7.4

✗ patchtest: failure for "site/ix86-common: Drop ac_cv_s..." and 2 more

[Patchwork]

== Series Details ==

Series: "site/ix86-common: Drop ac_cv_s..." and 2 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/8212/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 5a25ed1071)

* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta/recipes-core/expat/expat/no_getrandom.patch)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 1/3] site/ix86-common: Drop ac_cv_sizeof_ino_t as it can be incorrect with large file support

[Khem Raj]

On Mon, Aug 14, 2017 at 3:27 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Depending on whether large file support is enabled, the size of ino_t can
> be 4 or 8 on 32 bit x86. Drop the value from the site cache and allow the
> system to vary it depending on configuration. Very few other arches actually set
> this so its likely obsolete and doesn't need to be hardcoded anymore.
>
> Also drop the 64 bit and x32 variants since autodetection of this value appears
> to work fine and this avoids any confusion or sizing errors depending on large
> file support.
>

IIRC apr was one package where it poked for determining this value and
used runtime test which obviously will be wrong during cross compilation.

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/site/ix86-common  | 1 -
>  meta/site/x32-linux    | 1 -
>  meta/site/x86_64-linux | 1 -
>  3 files changed, 3 deletions(-)
>
> diff --git a/meta/site/ix86-common b/meta/site/ix86-common
> index f4cf0b8..4fbf58c 100644
> --- a/meta/site/ix86-common
> +++ b/meta/site/ix86-common
> @@ -19,7 +19,6 @@ ac_cv_sizeof_long_p=${ac_cv_sizeof_long_p=4}
>  ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
>  ac_cv_sizeof_uid_t=${ac_cv_sizeof_uid_t=4}
>  ac_cv_sizeof_gid_t=${ac_cv_sizeof_gid_t=4}
> -ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=4}
>  ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
>  ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
>  ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
> diff --git a/meta/site/x32-linux b/meta/site/x32-linux
> index 308d6e2..4b70422 100644
> --- a/meta/site/x32-linux
> +++ b/meta/site/x32-linux
> @@ -1,6 +1,5 @@
>  # general
>  ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
> -ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
>  ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
>  ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
>  ac_cv_alignof_double=8
> diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
> index ebdcf69..778e2c5 100644
> --- a/meta/site/x86_64-linux
> +++ b/meta/site/x86_64-linux
> @@ -24,7 +24,6 @@ ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
>  ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=8}
>  ac_cv_sizeof_uid_t=${ac_cv_sizeof_uid_t=4}
>  ac_cv_sizeof_gid_t=${ac_cv_sizeof_gid_t=4}
> -ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
>  ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
>  ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8}
>  ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core