From patchwork Fri Jul 29 08:39:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12932144 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 B8C8CC19F2C for ; Fri, 29 Jul 2022 08:39:42 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web08.5736.1659083975764345696 for ; Fri, 29 Jul 2022 01:39:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=GxCijerQ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-51332-2022072908393302b9bc62f4214d84f0-6tr_s_@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2022072908393302b9bc62f4214d84f0 for ; Fri, 29 Jul 2022 10:39:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=6tfF+LeY8sv88eafGsGifG4xffM8cFOvgWhohz/sj6Y=; b=GxCijerQjinLbI/tQS3rUEX9eejL1CVY80t66vhFWH/dKSEwCS11ADq6q8BlsRaOfHus0x bPB4ALb254qbeNapS1k425Zy2+69IDaG6jNh0196f5/UDCVCDNDOl4q6/1VqBR9afDRrkewJ Z2H130A+N//j8C3XM6JDGyu38UIqw=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH 1/4] Update ISAR for sbuild integration Date: Fri, 29 Jul 2022 10:39:28 +0200 Message-Id: <20220729083931.419731-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> References: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 29 Jul 2022 08:39:42 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8972 From: Quirin Gylstorff Signed-off-by: Quirin Gylstorff --- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas-cip.yml b/kas-cip.yml index c3477ed..a39820f 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: 1000df8e98b9a5849a7897698039687fd0cdd7d3 + refspec: 64c755053d1252d183757b294cf9849fced64799 layers: meta: From patchwork Fri Jul 29 08:39:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12932143 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 AC5F0C00144 for ; Fri, 29 Jul 2022 08:39:42 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web12.5719.1659083977163017164 for ; Fri, 29 Jul 2022 01:39:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=YZH5XEAW; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-51332-20220729083934e642c49c99bcf0ef00-ldsu6k@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220729083934e642c49c99bcf0ef00 for ; Fri, 29 Jul 2022 10:39:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=fFRHowR/mQQzSPUOqCdazTP8CHvjVyl6i3XvkzcfEC0=; b=YZH5XEAW0eE3GQH3EfvgmAw0OoLttjy1IUbakDolQmjkXhVLMl2VyK2rWaZoadhV5Zzihc JjQWimvTUh8YfmSwCEuNHn7mCJqjhyGKXOe8dbl/cczxZPqp5/krNvCsAdnqrxcyJuhTlA8i THap1OrEj1nKBseJ2dixRI1zwZiV8=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH 2/4] scripts/deploy-cip-core.sh: Use dtb from deploy dir Date: Fri, 29 Jul 2022 10:39:29 +0200 Message-Id: <20220729083931.419731-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> References: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 29 Jul 2022 08:39:42 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8975 From: Quirin Gylstorff This fixes the build errors after sbuild migration as the build artifacts are no longer available after the build. This adds the DTB file for the beagle bone black to the deploy dir to fix the CI pipeline after using sbuild. Signed-off-by: Quirin Gylstorff --- .gitlab-ci.yml | 6 +++--- conf/machine/bbb.conf | 1 + scripts/deploy-cip-core.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d39d1f..41af3e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ build:hihope-rzg2m-base: - .build_base variables: target: hihope-rzg2m - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + dtb: r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-base: extends: @@ -166,7 +166,7 @@ build:hihope-rzg2m-test: variables: target: hihope-rzg2m extension: test - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + dtb: r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-test: extends: @@ -271,7 +271,7 @@ build:hihope-rzg2m-buster: - .build_base variables: target: hihope-rzg2m - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + dtb: r8a774a1-hihope-rzg2m-ex.dtb release: buster build:qemu-amd64-secure-boot-buster: diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf index b592f4d..ea87ed8 100644 --- a/conf/machine/bbb.conf +++ b/conf/machine/bbb.conf @@ -7,6 +7,7 @@ # DISTRO_ARCH = "armhf" +DTB_FILES = "am335x-boneblack.dtb" IMAGE_FSTYPES ?= "wic" IMAGER_INSTALL += "u-boot-omap" diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh index 203ab1d..01aa494 100755 --- a/scripts/deploy-cip-core.sh +++ b/scripts/deploy-cip-core.sh @@ -50,5 +50,5 @@ aws s3 cp --no-progress --acl public-read $KERNEL_IMAGE ${S3_TARGET} aws s3 cp --no-progress --acl public-read $BASE_PATH-initrd.img ${S3_TARGET} if [ "$DTB" != "none" ]; then - aws s3 cp --no-progress --acl public-read build/tmp/work/cip-core-*/linux-cip*/*/linux-cip-*/debian/linux-image-cip*/usr/lib/linux-image-*/$DTB ${S3_TARGET} + aws s3 cp --no-progress --acl public-read build/tmp/deploy/images/*/$DTB ${S3_TARGET} fi From patchwork Fri Jul 29 08:39:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12932141 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 B0705C48BEA for ; Fri, 29 Jul 2022 08:39:42 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web09.5788.1659083977163424319 for ; Fri, 29 Jul 2022 01:39:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=YBCmH0Kq; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-51332-202207290839348921a5143c3e6a2249-4mcpgk@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202207290839348921a5143c3e6a2249 for ; Fri, 29 Jul 2022 10:39:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=ekMv7LiVvF2MXSm/wh6FURXAGuwJbvgXqcU8kTx4qRA=; b=YBCmH0KqCWk1ytle22KCZEb+8kwYvQ7HAR9JrgH+PZg8jgt0kPt+T8E8nLQjegrgIEraZW wEQgH6wAlqeO9JKztZf9JxZ/1p2NGzR5VAGXMlK3JLze3pBvbeGyiRizeTiZWo28QWFXleH+ hMjcNDI6cfnfkGjDdPQ6oihAICE2Y=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH 3/4] recipes-devtools/ovmf-binaries: Adapt to sbuild environment Date: Fri, 29 Jul 2022 10:39:30 +0200 Message-Id: <20220729083931.419731-4-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> References: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 29 Jul 2022 08:39:42 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8974 From: Quirin Gylstorff Due to sbuild we can no longer access the build chroot with all installed packages. Signed-off-by: Quirin Gylstorff --- .../ovmf-binaries/files/control.tmpl | 11 ----------- recipes-devtools/ovmf-binaries/files/rules | 17 +++++++++++++++++ .../ovmf-binaries/ovmf-binaries_0.1.bb | 18 +++++++++++------- 3 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 recipes-devtools/ovmf-binaries/files/control.tmpl create mode 100644 recipes-devtools/ovmf-binaries/files/rules diff --git a/recipes-devtools/ovmf-binaries/files/control.tmpl b/recipes-devtools/ovmf-binaries/files/control.tmpl deleted file mode 100644 index 54641d6..0000000 --- a/recipes-devtools/ovmf-binaries/files/control.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -Source: ${PN} -Section: misc -Priority: optional -Standards-Version: 3.9.6 -Maintainer: ${MAINTAINER} -Build-Depends: debhelper (>= 9), ${DEBIAN_BUILD_DEPENDS} - -Package: ${PN} -Architecture: ${DPKG_ARCH} -Depends: ${DEBIAN_DEPENDS} -Description: ${DESCRIPTION} diff --git a/recipes-devtools/ovmf-binaries/files/rules b/recipes-devtools/ovmf-binaries/files/rules new file mode 100644 index 0000000..dcbef80 --- /dev/null +++ b/recipes-devtools/ovmf-binaries/files/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f +# +# Copyright (c) Siemens AG, 2022 +# +# Authors: +# Quirin Gylstorff +# +# This file is subject to the terms and conditions of the MIT License. +# See COPYING.MIT file in the top-level directory. +# + +override_dh_auto_configure: + mkdir -p /home/builder/ovmf-binaries/image/var/share/ + cp -r /usr/share/OVMF /home/builder/ovmf-binaries/image/var/share/ + +%: + dh $@ diff --git a/recipes-devtools/ovmf-binaries/ovmf-binaries_0.1.bb b/recipes-devtools/ovmf-binaries/ovmf-binaries_0.1.bb index 6524300..0f4592a 100644 --- a/recipes-devtools/ovmf-binaries/ovmf-binaries_0.1.bb +++ b/recipes-devtools/ovmf-binaries/ovmf-binaries_0.1.bb @@ -14,18 +14,22 @@ inherit dpkg-raw DESCRIPTION = "Copy the OVMF biniaries from the build changeroot to the deploy dir" # this is a empty debian package -SRC_URI = "file://control.tmpl" +SRC_URI = "file://rules" DEBIAN_BUILD_DEPENDS = "ovmf" -TEMPLATE_FILES = "control.tmpl" -TEMPLATE_VARS += "PN DEBIAN_DEPENDS MAINTAINER DESCRIPTION DPKG_ARCH DEBIAN_BUILD_DEPENDS" SSTATETASKS = "" -do_extract_ovmf() { +do_install() { + install -v -d ${D}/var/share + touch ${D}/var/share/test +} + +do_deploy() { install -m 0755 -d ${DEPLOY_DIR_IMAGE} - cp -r ${BUILDCHROOT_DIR}/usr/share/OVMF ${DEPLOY_DIR_IMAGE} - chown $(id -u):$(id -g) ${DEPLOY_DIR_IMAGE}/OVMF + dpkg --extract ${WORKDIR}/${PN}_${PV}*.deb ${WORKDIR} + cp -r ${WORKDIR}/var/share/OVMF ${DEPLOY_DIR_IMAGE} } +addtask do_deploy after do_dpkg_build before do_deploy_deb + -addtask do_extract_ovmf after do_install_builddeps before do_dpkg_build From patchwork Fri Jul 29 08:39:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12932145 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 B8A7AC04A68 for ; Fri, 29 Jul 2022 08:39:42 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web08.5738.1659083976669804665 for ; Fri, 29 Jul 2022 01:39:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=PZM8FBPi; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-51332-202207290839348bd8f338d6e5150f93-skl_rx@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202207290839348bd8f338d6e5150f93 for ; Fri, 29 Jul 2022 10:39:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=otTTPYyAYnc7KthM/ZTNSUVGdQePuM5JNzlHwINIRMg=; b=PZM8FBPi/WEQYzLuZTQR28RJFn5oA1Hi88bQwitbizcyVucbI4mYnuZ1qc9I12wSasTLVR UAo/j8dtnxjfZgZuOUrzegemiAw643FHkXwBwlyjtfnSCVMKWvDldiBSuH/rR1sNhuVkFR22 v0tLR89X2xpKZcmhJvx6oBCts35hw=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH 4/4] kas-cip: Add patch for linux-cip with CONFIG_MODULES=n Date: Fri, 29 Jul 2022 10:39:31 +0200 Message-Id: <20220729083931.419731-5-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> References: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 29 Jul 2022 08:39:42 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8973 From: Quirin Gylstorff This fixes an error during the kernel build with sbuild if Modules.symvers doesn't exist as find returns 1 if a name could not be found. Signed-off-by: Quirin Gylstorff --- ...ernel-Check-if-CONFIG_MODULES-is-set.patch | 33 +++++++++++++++++++ kas-cip.yml | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch diff --git a/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch b/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch new file mode 100644 index 0000000..d07c36d --- /dev/null +++ b/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch @@ -0,0 +1,33 @@ +From 6ad8f9bb92d3722ff5eb60f09e5ef75ba5febcbd Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff +Date: Thu, 28 Jul 2022 16:24:16 +0200 +Subject: [PATCH] recipes-kernel: Check if CONFIG_MODULES is set + +This fixes an error during the kernel build with sbuild if +Modules.symvers doesn't exist as find returns 1 if a name +could not be found. + +Signed-off-by: Quirin Gylstorff +--- + meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +index c6b5059..909b01b 100644 +--- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl ++++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +@@ -173,7 +173,10 @@ kernel_headers() { + (cd ${S}; find arch/${ARCH} -name module.lds -o -name Kbuild.platforms -o -name Platform) >>${src_hdr_files} + (cd ${S}; find $(find arch/${ARCH} -name include -o -name scripts -type d) -type f) >>${src_hdr_files} + +- (cd ${O}; find arch/${ARCH}/include Module.symvers include scripts -type f) >>${obj_hdr_files} ++ if [ -n "${CONFIG_MODULES}" ]; then ++ echo Module.symvers >> ${obj_hdr_files} ++ fi ++ (cd ${O}; find arch/${ARCH}/include include scripts -type f) >>${obj_hdr_files} + if [ -n "${CONFIG_STACK_VALIDATION}" ]; then + (cd ${O}; find tools/objtool -type f -executable) >>${obj_hdr_files} + fi +-- +2.35.1 + diff --git a/kas-cip.yml b/kas-cip.yml index a39820f..5a43cd1 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -25,6 +25,10 @@ repos: refspec: 64c755053d1252d183757b294cf9849fced64799 layers: meta: + patches: + fix-hihope-kernel-build: + repo: cip-core + path: isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch bblayers_conf_header: standard: |