From patchwork Fri Jul 29 10:04: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: 12932275 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 28DD4C3F6B0 for ; Fri, 29 Jul 2022 10:04:43 +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.web08.6284.1659089075535148736 for ; Fri, 29 Jul 2022 03:04:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=UgNq+1iJ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-51332-202207291004325258a59108b44f5904-e9g_q2@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202207291004325258a59108b44f5904 for ; Fri, 29 Jul 2022 12:04:32 +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=UgNq+1iJ99PWkZ5Nw2EV0x1ysephRP2UH4p0Aa5pu6V7lbIfpRBGNvFTAxoEc5muptEHsk yw+sN3+JMjmhzBcr1n3Vilh4r0fAtl+bFhY5CDR4R31Gv9MgCCfZiNw3oFni2DClTvc/dkJX 3HIxMcPCIUuZFPiZZH9Iut2PHO+Rs=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 1/4] scripts/deploy-cip-core.sh: Use dtb from deploy dir Date: Fri, 29 Jul 2022 12:04:28 +0200 Message-Id: <20220729100431.453463-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729100431.453463-1-Quirin.Gylstorff@siemens.com> References: <20220729100431.453463-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 10:04:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8980 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 10:04: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: 12932272 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 283F3C00144 for ; Fri, 29 Jul 2022 10:04:43 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.6209.1659089075231028357 for ; Fri, 29 Jul 2022 03:04:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=gEHQdZnY; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-51332-20220729100432a36ff4b16b6f528ed1-fp0vvf@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20220729100432a36ff4b16b6f528ed1 for ; Fri, 29 Jul 2022 12:04:32 +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=gEHQdZnY0LnZUWUKlJxgvZTEeCW7g2KcQDYeLJe1iQ38v1FQMgFBJ4SRZKGEID/HVJd1n7 FxKlj8r3x3F41Z0YZJI/OFdjbJKcnL2yknvv0VquvfdxDML775cD6WhiuaqTiEqWNTn5Kyn4 YT6PCMGNrJr9GAg7kjLx3y9Z1r8Zg=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 2/4] recipes-devtools/ovmf-binaries: Adapt to sbuild environment Date: Fri, 29 Jul 2022 12:04:29 +0200 Message-Id: <20220729100431.453463-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729100431.453463-1-Quirin.Gylstorff@siemens.com> References: <20220729100431.453463-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 10:04:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8983 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 10:04: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: 12932271 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 29B72C19F2B for ; Fri, 29 Jul 2022 10:04:43 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web12.6284.1659089075254135213 for ; Fri, 29 Jul 2022 03:04:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=GSwEU4cP; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-51332-202207291004334c03934c4314f9db1a-qy3c60@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202207291004334c03934c4314f9db1a for ; Fri, 29 Jul 2022 12:04: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=ddcqt5sX44387N55ELuyPx8GYcpteA/iYWfEkhAuc6U=; b=GSwEU4cPXXfuO8cUIbiW5B/IR9adfHvOqe4mIL44YHaxwtDSnKxhUQwEDOYD41sEtilSx5 4QTxvg28iJ0UQogFKgLXCXlRvZ7KFRfyR+jfqNMhZ8JCBmqG77qRMT87IlTRe+Bq6lMFtzkG qGB+Ga7ZzNnqBsf2WUTOEs258R9VM=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 3/4] kas-cip: Add patch for linux-cip with CONFIG_MODULES=n Date: Fri, 29 Jul 2022 12:04:30 +0200 Message-Id: <20220729100431.453463-4-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729100431.453463-1-Quirin.Gylstorff@siemens.com> References: <20220729100431.453463-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 10:04:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8984 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 c3477ed..ab61aa8 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -25,6 +25,10 @@ repos: refspec: 1000df8e98b9a5849a7897698039687fd0cdd7d3 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: | From patchwork Fri Jul 29 10:04: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: 12932274 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 35A97C19F2D for ; Fri, 29 Jul 2022 10:04:43 +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.web08.6285.1659089075649344442 for ; Fri, 29 Jul 2022 03:04:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=PFdBpETc; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-51332-20220729100433c468c2ff6757ca6063-uxceaz@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20220729100433c468c2ff6757ca6063 for ; Fri, 29 Jul 2022 12:04: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=3hLabKd3Nk5uIOWRkV7vDpLamzL46+KrNMvy+g31ERw=; b=PFdBpETcljsEAiqoNoVfZrfHDgxNr7sJpTK3dE3cGuAVe7FHLzdBc2a15NA3LVxMDUrDYj tnm2icL/mw/TLco0M8QZHBkl3HpkfLj+EHqrjw4v594eomMBbWQxEz2dg5d1QwoddY6zwfD9 nbAwtjPR6+qAU1Fbdy08WS/3M7eCQ=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 4/4] Update ISAR for sbuild integration Date: Fri, 29 Jul 2022 12:04:31 +0200 Message-Id: <20220729100431.453463-5-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220729100431.453463-1-Quirin.Gylstorff@siemens.com> References: <20220729100431.453463-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 10:04:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/8982 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 ab61aa8..5a43cd1 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: patches: