From patchwork Sun Dec 13 21:11:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 260 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590668ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:a17:902:9003:b029:d9:ee53:5066 with SMTP id a3-20020a1709029003b02900d9ee535066mr22022391plp.66.1607929891337; Sun, 13 Dec 2020 23:11:31 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929891; cv=pass; d=google.com; s=arc-20160816; b=AspZPdmN/Cf6DrpNAF/FKoK8jBAawNhfs4u95gSZZB3+rfptaWq9CMRoWSzuCGymQp QzSSyKZCp6N2yrO9paU7cAPR46Y1YKjC6naPXVdYRcLYAg1hkNx6SNzAuVFIThNaQ4Dm bbV/L0ZTKDfRN+xlbxPYCZ/EbP5LzPmReaKRc9tLqFjUO8qT1NMXWdgXL/IH9eAOiL/n c78UedmZZ7PHTzWERaFU4cGRrPketlhsTTCp35+At9NIzuMGhOC99Hb0w+aDI9fJDycP ThEdLz/tnHNt/4arMjGeTWiEdVSAZU9MxpdvrLuh1RBAdgJxcEycoTCpnyEcyYEtfN4D lP6A== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=fZ2zTZHV/CD2ddXVPlLlzFLJn13MyKsh4QKAKkxlL+c=; b=iZUux8LdZqOsLDoAqaXn9w6ZAX12F9annnrhOg2TFbFSbhitykKGdRZ2VLsZqE7Ndt SE/U9BH3pFt81zFEPKVlUFMZb/SF/hODy5gzTtanD77eY2ikxXvm8JJ5uOV8q+WusnHQ bDUypIYOWdzNbLFsl4SuZlKIH05nUb4LYwl25oRQCbHe24MGwD+He8Xe/oBH7XBOdz47 6OM8b69DeXhsPWQ8tKgaLM7QmxwfEmgE7Nkhib7RgZIljnnanPqNLKXw0AXKfbtZhwc9 o7xGKErR5hsJ3WCVw8EZ1UW2BgXWosZGNArbSr0RZ1mlj+sKMcjzIX468XMLCYcGvAqU Bp3Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=LvGHp2bS; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIVA3T7AKGQERXVOCAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id i124sor743527pfe.23.2020.12.13.23.11.31 (Google Transport Security); Sun, 13 Dec 2020 23:11:31 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=LvGHp2bS; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIVA3T7AKGQERXVOCAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1607929891; cv=pass; d=google.com; s=arc-20160816; b=RclvKPKNOVgHgM0keJsUvHl37JszFu68XVHu8KDgkMYpOzJfZkx4UQBHXf1CcXTgVJ lioXU79fijGRp9LmbvJ8BQYwEfqIXL8S/lr3+Ety4Xr7WJlRrMNmF0a1wIS19SS6MDHf 1e32RcCUa9MmMYwT+T2dwiM87Ji/39o8K3mg/8yzIOcoD7Rt4Fk6RrVhnClFm+3S2TBk 1xd3q9Evyl0SoagUg24/1RqQ3lPfJy8LpaoCOuG8+GOyYeJTHeg/ka4WBWZYEZ3tyX89 qn5v/lKQjGk5i01bjJILkIKndA+NgTg/5gFDo/5Q7pv1MOiR1wF4GHI08l165uPCrJkg wcUw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=fZ2zTZHV/CD2ddXVPlLlzFLJn13MyKsh4QKAKkxlL+c=; b=t3tQiJEbx7vaaw8Q9AS0U9lo1OSHrFil+omxZJ/KRAuszwBmy9rooYTe+yNr+TxDLC eHlC+6fsFy4Hs7/NRldEotiih1CgIicHwqgg8tor0/TrrD7OHftpeEtDc0PuFYbUgc7o 2/q+dBlikvNrz9AjwHkPi2QjSTeGlqwOQWtyOO5p/tw9njaBHAyp5gpi0YNWI0XPKgn5 waCgjzxfE9kYRiEFs0heivvONDZ5yT1299DrbiW18sIISocfExpMblblmEdftI86k/gl bQ+IrI9OJfkiVd/7HJSYMxoBp2JZiqjxRYWFQTnJbHIpYyvFF3qSBmvpJGsIEk7bi1JM yuZA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fZ2zTZHV/CD2ddXVPlLlzFLJn13MyKsh4QKAKkxlL+c=; b=LvGHp2bSBSj7YhgbMSaIwgwFIARnXWUOaOJ7FlShse2DVwgJzh1U2lFftJSAudqDVU MzU+oxKYyuHtqH3WBT+hRC+o8reRVnt+HUiZfDJoLZ395smnpke+mzTt6C9tvU2y+jGw ub1xeecYzf5B6OiNm9veZ3jp1jAmA5CIDXfQJOFHM23/nIitvF02K62V3hcDzY1RLM3m 7Y9vKiCZdPoBFfFzXM0O86eFFWv7a1YbscwPUSRMu/FKNiPVVz5FPWEpVUeOe9N8DCdG Evvo9/0t5fn1QUFJeAh9GYyNqxqIeb/cFm6+eR00LBRA9xzKeFCJueu/vKqMtd9VjEMy wIpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fZ2zTZHV/CD2ddXVPlLlzFLJn13MyKsh4QKAKkxlL+c=; b=CLT1FwYW9FZKjPT18DbYjWpffqNkB4/HtYY2wV+7Ddgv1y4L5SJj8pcVwiV8oOBGrN 77WVKl20QFPBLX1ZIurEVrMkSjY7NGtQLdvgt2oqcwJEBLhOYb2iuArLLEfZH83jIBwr uJsO8Ak4lr8FhEuSkmPiVxrLEnk1qW8zmpSR0xEMQxTXNTdrTFFwNrbFaHXWJa5vHoDW TDismOnWP7Ny25eYej6dq+KGcNgm4WoVecTSV7rsRzv9wh3i8Gi8IzqlB3pM2vOzu8ol 2IxrJ61SHNHx9IHdT7Esl6gh6xGzAleNZ7HjcaOjMd66wN9Il9hG7sY4Z9idSGcPL1KU m4Cw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530bATq/zqhpr+5HZ1VjgUDHTnsQVeyytWUjbarLAO6BqbfCSyxV RAPMyRpH6jd5UMm024rFwMY= X-Google-Smtp-Source: ABdhPJyVyhy8LIOx14T3Fdt8i5vpftdmxX142LeDDhRkbW5xLMTMpAsBuWuAo2ty0edoKnxqSPT8KQ== X-Received: by 2002:aa7:9e43:0:b029:19c:d0ab:2684 with SMTP id z3-20020aa79e430000b029019cd0ab2684mr23146248pfq.42.1607929890898; Sun, 13 Dec 2020 23:11:30 -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-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 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; 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 X-Original-Sender: jan.kiszka@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1686036694016579296?= X-GMAIL-MSGID: =?utf-8?q?1686036694016579296?= 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