From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:a17:90b:1a86:: with SMTP id ng6mr24381030pjb.12.1607929891017; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:f601:: with SMTP id m1ls6166727pgh.4.gmail; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ/WtfjLiUlHEKY/I9PuvLClPY7jsCFEF9J+7cmFRvWAU4fRWkxFkQd7ZCTU7BfI00TzHv X-Received: by 2002:a62:dd94:0:b029:19e:92ec:722a with SMTP id w142-20020a62dd940000b029019e92ec722amr22673644pff.50.1607929890186; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929890; cv=none; d=google.com; s=arc-20160816; b=bt124wkFKMRwlssyEn0Si4Y5gr4jQhrvJX8nD23vbEAANGXr9ZNQ5c0iewGq6urMzQ /O7F0HgEy069oUDTu/bHHlh6gj4rtpZE7cu8pbjf9iyaiRZ1AYz/nTBszUs6cSVm+XsD BFIBgqln33CJSiuv/62khDXL+U7ulOWhY4QvNxxui5w37ZR0RCavNKjz82rWtOKUcBor MEmsEnTK8mdOeesM9r4S1fr8IVV2G+2gDR8tIs2rS6zIcOx7a7MT2oXD8eAWA0KPGVf9 Yak3AQUJREN3otAP2KzSvZdhXGqT+4Mv9DSRFlklpP+dIeJAypful4cGZ40qe+85g+ri WCJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=3ZeY84Dx2WYVN/K4v4HpYEf4brLtf3SgT9nirt7b8v0=; b=xcCVoz+ih+8Oo7iq2btHyLqhk/5iaR1zYlhGesMV1dantgTKSMMfr8nMcJ0rT9PrpU J2PjMa8VDqUmcOsX7rsihEXC85ZSA67/h6U3hfvgQljJNl/HjRHLhOnPgpfOS+P7OdXa haRE8zQZda6M9a8hTJMTUxyEf6USDhX6FuT3mQ95GYcXhLmHlhg3x+tBRf6kbG8lvScV XkTx6va0a2xrncl6JGo5t/qYdLNR0NwiD6mYfCFc+mn/kJggeNKXOKXhZkAcq65lze5D jGJkYKvgQQKUhUSPIqc9cAh+JGhaCDpC4rydslX3rknyCsH0JfpFJddrKfO/CboHyTWw JR9A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id z18si14174plo.5.2020.12.13.23.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 23:11:30 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 0BE7BR68003277 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:27 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXY030825; Mon, 14 Dec 2020 08:11:27 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 1/6] meta: image: Account for Ubuntu differences in do_copy_boot_files Date: Mon, 14 Dec 2020 08:11:22 +0100 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: D5cnRGqAvyTZ From: Jan Kiszka Ubuntu places kernel and initrd links under /boot. Furthermore, it makes the kernel unreadable for non-root users. Account for the latter by cat'ing the kernel under sudo, redirecting the output to the deployment artifact so that it is owned by the building user. Signed-off-by: Jan Kiszka --- meta/classes/image.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 74fc8500..eddc4449 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -132,15 +132,18 @@ EOF do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files() { - kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinuz')" + kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" if [ ! -f "$kernel" ]; then - kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinux')" + kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" fi if [ -f "$kernel" ]; then - cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}' + sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" fi initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" + if [ ! -f "$initrd" ]; then + initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" + fi if [ -f "$initrd" ]; then cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' fi -- 2.26.2