From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6779570958446362624 X-Received: by 2002:a5d:5708:: with SMTP id a8mr5012364wrv.79.1578491869187; Wed, 08 Jan 2020 05:57:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4fc2:: with SMTP id h2ls804132wrw.2.gmail; Wed, 08 Jan 2020 05:57:48 -0800 (PST) X-Google-Smtp-Source: APXvYqxGZae1Ew+EfRgUSvZHsocZA8fRmEp1yMIFZWoFRlnJNrTYY5DSuFCziTYtMM7iol+5oZAE X-Received: by 2002:a5d:5491:: with SMTP id h17mr4937723wrv.374.1578491868590; Wed, 08 Jan 2020 05:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578491868; cv=none; d=google.com; s=arc-20160816; b=Se2hUPy25B1DJN2Tx4KAoXnLDM25EKmDjlL2gL/CD3R5RC0AzfNsRdpE8PpLtI3AXA nQZ8D7psVu49e+yi+UcfriUpggUlZshYHXQbyFEDE69EijyJb+MYNnsUhZC/YXkAVj0r iXhutnw0avK2sliLT24NVPHXNYAhaBRgpmyT0fedynLQ6M4UDTSuxyo1qsWVcvzJebtw KPES6XG8MB/3Y6f7SyxCAjFg1PZZb7oNaOmriDSUMpj0gE5rQriLEwunJXL+qU54kXKc 64AQ8XtAVefNYkp6L/n5/JSJ0cBRZhFPoaYK7m6jnl1oGWBbsX1WAmQ6Mud2eyo+q9dp JS2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=cJFVG/OklsXcsdN0beBDIe2lLLlPb5YIY0ZNZxXCKRM=; b=qIYjy6LxAVyVRJIdm0HlwBRnNS4QU301AK/2x0hJlzAk41qVp9NLhKW/+v4OZWnDWQ mER7mgXzZkLX1RKtlRTRIOI9sct3X+FwNtzpx8X7YGi5/nGgubKzewnSKVF3r2FrjUxa oKD8rOQiZGmmzvEjck80qY9FtbHDLwVLAKrT/HuAyx4JQHMk973GtXI1Twlk5X9PmoJw 1wm3Sm/85I5rMORdSMsek689mJ6AF2TFeyxYqVNxfDW9LBjXkqZTFXxgYGcRrcUx1zQa SbIg14lCNyWJPjMB7uBaDxBOPPTeqvBkF8pTu1coAzZQUmUpW90qWGY+qnFAE9zOqNWB YGIA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id t131si98917wmb.1.2020.01.08.05.57.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 05:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 008DvmuS007198 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 8 Jan 2020 14:57:48 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.25.69.120]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 008Dvm1D029369; Wed, 8 Jan 2020 14:57:48 +0100 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12 Date: Wed, 8 Jan 2020 14:57:06 +0100 Message-Id: <20200108135706.25834-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 3juJmCp4KZzQ From: Quirin Gylstorff 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