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: |