From patchwork Wed Jan 8 14:33:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11323801 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE6C113A0 for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B80C3206F0 for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B80C3206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 529CC85124; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5DC08ZQCWcFu; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id A7A108458C; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 971FEC0881; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5DBE5C0881 for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D360844DA for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qNlVkTRmqjyU for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3192784417 for ; Wed, 8 Jan 2020 14:34:41 +0000 (UTC) Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 008EYdpY016960 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 8 Jan 2020 15:34:40 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.25.69.120]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 008EYd2V001552; Wed, 8 Jan 2020 15:34:40 +0100 From: "Q. Gylstorff" To: cip-dev@lists.cip-project.org Date: Wed, 8 Jan 2020 15:33:58 +0100 Message-Id: <20200108143358.26177-6-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108143358.26177-1-Quirin.Gylstorff@siemens.com> References: <20200108143358.26177-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Cc: Quirin Gylstorff Subject: [cip-dev] [isar-cip-core PATCH 5/5] kas: patch isar for iwg20m with kernel 4.4 X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cip-dev-bounces@lists.cip-project.org Sender: "cip-dev" From: Quirin Gylstorff Signed-off-by: Quirin Gylstorff --- ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++ kas.yml | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch new file mode 100644 index 0000000..3e4e13e --- /dev/null +++ b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch @@ -0,0 +1,37 @@ +From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff +Date: Wed, 8 Jan 2020 14:43:01 +0100 +Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12 +To: isar-users@googlegroups.com + +ARM/ARM64 Kernel with a version < 4.12 do not contain the path to +the kernel image in image_name. This was added with commits: +152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and +06995804b5762f016c7a80503406da853a8f3785 for arm64. + +Signed-off-by: Quirin Gylstorff +--- + meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++- + 1 file changed, 6 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 67b7ce3..ac347aa 100644 +--- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl ++++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +@@ -56,7 +56,12 @@ EOF + + install_image() { + install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path}) +- cp ${O}/${kimage} ${deb_img_dir}/${kimage_path} ++ # ARM/ARM64 kernels < 4.12 do not include the path to the kernel ++ if [ -e ${O}/${kimage} ]; then ++ cp ${O}/${kimage} ${deb_img_dir}/${kimage_path} ++ else ++ cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path} ++ fi + + # Make sure arm64 kernels are decompressed + if [ "${ARCH}" = "arm64" ]; then +-- +2.20.1 + diff --git a/kas.yml b/kas.yml index 3eb6f03..a157dc9 100644 --- a/kas.yml +++ b/kas.yml @@ -22,6 +22,11 @@ repos: refspec: 619d6d88ac8c745282fd16773d50a466567615b6 layers: meta: + patches: + build-arm-with-4.4: + path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch + repo: cip-core + bblayers_conf_header: standard: |