Skip to contentSkip to conversation

insane.bbclass: Check for adjtime in check_32_bit_symbols

PATCH Superseded Ola x Nilsson 3 participants 5 messages Jan 12, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 insane.bbclass: Check for adjtime in check_32_bit_symbols

adjtime was overlooked in the original commit.

---
 meta/classes-global/insane.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes-global/insane.bbclass +1 -0
index 6f3cd3026d..69741a6a79 100644
@@ -534,6 +534,7 @@ def check_32bit_symbols(path, packagename, d, elf, messages):
         # /usr/include/signal.h
         "sigtimedwait",
         # /usr/include/sys/time.h
+        "adjtime",
         "futimes", "futimesat", "getitimer", "gettimeofday", "lutimes",
         "setitimer", "settimeofday", "utimes",
         # /usr/include/sys/timex.h
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/3 insane.bbclass: Make check_32bit_symbols check for file functions too

Since _TIME_BITS=64 forces the use of _FILE_OFFSET_BITS=64, also check for functions redirected only based on _FILE_OFFSET_BITS and __USE_FILE_OFFSET64.

---
 meta/classes-global/insane.bbclass | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
meta/classes-global/insane.bbclass +31 -0
index 69741a6a79..1ff6a319c4 100644
@@ -598,6 +598,37 @@ def check_32bit_symbols(path, packagename, d, elf, messages):
         "fts_set",
         # /usr/include/netdb.h
         "gai_suspend",
+
+        # Since _TIME_BITS=64 forces the use of _FILE_OFFSET_BITS=64,
+        # also check for functions redirected only based on _FILE_OFFSET_BITS
+        # and __USE_FILE_OFFSET64
+        # /usr/include/bits/fcntl-linux.h
+        "fallocate",
+        # /usr/include/bits/resource.h
+        "prlimit",
+        # /usr/include/sys/statfs.h
+        "statfs", "fstatfs", "statvfs", "fstatvfs",
+        # /usr/include/sys/sendfile.h
+        "sendfile",
+        # /usr/include/sys/resource.h
+        "getrlimit", "setrlimit",
+        # /usr/include/sys/uio.h
+        "preadv", "pwritev", "preadv2", "pwritev2",
+        # /usr/include/sys/mman.h
+        "mmap",
+        # /usr/include/stdlib.h
+        "mkstemp", "mkstemps", "mkostemp", "mkostemps",
+        # /usr/include/stdio.h
+        "fopen", "tmpfile", "freopen", "fseeko", "ftello", "fgetpos",
+        "fsetpos",
+        # /usr/include/dirent.h
+        "readdir",
+        "readdir_r", "scandir", "scandirat", "alphasort", "getdirentries",
+        "versionsort",
+        # /usr/include/unistd.h
+        "lseek", "pread", "pwrite", "truncate", "ftruncate", "lockf",
+        # /usr/include/fcntl.h
+        "open", "openat", "creat", "posix_fadvise", "posix_fallocate",
     }
 
     ptrn = re.compile(
Signature · 1 line
2.39.2
#2 lore raw

PATCH 3/3 insane.bbclass: Python code cleanup in check_32bit_symbols

In reply to Ola x Nilsson
---
 meta/classes-global/insane.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes-global/insane.bbclass +3 -3
index 1ff6a319c4..26457764ce 100644
@@ -514,9 +514,9 @@ def check_32bit_symbols(path, packagename, d, elf, messages):
     """
     Check that ELF files do not use any 32 bit time APIs from glibc.
     """
-    thirtytwo_bit_time_archs = set(('arm','armeb','mipsarcho32','powerpc','x86'))
+    thirtytwo_bit_time_archs = {'arm','armeb','mipsarcho32','powerpc','x86'}
     overrides = set(d.getVar('OVERRIDES').split(':'))
-    if not(thirtytwo_bit_time_archs & overrides):
+    if not (thirtytwo_bit_time_archs & overrides):
         return
 
     import re
@@ -1606,7 +1606,7 @@ do_unpack[postfuncs] += "do_qa_unpack"
 
 python () {
     import re
-    
+
     tests = d.getVar('ALL_QA').split()
     if "desktop" in tests:
         d.appendVar("PACKAGE_DEPENDS", " desktop-file-utils-native")
Signature · 1 line
2.39.2
#3 lore raw

Re: [OE-core] [PATCH 3/3] insane.bbclass: Python code cleanup in check_32bit_symbols

Forgot the signed-off footer, v2 sent

/Ola

Quoted 29 lines · Ola x Nilsson
---
 meta/classes-global/insane.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes-global/insane.bbclass +3 -3
index 1ff6a319c4..26457764ce 100644
@@ -514,9 +514,9 @@ def check_32bit_symbols(path, packagename, d, elf, messages):
     """
     Check that ELF files do not use any 32 bit time APIs from glibc.
     """
-    thirtytwo_bit_time_archs = set(('arm','armeb','mipsarcho32','powerpc','x86'))
+    thirtytwo_bit_time_archs = {'arm','armeb','mipsarcho32','powerpc','x86'}
     overrides = set(d.getVar('OVERRIDES').split(':'))
-    if not(thirtytwo_bit_time_archs & overrides):
+    if not (thirtytwo_bit_time_archs & overrides):
         return
 
     import re
@@ -1606,7 +1606,7 @@ do_unpack[postfuncs] += "do_qa_unpack"
 
 python () {
     import re
-    
+
     tests = d.getVar('ALL_QA').split()
     if "desktop" in tests:
         d.appendVar("PACKAGE_DEPENDS", " desktop-file-utils-native")
Signature · 1 line
Ola x Nilsson
#4 lore raw

Patchtest results for [PATCH 3/3] insane.bbclass: Python code cleanup in check_32bit_symbols

In reply to Ola x Nilsson

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/3-3-insane.bbclass-Python-code-cleanup-in-check_32bit_symbols.patch

FAIL: test Signed-off-by presence: Mbox is missing Signed-off-by. Add it manually or with "git commit --amend -s" (test_mbox.TestMbox.test_signed_off_by_presence)
FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!