From patchwork Thu May 25 20:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 24525 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 E1F4DC7EE32 for ; Thu, 25 May 2023 20:06:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.481.1685045168618991762 for ; Thu, 25 May 2023 13:06:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 93CCA1042 for ; Thu, 25 May 2023 13:06:52 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 55CE43F67D for ; Thu, 25 May 2023 13:06:07 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/5] CI: move FVP license auto-accept to fvp.yml Date: Thu, 25 May 2023 15:05:58 -0500 Message-Id: <20230525200602.3277592-1-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 May 2023 20:06:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4707 It is only necessary to accept the FVP usage license when using FVPs. So, move that to the fvp.yml file from the base.yml file to make things a little cleaner. Signed-off-by: Jon Mason --- ci/base.yml | 1 - ci/fvp-baser-aemv8r64.yml | 2 +- ci/fvp.yml | 3 ++- ci/fvps.yml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index a724db65..26fbb602 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -27,7 +27,6 @@ env: local_conf_header: base: | CONF_VERSION = "2" - LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" diff --git a/ci/fvp-baser-aemv8r64.yml b/ci/fvp-baser-aemv8r64.yml index 40818bc6..cfaf9ef2 100644 --- a/ci/fvp-baser-aemv8r64.yml +++ b/ci/fvp-baser-aemv8r64.yml @@ -2,6 +2,6 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml machine: fvp-baser-aemv8r64 - diff --git a/ci/fvp.yml b/ci/fvp.yml index a8f8dfc0..3803d8ca 100644 --- a/ci/fvp.yml +++ b/ci/fvp.yml @@ -3,9 +3,10 @@ header: local_conf_header: testimagefvp: | + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" INHERIT += "fvpboot" + failing_tests: | # This fails but we can't add to the ignorelist from meta-arm yet # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604 TEST_SUITES:remove = "parselogs" - failing_tests: | TEST_SUITES:remove = "xorg" diff --git a/ci/fvps.yml b/ci/fvps.yml index 58c29d53..44c153ab 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -8,6 +8,8 @@ header: machine: qemuarm64 local_conf_header: + license: | + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" sdk: | SDKMACHINE = "x86_64" From patchwork Thu May 25 20:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 24522 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 C9FDDC77B7E for ; Thu, 25 May 2023 20:06:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.482.1685045168793109534 for ; Thu, 25 May 2023 13:06:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C833915BF for ; Thu, 25 May 2023 13:06:52 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 894EF3F67D for ; Thu, 25 May 2023 13:06:07 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/5] CI/corstone: remove debug-tweaks usage Date: Thu, 25 May 2023 15:05:59 -0500 Message-Id: <20230525200602.3277592-2-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525200602.3277592-1-jon.mason@arm.com> References: <20230525200602.3277592-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 May 2023 20:06:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4710 debug-tweaks is useful in testing and internal usage, but is a massive security hole (as it allow password-less root login). Remove the default enablement on machine files and in kas base yml. Signed-off-by: Jon Mason --- ci/base.yml | 1 - ci/testimage.yml | 1 + meta-arm-bsp/conf/machine/corstone500.conf | 1 - meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb | 2 -- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index 26fbb602..92fa7074 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -30,7 +30,6 @@ local_conf_header: setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" - EXTRA_IMAGE_FEATURES:append = " debug-tweaks" PACKAGECONFIG:append:pn-perf = " coresight" INHERIT += "rm_work" DISTRO_FEATURES:remove = "ptest" diff --git a/ci/testimage.yml b/ci/testimage.yml index d7de7d06..b4b5599b 100644 --- a/ci/testimage.yml +++ b/ci/testimage.yml @@ -3,6 +3,7 @@ header: local_conf_header: testimage: | + EXTRA_IMAGE_FEATURES:append = " debug-tweaks" IMAGE_CLASSES += "testimage" TESTIMAGE_AUTO = "1" kvm: | diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index c13c86c0..4794028a 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -17,7 +17,6 @@ PREFERRED_VERSION_linux-yocto ?= "6.1%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" IMAGE_CLASSES += "wic_nopt" -IMAGE_FEATURES += "debug-tweaks" IMAGE_FSTYPES:forcevariable = "cpio.gz squashfs wic wic.nopt" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb index 46427b74..884d4b3b 100644 --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb @@ -15,8 +15,6 @@ inherit core-image inherit image-buildinfo -IMAGE_FEATURES += "debug-tweaks" - #package management is not supported in corstone1000 IMAGE_FEATURES:remove = "package-management" From patchwork Thu May 25 20:06:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 24523 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 C85C5C7EE29 for ; Thu, 25 May 2023 20:06:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.480.1685045168448565524 for ; Thu, 25 May 2023 13:06:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0920E1650 for ; Thu, 25 May 2023 13:06:53 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C1B0A3F67D for ; Thu, 25 May 2023 13:06:07 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/5] arm/qemuarm-secureboot: add musl testing Date: Thu, 25 May 2023 15:06:00 -0500 Message-Id: <20230525200602.3277592-3-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525200602.3277592-1-jon.mason@arm.com> References: <20230525200602.3277592-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 May 2023 20:06:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4706 Add musl testing to have qemuarm-secureboot match qemuarm64-secureboot. Since the Arm GCC binary toolchain cannot work with musl, move that out into it's own testing. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df1f0f5a..0344de58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,7 +188,10 @@ qemuarm-secureboot: parallel: matrix: - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] - TOOLCHAINS: [gcc, clang, external-gccarm] + TOOLCHAINS: [gcc, clang] + TCLIBC: [glibc, musl] + TESTING: testimage + - TOOLCHAINS: external-gccarm TESTING: testimage qemuarm: From patchwork Thu May 25 20:06:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 24524 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 E109DC7EE2F for ; Thu, 25 May 2023 20:06:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.470.1685045168476161791 for ; Thu, 25 May 2023 13:06:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 417CF1655 for ; Thu, 25 May 2023 13:06:53 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0612A3F67D for ; Thu, 25 May 2023 13:06:07 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/5] arm/linux-yocto: remove 5.15 bbappend Date: Thu, 25 May 2023 15:06:01 -0500 Message-Id: <20230525200602.3277592-4-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525200602.3277592-1-jon.mason@arm.com> References: <20230525200602.3277592-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 May 2023 20:06:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4708 Signed-off-by: Jon Mason --- meta-arm/recipes-kernel/linux/linux-yocto_5.15%.bbappend | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto_5.15%.bbappend diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_5.15%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_5.15%.bbappend deleted file mode 100644 index 9a18dd8a..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto_5.15%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.15:" - -SRC_URI:append:qemuarm64-secureboot = " \ - file://skip-unavailable-memory.patch \ - " - -FFA_TEE_INCLUDE = "${@bb.utils.contains('MACHINE_FEATURES', 'arm-ffa', 'arm-ffa-5.15.inc', '' , d)}" -require ${FFA_TEE_INCLUDE} From patchwork Thu May 25 20:06:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 24521 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 C9094C7EE2C for ; Thu, 25 May 2023 20:06:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.471.1685045168769901617 for ; Thu, 25 May 2023 13:06:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 82724165C for ; Thu, 25 May 2023 13:06:53 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 42CE43F67D for ; Thu, 25 May 2023 13:06:08 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/5] Revert "arm-bsp/tc1: re-enable signed kernel image" Date: Thu, 25 May 2023 15:06:02 -0500 Message-Id: <20230525200602.3277592-5-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525200602.3277592-1-jon.mason@arm.com> References: <20230525200602.3277592-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 May 2023 20:06:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4709 This reverts commit 5cbe3041befbf4cd588e8f45a793448833cc3f64. --- meta-arm-bsp/conf/machine/include/tc.inc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index 75bfea07..14ec7205 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -10,17 +10,6 @@ UBOOT_RD_LOADADDRESS = "0x88000000" UBOOT_RD_ENTRYPOINT = "0x88000000" UBOOT_LOADADDRESS = "0x80080000" UBOOT_ENTRYPOINT = "0x80080000" -# Below options will generate a key to sign the kernel Image and INITRAMFS_IMAGE -# according to the default parameters of kernel-fitimage.bbclass. If the user -# would prefer to use their own keys, disable the key generation using the -# FIT_GENERATE_KEYS parameter and specify the location of the keys using the -# below paramters. -UBOOT_SIGN_ENABLE = "1" -UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" -UBOOT_SIGN_KEYNAME = "dev_key" -UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys" -FIT_GENERATE_KEYS = "1" -FIT_SIGN_INDIVIDUAL = "1" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"