From patchwork Tue May 5 17:05:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Kent X-Patchwork-Id: 87543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D13FF8855 for ; Tue, 5 May 2026 17:05:44 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1331.1778000738084308156 for ; Tue, 05 May 2026 10:05:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=WAt3vhYH; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: sam.john.kent@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-43fe62837baso3040447f8f.3 for ; Tue, 05 May 2026 10:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778000736; x=1778605536; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MFBH8TQ1xic6vvxyl4wFJCNvvfa/4Q4+8Tf2aXsivUI=; b=WAt3vhYHFKNhg7NMQL+nFbcTjsL3uyEh1VG61BWJBQ8dcepZ7eIy9QOpH9SBrRc4fF +E6cAhOg2N903ECDfTWDNH+JdM0GkzDMWhvdPKO+kSkzfFbh/iXYJNH1tyBmOMwVjRQt tS1ybErR2R8vx1KEx62uGP8jewZ4oRDIseqBIoOtdHxcV2ouo0/JtUCV4E73sn9Ans81 ZKBgAGx2Ej+OgIMFSaf78m047QuWpPT5c9ZKfv+nUoLWWq0zM84BemhCsDBp1/130edm QwxOO65FcYf45ADwn1ZYkvpNY6dS1qH67vi540+tLc6LWk0Qc6WJ8J85UQ8QokQpLQXW H2HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778000736; x=1778605536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MFBH8TQ1xic6vvxyl4wFJCNvvfa/4Q4+8Tf2aXsivUI=; b=tNp8pF9UxR0FHoA0iBtEuLmcDivi+k4ICDGGXu2hxBvMF8akmOKKqJ8leWwpW/j7ao HvEF1GTQLZ1M0Mm8xASN7OpoXkqcj/NlLCiyGRF7awawZS5IsE152RPHrL1XSZoexNQj Ah9KReiotuPwaRJvRUDd1YeM+z0a9e+iJtrx+au1uSYb1SBfi9cqTvs1dY1rjj4cWwM4 X/to3SeKpCmp4MqCeHK5Vx8PWdFTFM+OPp/4kIoSfnDxORgnC4io9oBZmU9CNs9D5UK5 C/8zbISkeXFoLv/6FP0v4p3+LMT6ocIPsh2Au+Z6TDFXY/bOhkEc5LsOcdME8Yune26+ dbVw== X-Gm-Message-State: AOJu0YwNuCl/T7B1MVAGjbx/DO07l3JcHSsaA4GATGppUgtnXHrfMnHK 2RCLSaUV/DG/pD44j+zH/q0Wl7aIDr9MZ+Zh1PBGHKAH6OZbQVsTHwFj7vcxtcTfm68rgA== X-Gm-Gg: AeBDies8GZKGxheodpgeruq1gY4OWdr5OAaY+VrE+As1Kgk8e1x3B8NfcYJSWa/QaSF m4tByHjPdz+gMYvfyWd8KOyrb/HMPpwTsG8HMpnSb5AeikJ6eHufEEok/KvqKDiiC7v1bHk4pBT N0/uda1hw+eR6zbxbdGflfj7AdtSuTk4zBWaL+Fw0EwKIZ82LEvQ9wQLPXxC1NHoogRmYPtUoA2 1Yk72hnoAiTkxuwBZXFdJpKK5DqYqncY0haSl/8A3xPDw5j156xXdiA7h7cedm/iUKxbuLZVHSG 0BeFHx324MtrQUpdsRGiBOQirW6M1zAbQ56MQxHDp5mQy3a7QingKCGkOpcQjXyL69PyKNPy2y0 AQVuSBxCb8TktJh37MSREVEbWdObUmGxvUsAAuuopYzxqVu/ToCRn5qYZHz8ez18bvKnurPwJfU fvbYBfKpfRncWAvC63ZzNo9xRkR1ulMlOXfke2pUMbofRfyj8SZcQHv5qATIx6+g3L/igQe7kjQ wGAfr8= X-Received: by 2002:a05:6000:228a:b0:43d:67f4:91aa with SMTP id ffacd0b85a97d-4500670ae2dmr6711123f8f.40.1778000735770; Tue, 05 May 2026 10:05:35 -0700 (PDT) Received: from sam-ThinkPad-X1-Carbon-Gen-11.netbird.cloud ([45.12.242.119]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960902sm6521172f8f.28.2026.05.05.10.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 10:05:34 -0700 (PDT) From: Sam Kent To: openembedded-core@lists.openembedded.org Cc: mathieu.dubois-briand@bootlin.com, richard.purdie@linuxfoundation.org, Sam Kent Subject: [PATCH v4 1/3] oe-pkgdata-util: fix empty runtime-rprovides directory handling Date: Tue, 5 May 2026 18:05:19 +0100 Message-Id: <20260505170521.1129945-1-sam.john.kent@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260429124524.2890648-1-sam.john.kent@gmail.com> References: <20260429124524.2890648-1-sam.john.kent@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 May 2026 17:05:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236515 An empty runtime-provides directory caused lookup-recipe, package-info and list-pkg-files to skip the runtime-reverse fallback. Use os.listdir() to ensure the folder is not empty and use os.path.isdir( to ensure it is not a file. --- scripts/oe-pkgdata-util | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index bbfc6a2..904008b 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -289,8 +289,9 @@ def lookup_recipe(args): for pkg in pkgs: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) @@ -355,8 +356,9 @@ def package_info(args): for pkg in packages: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) @@ -507,8 +509,9 @@ def list_pkg_files(args): else: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) From patchwork Tue May 5 17:05:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Kent X-Patchwork-Id: 87541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A43DACD3439 for ; Tue, 5 May 2026 17:05:44 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1317.1778000738909911154 for ; Tue, 05 May 2026 10:05:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=P81foX9X; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: sam.john.kent@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-43d73352cf2so5026678f8f.1 for ; Tue, 05 May 2026 10:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778000737; x=1778605537; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QWyhzVHkxYx4vi7DJmjCoDTQIufTHceXy+tKkIjZxeg=; b=P81foX9XOrVWsaqAhlj0nHIDCGm0Nr41R2og4LjxkBqCywmpC8XYnx/1inWQZV4aY0 aFg68JRvQLWgZ4j2ymKBo+MT0psstDk2h4rtNbHgTDZMY906srZKPCrHUW2KpqqTajms kWTvcG5GfjfkPba4R1bxQdOsEwPKdOZMkeq7ATma55sRxaDW0p51BXMCi9MGCmspqONh 5xcXNvqFLKVw+xUp447J1tiEGGVjFBgvahvBej1vH/iDdgfuUPbknqadOpcMNzKeDcU1 ERVJHTbcKnU7q0HNAF8z4BPkOnJubYNEMJm5Ha0WWGh8r3QXQbzQSCiXKoGUbQdj8t/f 5RDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778000737; x=1778605537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QWyhzVHkxYx4vi7DJmjCoDTQIufTHceXy+tKkIjZxeg=; b=jzl3euHTtmuU+wozhLaM++EcjmwDdLR8Ox/tzXnct+V8r8wz11AZzIXwvNe2s98xJp OYWDd0/a8+pVsLrXrHP0WpRY03I+mVb1fWDfJhgajxnCdPBLdOFGEfHgTQzodhnPFPei VhqUTzykuIG8iilOlxcV4wl7be4hacjJG6hp5HoIMeeIR+nd3BENCMJrYQNrSjYY3O27 l1IUDomY0o6a5nePI9ST7qvQoH4vz5+lBUifp/wMdDJ4YYy0VP2JWDIJAkT7H0Ek9Cqp lXoa7SheNV1WsVJ4AQBlq855xCOx6YTs/FZ43++Wa39AG36Og86KJbUMmlQu4OJAKd9W PMCw== X-Gm-Message-State: AOJu0YxA00YH+WnX6KonrztCPhZ+r10OVifOJQnc3Bt8RCU17A2pSfRK KwuetT8B53ae2xqJdU5OqQf68twPl5g0Sjf3v9+hc7dOmwNR5xk8w4aB95HOFcn0VZ+25g== X-Gm-Gg: AeBDieuVe2NMRpsxV92p41e7pBXXah6QhYq9xepjrgtcgh5F2/H05OfqSmedW5UePkZ KziWjVi/7KtbOr8KtHxlAqtTA+jNs291AUYuwX1HxdgK67FCt8DeScKiO+7CKvKe6vuD5gitxXc zZmAZq+oQpFN/sYqd4qXps0Zzu/WX/KhZoVm/XrTOcabLXk9u0FtKt/siOg4F33FLiiK0ul1jAe S6H09DZeQLimOqZ7SnEVMa3a9PG2jgjIjuwCyfHHpCYe9Hz7aRfYLcJSHzUaOkwMONkaSksdRUF QGhiD73xFYol9wGof7Bb2E+0EbfWjwkBOa+Wtsvn2KenwpbswZD+uuUvQXsC3Ht5SLZrd2//Fg8 tIo63RedrEAg7hZh8SPKuscb69f11pEW8j7Oc7h9TWFgH2vOtuaeGD7I2k4JOTQetlGpZ3xAnLh sfP/C9Gjizf2uRJMB+MfSgzOGbrNxvokb8BKx2EV/+3/ZPEZFhEo30URcE7f9s4PGbBjCOqnl1N vrMtgs= X-Received: by 2002:a05:6000:40dd:b0:43b:5b25:67f8 with SMTP id ffacd0b85a97d-44bb5f26525mr25899159f8f.20.1778000736636; Tue, 05 May 2026 10:05:36 -0700 (PDT) Received: from sam-ThinkPad-X1-Carbon-Gen-11.netbird.cloud ([45.12.242.119]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960902sm6521172f8f.28.2026.05.05.10.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 10:05:36 -0700 (PDT) From: Sam Kent To: openembedded-core@lists.openembedded.org Cc: mathieu.dubois-briand@bootlin.com, richard.purdie@linuxfoundation.org, Sam Kent Subject: [PATCH v4 2/3] oelib: add unit tests for kernel module detection helpers Date: Tue, 5 May 2026 18:05:20 +0100 Message-Id: <20260505170521.1129945-2-sam.john.kent@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260505170521.1129945-1-sam.john.kent@gmail.com> References: <20260429124524.2890648-1-sam.john.kent@gmail.com> <20260505170521.1129945-1-sam.john.kent@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 May 2026 17:05:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236516 Add tests for the filename pre-filter logic, is_kernel_module(), and is_kernel_module_signed() to meta/lib/oeqa/selftest/cases/oelib/ Signed-off-by: Sam Kent --- meta/lib/oeqa/selftest/cases/oelib/package.py | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/oelib/package.py diff --git a/meta/lib/oeqa/selftest/cases/oelib/package.py b/meta/lib/oeqa/selftest/cases/oelib/package.py new file mode 100644 index 0000000..5751057 --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/oelib/package.py @@ -0,0 +1,108 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +import mmap +import os +import tempfile +from unittest.case import TestCase + + +class TestKernelModuleFilenameFilter(TestCase): + """ + The pre-filter in process_split_and_strip_files() selects candidates to + pass to is_elf(). It must use f.endswith(".ko"), not ".ko" in f, to avoid + false-positives on compressed modules (.ko.xz, .ko.gz). + """ + + ko_files = [ + "driver.ko", + "net/foo.ko", + ] + + not_ko_files = [ + "driver.ko.xz", + "driver.ko.gz", + "driver.ko2", + "myko.c", + "vmlinux", + ] + + def test_endswith_matches_ko(self): + for f in self.ko_files: + with self.subTest(f=f): + self.assertTrue(f.endswith(".ko")) + + def test_endswith_rejects_non_ko(self): + for f in self.not_ko_files: + with self.subTest(f=f): + self.assertFalse(f.endswith(".ko")) + + def test_old_predicate_had_false_positives(self): + # The previous check (".ko" in f) matched compressed modules — this is + # the regression the fix addresses. + false_positives = [f for f in self.not_ko_files if ".ko" in f] + self.assertEqual(false_positives, ["driver.ko.xz", "driver.ko.gz", "driver.ko2"]) + + +class TestIsKernelModule(TestCase): + """ + is_kernel_module() detects kernel modules by searching for the + "vermagic=" string, which is always present in genuine .ko files. + """ + + def setUp(self): + from oe.package import is_kernel_module + self.is_kernel_module = is_kernel_module + self._tmpfile = None + + def tearDown(self): + if self._tmpfile and os.path.exists(self._tmpfile): + os.unlink(self._tmpfile) + + def _make_tmp(self, content): + f = tempfile.NamedTemporaryFile(delete=False, suffix=".ko") + f.write(content) + f.close() + return f.name + + def test_detects_vermagic(self): + self._tmpfile = self._make_tmp(b"\x7fELF\x00" * 10 + b"vermagic=5.15.0" + b"\x00" * 10) + self.assertTrue(self.is_kernel_module(self._tmpfile)) + + def test_rejects_plain_elf(self): + self._tmpfile = self._make_tmp(b"\x7fELF\x00" * 50) + self.assertFalse(self.is_kernel_module(self._tmpfile)) + + +class TestIsKernelModuleSigned(TestCase): + """ + is_kernel_module_signed() detects the "Module signature appended" tail + that the kernel's modsign infrastructure writes. + """ + + def setUp(self): + from oe.package import is_kernel_module_signed + self.is_kernel_module_signed = is_kernel_module_signed + self._tmpfile = None + + def tearDown(self): + if self._tmpfile and os.path.exists(self._tmpfile): + os.unlink(self._tmpfile) + + def _make_tmp(self, content): + f = tempfile.NamedTemporaryFile(delete=False, suffix=".ko") + f.write(content) + f.close() + return f.name + + def test_detects_signed(self): + tail = b"Module signature appended\n\x00\x00" + self._tmpfile = self._make_tmp(b"\x00" * 64 + tail) + self.assertTrue(self.is_kernel_module_signed(self._tmpfile)) + + def test_rejects_unsigned(self): + self._tmpfile = self._make_tmp(b"\x7fELF\x00" * 20) + self.assertFalse(self.is_kernel_module_signed(self._tmpfile)) From patchwork Tue May 5 17:05:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Kent X-Patchwork-Id: 87542 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94265CD343B for ; Tue, 5 May 2026 17:05:44 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1318.1778000739477177489 for ; Tue, 05 May 2026 10:05:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=ooqxU/0H; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: sam.john.kent@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-44509921fbcso2847272f8f.3 for ; Tue, 05 May 2026 10:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778000738; x=1778605538; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iSPpAGe0QhXEcve7pLZOgeAXtZhG4hz4K0PrXKXCCsU=; b=ooqxU/0HIhzVJxqAOjYrgqKDjcS/BwbGgIGW63LxF8DgsZA3wswDTVPPAqCkXQNsz/ CJOeCUUpQabrNheSGALx7bRhBo+8B6MmwnwHuUIzZt+g5eAECMY3OTKBC2T9LjN4vtFG 4TmHFw6oeqaeVbpyDq7P98WjV/NyHpB6i7ukokPLOUucSVvb5rN/ZecwIWThDcFtA2Or aYzFZQAfNBhxEp7sgByfrxk5+y7DrNlnLAsohCe6MOchW2Q+wS0Md0sLbYzFXeFiiOMQ Ra6sr7Vw7Kr4h5lWh5hR/RwJ8kPyWRubQZIr1yfz7de3FQF3k6Gv30XJHt5FWqcPuB0c 9MnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778000738; x=1778605538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iSPpAGe0QhXEcve7pLZOgeAXtZhG4hz4K0PrXKXCCsU=; b=YTP6NTCQviy1ZBJxSPqJHzDnwfDHTYsajPxRW9IZKPrqpWSoOfDGulk2kpCrQSlWBr IN8efAZtG0E0CTd/wMbUE9Fbhova0RpTThpFss3/QOcg1uMTcwlLZrdbTerv7YWJq9QX qvsYY4c0a9FaIuv+pZ4RPFAmnMS4BjwdII+jgXFeKeUn7DzW4aJVhWB3aEdjDJvth9lJ 5MndyyLaACgU5ANw5ACLzWpygB9djbeteYcWezceHYuTFxyFWPW+PkYRiLlL7AAbOzyD ge6BBXTjGLRdNHjre7J2zABXUTSc3Qgj8+aS7A/jr3xO+WhY8SN4XZEEZWZdOD5ph1Tp 72Vg== X-Gm-Message-State: AOJu0Yx0T6zTBH1KLOm84kck+BxzrvTXBzNHUhHAydEr1a7pPm60Cpej 7Yw5/RjnCkMwhfiQfGBVPn6bQJI8QqjzkQG5hiw//qJ8SvBnCrzjSQIy/kE+hXUT+hqk0w== X-Gm-Gg: AeBDievzmjr8NKA/obJ5KagHlzdG4vrpcYIoxhGrpxCHDtzhz+sZb78kfT9pwMVRomm KA+vwapY8PjFz4jdjbS4giaaZB1QTKjVzs5anqi6LbOv/dYiOBuAYUpHBtGnOl+3VZyLKlP1gG0 H1vgauBAZyw7K77jMfu+sHznJSzEriVeclvx6TPNgsP2koM1szT4VP8ReNoSWrPGqRJlQtU3LmX q5XQtMVe6DP4Oeg1lyoyQ5CWMKUC5M2Kr2xUUAyLVVZKyPlDagfmZ3DCl0c+Lk9/q8QnzUbBGzH Lcht2ZVCA+qbTVeWEF4s/deYT5+lgbHZs9Z5fMHimmBq8POZ1H7zjcagtuA0rQ5w9h+DnrJxB04 /F9tuN8ooNo17EBp65YMtnjRXPXafraOpKHMMI2Gl0uJfPTduM+h15vox0TpRJVZFzZpjWcfkx2 JYicSrwvyutMqi0/Zc3y0fifoYdu4oZMZmyedWzKUUzvEszMvVCsOJWw+7aDp5vgWK78r39kYH3 7kK5VXH/RP4RIGzQQ== X-Received: by 2002:a05:6000:24ca:b0:43f:e2b7:7160 with SMTP id ffacd0b85a97d-44bb2f28236mr23179625f8f.4.1778000737510; Tue, 05 May 2026 10:05:37 -0700 (PDT) Received: from sam-ThinkPad-X1-Carbon-Gen-11.netbird.cloud ([45.12.242.119]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960902sm6521172f8f.28.2026.05.05.10.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 10:05:36 -0700 (PDT) From: Sam Kent To: openembedded-core@lists.openembedded.org Cc: mathieu.dubois-briand@bootlin.com, richard.purdie@linuxfoundation.org, Sam Kent Subject: [PATCH v4 3/3] oeqa/selftest: add oe-selftest for kernel module pre-filter Date: Tue, 5 May 2026 18:05:21 +0100 Message-Id: <20260505170521.1129945-3-sam.john.kent@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260505170521.1129945-1-sam.john.kent@gmail.com> References: <20260429124524.2890648-1-sam.john.kent@gmail.com> <20260505170521.1129945-1-sam.john.kent@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 May 2026 17:05:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236517 Add selftest-ko-filter recipe and a PackageTests.test_kmodule_prefilter oe-selftest that builds it to verify process_split_and_strip_files() handles .ko.xz/.ko.gz alongside a real .ko without corrupting them. Regression test for YOCTO #2348. AI-Generated: Uses Claude Sonnet 4.6 Signed-off-by: Sam Kent --- .../selftest-ko-filter/files/module.c | 3 ++ .../selftest-ko-filter/selftest-ko-filter.bb | 29 +++++++++++++++++++ meta/lib/oeqa/selftest/cases/package.py | 22 ++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 meta-selftest/recipes-test/selftest-ko-filter/files/module.c create mode 100644 meta-selftest/recipes-test/selftest-ko-filter/selftest-ko-filter.bb diff --git a/meta-selftest/recipes-test/selftest-ko-filter/files/module.c b/meta-selftest/recipes-test/selftest-ko-filter/files/module.c new file mode 100644 index 0000000..f6d50ba --- /dev/null +++ b/meta-selftest/recipes-test/selftest-ko-filter/files/module.c @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: MIT */ +/* Minimal relocatable object used as a .ko stand-in for pre-filter testing. */ +int selftest_ko_filter_marker = 42; diff --git a/meta-selftest/recipes-test/selftest-ko-filter/selftest-ko-filter.bb b/meta-selftest/recipes-test/selftest-ko-filter/selftest-ko-filter.bb new file mode 100644 index 0000000..1b8cc73 --- /dev/null +++ b/meta-selftest/recipes-test/selftest-ko-filter/selftest-ko-filter.bb @@ -0,0 +1,29 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# +SUMMARY = "Test fixture for the kernel-module file pre-filter in package.py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://module.c" +S = "${UNPACKDIR}" + +MODDIR = "${libdir}/selftest-ko-filter" + +do_compile () { + ${CC} ${CFLAGS} -c module.c -o module.ko +} + +do_install () { + install -d ${D}${MODDIR} + install -m 0644 module.ko ${D}${MODDIR}/ + + # Fake compressed modules — the pre-filter must not pass these to strip. + # Use octal escapes: dash (the OE recipe shell) does not support \xHH in printf. + printf '\375\067\172\130\132\000' > ${D}${MODDIR}/module.ko.xz + printf '\037\213' > ${D}${MODDIR}/module.ko.gz +} + +FILES:${PN} = "${MODDIR}/*" diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py index 38ed717..d33424b 100644 --- a/meta/lib/oeqa/selftest/cases/package.py +++ b/meta/lib/oeqa/selftest/cases/package.py @@ -185,6 +185,28 @@ class PackageTests(OESelftestTestCase): if not gdbtest(qemu, binary): self.fail('GDB %s failed' % binary) + def test_kmodule_prefilter(self): + # Regression test for YOCTO #2348: process_split_and_strip_files() must + # use f.endswith(".ko") so that compressed modules (.ko.xz, .ko.gz) are + # not fed to is_elf() / strip. + bitbake("selftest-ko-filter -c package") + + pkgdest = get_bb_var('PKGDEST', 'selftest-ko-filter') + libdir = get_bb_var('libdir', 'selftest-ko-filter') + moddir = pkgdest + "/selftest-ko-filter" + libdir + "/selftest-ko-filter" + + self.assertTrue(os.path.exists(moddir + "/module.ko"), + "module.ko missing from PKGDEST") + + for fname, magic in [("module.ko.xz", b"\xfd\x37\x7a\x58\x5a\x00"), + ("module.ko.gz", b"\x1f\x8b")]: + path = moddir + "/" + fname + self.assertTrue(os.path.exists(path), + "%s missing from PKGDEST" % fname) + with open(path, "rb") as f: + self.assertEqual(f.read(len(magic)), magic, + "%s header corrupted in PKGDEST" % fname) + def test_preserve_ownership(self): features = 'IMAGE_INSTALL:append = " selftest-chown"\n' self.write_config(features)