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 From patchwork Sun Dec 13 21:11:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 257 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590656ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:aca:c5c8:: with SMTP id v191mr12483836oif.67.1607929890877; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=BnlYAj3uzhvFWaTDnhsgX/ahCnaAfZJ+ZlJyRcKspHT2rjHJcud94fyKIvBSxG6Gjy YmJjG9aH9XFMNiir3tBHeHpJZ4owNIS/xuV99x+o6fycMvHuBVlASIlXYBU+zhhiVsE1 /d5TvoxjrXayuQJKXY8OYIZx8FGUL2GTVGmZwDsazdNlOuHWDQkSzIcI2Q3iXiaFrDvT eBPujkkccIhsG6kL6i/5KGEhTXM8r5QU/4XUY/I1tTWfiMBFp/u7jPrZUNjSvVVXZmjN iDOOqoO2mtN3QDC24x58pjXu4HzYuMF/9ewRlB1e7epMz1oeIRtZ1ds49BcHhLC3Zm2+ fW4g== 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=JRx3gJ4axtKOsebwi3JkTE9CicZUgnjQB0RqsF+5TiQ=; b=keFKt0f8kPgX9YIEV93AMpg/xJuyGCsEkzizJdio31DHXqP4Pz8TAB4yE2noXgN80Q 3uFc3oQmsy1IAewn0HOCAuiIOnbOoZmGxXCBtixmzY05moG6bfvepPe+VgqpS9CWofZb u5+VxCHBoBzB/M2eqbNgH4WkUXPSJs93UPlSkv0NOJmt8m2ohYAqoVaSakJ37L6Zudwk Le4C/FZXXYVua39tJQZZ+H8N8HBcf7IpJT8KwtUdoSnVQxYEL1JNbqigFsAgqBiMWlsx DU5OHjrEJ5kkRoi4pcgOBRcr7PElf8OstrA9t0V4lvSMkJoGAnwUz9aLR7lNxi1cMWtH C+wA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=iJK3Pvam; 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 z50sor6833333otb.4.2020.12.13.23.11.30 (Google Transport Security); Sun, 13 Dec 2020 23:11:30 -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=iJK3Pvam; 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=1607929890; cv=pass; d=google.com; s=arc-20160816; b=uCgAqCA2ryAMuaW36oZDjB6/lWoNTOuLtWvtemW+CwwXJ+e4c8v5bY0akyReFT6ext LSh9GgIxGFdVV5q23oymvcUiXx5CXKPBuCJ6PFz/5c5syhuYcIRg2BMkhMMS6QDp31A9 +FxhVkA9+JL5c2qhgo+2CB2bgBdZMsdEWIogon+cxPlB/6waPUVV7KAduRW2TAURxHmD 9OuMfEK6Nmw7yoKZCrEVn3VEllhHSzLso68TwH4HbUrBK2ihGhQQXXbrfD1CfYsA67vf AnLAC1cvUpglPF9IaRylG8LEex1s57uLx1L23TmKzKAGQ004hnsOeNDZBDDN/dKKyrfQ FMKw== 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=JRx3gJ4axtKOsebwi3JkTE9CicZUgnjQB0RqsF+5TiQ=; b=GI/5C7Df2F7vkFndq64RDoF1J9kWPLlYahbE7TulRzcGcCpOuLfWDAuVrRkU+a+OZN NmP63JiTuNAO/9f12U/w5BKhCEA3bjEd0v3fc4ldjRJJdnZJP2sPV9Bt8OkmP3/osrut s06KU9wI02blfNvzDSNKGcyuPoaudAulGkO3EO21pOqzYgn6UoWKpBdjvJoLMLgTXjly hYRQ9E09bg1t4UD7FvBYCUsC7l1SF5GAhwxB6MeseJ8qIN9rvRN1XW0XNPiYHw3ZMVlv fzIl2gv54+ZFPqqGSw2hU/DTpIwIxA/yvt7a44hyDgDf3j4XaCULfyWkIYgODJJnaPIP Jpnw== 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=JRx3gJ4axtKOsebwi3JkTE9CicZUgnjQB0RqsF+5TiQ=; b=iJK3PvamGM0T0ndhXYsY86MPFPMJQIu3gc0zHmHt5Bya0ai2HUArOx9SQI4i55uLYw VvhLEgvLX8vXsi5ECW9oOJ8nnKXGlgTRI89lk2yucZLzlM+Iu2WNt83kLw2lrjEvj9Pk oC0zoB1e9iVZlk4mnrc9EiIv1PICEjL4PcH+H/CovYOWLe47tocAqIJAhaQOfWwbitOJ NKDJCGTcPFmqyQRJlXWak50xbBJ4JN138zChLoGw3cu+F+IOO9BbtJ+0ZukNY1Pl/VxR i2bhc/zY08CZz9S3a7OEvrG8FzN/3GnMM9EF3qrDAYSbaM/fflGpWAq4yxYmj9ymn41a 6uKw== 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=JRx3gJ4axtKOsebwi3JkTE9CicZUgnjQB0RqsF+5TiQ=; b=O045SjLPBUxqWNJvqDxbvzYrvUC/JNx3XMLM0EhPt/IwWo89CONmUp67vxEOgOK7wd MPItDn54Sy6d8zkNB0Fn1+lmGXdXxAzh1dIh6WTNVp5MMmwBs4oA7diDpL37BntMBDuN tCf56kq+4dkYVRz81EfRVN80zm8Vq0R776jHIw2TMjJD8tffe/q8c3fDGX/RRV3qTIYY LqoQ/vl3ZCmdUjAR/PO/Dx2UhT4D56K/x5a/H9erkvJ3HRZAH4s3S6jQM2qONzjB0och oAlGCczfz2tVtUfg16AHYufCg6vKHOos+l1Twdv6N0p2OVOXLctopHtPJ/yuORZUfAP4 2oUA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531MYaQpeIJSBOKmryPanXz4kZCX8kp5m0r1qWHpd7ezKY8NHFnf GWlMpgVkrEscj7vbkYl6KTk= X-Google-Smtp-Source: ABdhPJz0lLJOR8MQR6bZvyvTybrxvQdhHdmWWrUuwQhJhXmNJZ+x6ywAdJhjukPzG37sY97Y4znsnQ== X-Received: by 2002:a9d:3d66:: with SMTP id a93mr18506403otc.287.1607929890535; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:140e:: with SMTP id v14ls4084977otp.4.gmail; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Received: by 2002:a05:6830:1c34:: with SMTP id f20mr16445583ote.147.1607929890112; 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=GefCLDv3pmFIT1COaBb1z1wRxvQDRv0qukqoIyQjG34uzc8LRtS8UxB9gvayKlDGyI vRYImG4ezipdV0c1ma4+kIIQfyTe1toxcPOPtoiOZrlqhIOBVjkWIukmf8ECmCh6ld7Q RTGtWToMxSLl1HesAPFfd/WEhBKOkOZeclsnT985T8rhtYYmtgFcq3QbQqsTyQorU2Ac QWl6CRtjy8yqKISw8/Y8+ZyEyRzkct2nVRnAEU99giY0wm/fe7hGlM7wBzeHwf18dlti f9/BrL87BFtKRFwYuIFwMh7OIBKfoEAGlKXji8YICPq2mXa5tb7VedKbjwgPGoEi+YMn YEMw== 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=z8av5Drnpjn1xOcD7cnw+fcCMU/r4WCcxSF2jokJgh8=; b=nI0GjAe2wc8LVQRICcsVyepQ9kmgYUJIQMPOfECu46fQffik/heCY1haITpiXsvjCy gFzB7QEAwVjWQ7fkWxmAlLRGqcNkGGSHmBZa3m8NiAsDKaBytzoDAT10Y1mwDjOU+fE+ vk1SL3FhPW6PwnAiNLYB4yINxroHC2wRN3axuf/REkqSQmOixtP+I49RkTuszM6zjWdO aoV28eMvl0py4PjnjgkKu38rXTSqEg398L+JTyZyjzcD3x1p4Z6qbEgsf6J0MLDq4sIB 7K7C+YhtVpOjJv/A7s3MV6OEAuXAV6yy0hjxODNwCfdBFNkoFxNw0ZiHY3JZEePAftYp 8hmw== 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 x20si337257oot.1.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 0BE7BSJe003282 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXZ030825; Mon, 14 Dec 2020 08:11:27 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 2/6] meta/isar-bootstrap: allow passing a SCRIPT to debootstrap Date: Mon, 14 Dec 2020 08:11:23 +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?1686036693595024196?= X-GMAIL-MSGID: =?utf-8?q?1686036693595024196?= From: Henning Schild Debootstrap uses scripts that usually have the same name as SUITE so we never set them. In order to install a SUITE that an outdated version of debootstrap does not (yet) know, we can tell debootstrap which SCRIPT to use. In fact many modern SUITEs will use SCRIPTS we might already have, we just do not have the symlink to them. i.e. "cosmic" uses the SCRIPT "gutsy" and a debootstrap from "stretch" does know "gutsy" but not "cosmic" So we can debootstrap SUITEs from the future, given they use a SCRIPT we already have. Signed-off-by: Henning Schild Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index dca136e0..a5cd1f03 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -271,14 +271,16 @@ isar_bootstrap() { ${@get_distro_components_argument(d, True)} \ "${@get_distro_suite(d, True)}" \ "${ROOTFSDIR}" \ - "${@get_distro_source(d, True)}" + "${@get_distro_source(d, True)}" \ + ${DISTRO_DEBOOTSTRAP_SCRIPT} else ${DEBOOTSTRAP} $debootstrap_args \ --arch="${DISTRO_ARCH}" \ ${@get_distro_components_argument(d, False)} \ "${@get_distro_suite(d, False)}" \ "${ROOTFSDIR}" \ - "${@get_distro_source(d, False)}" + "${@get_distro_source(d, False)}" \ + ${DISTRO_DEBOOTSTRAP_SCRIPT} fi # Install apt config From patchwork Sun Dec 13 21:11:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 255 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590645ooo; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Received: by 2002:a17:906:30c4:: with SMTP id b4mr12184809ejb.456.1607929890012; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=fz5cVsRPVjcz5feFS9rjNvDC8irhL43+Y6DcZDqCMUftoqrCmryuYP8+W5vbR414Bz ouygthI3dWKD9/vIfyKmP79rZg2sk6VWlM6h/Bra0Dgqkth/rusciApecBTz4TxnLDo0 XUhvTS4M5YMuH3xrQbaTHap9T5payF8XUGMjQ8FDEkKvk9DMvjFHoE/u8IaeWQyxPseP 9WWtJADAM9Uxi8k2cA3BdJcULdLhaBk+xCTdT/MnbXWdA8MO2N2Z0SiUV+JUfVrVztsd GOC2W30cG1xTw870fgxs9dWN+LpbwofwfGRtTMdPnCcEfMa40RD+xFKCndiRqXZb+EZ8 uE4g== 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=YIg8dDULvPVOnU853ihkZxQF2jBAr6423SVU5cnbfRI=; b=m80LXPXZt1KulZczL27XGLMezP2SVrM763Do/zBbTI954/me0k6v3mq3P3K5+G1uE2 khSfMUuND9X1+wvA8gSXJT+U6HW7sUCd98restDaslMHexuuL4kxk4y9lMedJDdI+gm7 j9FogxIKI9atqx/ww9TvzIf0fk9N3j2FDo5ysJmLy2GToZW73MjoBhQdQG/srLYkDUQI lL2ts0inpJTyI/OCyJF2FLZkgKgsVLf2uQ9r6p26eHNPbx87EEeMqyc5KjMQvgFt+e8i otPzNkLaFtagI0+G+Kko+nyk2WlAY9k7Tnf6xmN4hpMNGwk2dbTE+IUtGb0kuTjpCquD 1+BQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=PoRjpIGT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbina3t7akgqelnwaicy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBINA3T7AKGQELNWAICY@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 gx23sor8650071ejb.29.2020.12.13.23.11.29 (Google Transport Security); Sun, 13 Dec 2020 23:11:29 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbina3t7akgqelnwaicy@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=PoRjpIGT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbina3t7akgqelnwaicy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBINA3T7AKGQELNWAICY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1607929889; cv=pass; d=google.com; s=arc-20160816; b=DTpIbsFSG6MoMrdJGoOGa8U/+wAroUOzEo9MNEvVyJdAD5Z+SCzlPDn1Xo9HymyOi8 JJm0Wv4r2Mch/crtQGG8on7Gd/w2BRmWev41s9gO4KMRd9V5cX2i6YyGkpXs5B3ijfnB idKkn1MHgSLXGROAp/eTr3K0j1/4H1e/jE/mnsqoyVqGCyRn0i7bz/BbZvcNZer08c/6 wyQrnc/qqRQDHvgr/I8rOt4IvQPt2qwyTDn2vRNTk7VMqR3LVfy6nxu5UzgiLIrNrHRn vu4NbjCsFbbLam50eamGsGHIMr0JNxuY2rxFT5wo4cC6V2LV7cwOO+nWM4RZZgT4k1rW gLMQ== 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=YIg8dDULvPVOnU853ihkZxQF2jBAr6423SVU5cnbfRI=; b=tLz1aPbL5zRzok8pGl2um1JtnXC8YIq+KNblwU9f6EvcK+kZ6b06Hq62m/IXlkwVZJ 53KWRX4XuOazFLRhhEvM4QkiCDVnX8t4J/eTNomXm3uniIIlNj5Ed2yfj5ocdx8P4e4m ffUbuqu0Q+xJilE991wMho1or68vJgHVUut9p+275WAfb5uw2NPsrotjG72QHNmaT5HQ WZSpzOe3x6BOFoI/ZEMxme6J8Njk6tTRDMpALb5xkdnbfa9Q6oMzFgfFDx3OR5Kx1FUy sD1p6xUTWkVYmQFO2tI+SAfiYTta8BKuP5tibLzHjdYkH8lctsfeAujN9HRuISo2GlaT DQrw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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=YIg8dDULvPVOnU853ihkZxQF2jBAr6423SVU5cnbfRI=; b=PoRjpIGTwBUT6W2iGiAes9lWTfDchnOtBNLFWgNoD4Pq+yzn4ljDKMguG4Ar7cWYWu OiUJiDeZgr8LU011ZfTwAPQmlvanbijJq7/I8UlubBJzOF8D17aG5mzviNsVOtKHf5Ap DomHkfIaMhdnUhTbYuRByCw/Bx9bbokQEOu6bHjNVczB4rv0EcT7W6HLkENOQqFFi3Ml EGTaXUWDZP1bgUNe/KtvegH33E/xk0s0j9tCnB3WkQ4K+sJze8MMHoqTrjGteW2Gxn1w /iCfRjR/spVkf7jC/JijiEXWUogsV+x0/w4M9YN+8P7wwYLZNAkYmW28mdHq9q09gyUF p/Og== 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=YIg8dDULvPVOnU853ihkZxQF2jBAr6423SVU5cnbfRI=; b=epK0elyvkLuHJdAXOPGttI1ahssvEFEB+r04yHIbRR3CPd9f+Hz5OyvOE+LJMyquGx Rha+/nSJN7YWTaXbySAq1of1lG3tfTzJooo5+fZEAAGTnbcx6ds7joriezhUa6UHvhZA /smYA7xd2evb+H03Z3fYZrM+651b3JbexZi089sMThDAjvncCFgVETNw5TxU9j1odDJ9 yHMjmXZKftxFtk8a4xvXjR5TgCe4YPbEtqwN+gl/UECILDOB8dPpqZ4sxELbRL8cR5ff nZWXOWm2PtZRtnEXyh4a4sp0tFE8bMKffpKsJjA194yuPv9dimJORewX8ByiblYwzY9i G9KA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533kE8+mwUoA+hWmllRHhGaRq29VLJZHXHvgCaEoDBdhrT6QXlMc dhNzGxFdiV1k8MMeCKydx/g= X-Google-Smtp-Source: ABdhPJzegseRUsXkPmFOYfRdu00DtM1K9tcZDyW44zPNtf8J3KZK6GyYoqGeIcNvJJVahd5h4+8lUA== X-Received: by 2002:a17:906:6693:: with SMTP id z19mr983266ejo.376.1607929889706; Sun, 13 Dec 2020 23:11:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:8a9b:: with SMTP id j27ls4830381edj.3.gmail; Sun, 13 Dec 2020 23:11:28 -0800 (PST) X-Received: by 2002:a05:6402:2066:: with SMTP id bd6mr23469919edb.211.1607929888748; Sun, 13 Dec 2020 23:11:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929888; cv=none; d=google.com; s=arc-20160816; b=VZRRcXLIghPrJmPu7pHV+lZuY7Nhdh58RLxiSrzvX41/Tq1WV6SXNWta2bD6EQEF9M 9S3y4WobdOrHXuGCJi4ydhUvWTBTJrU/UGkpaJi0dueRRhBA7bYYI58x6Hcf+wszwknp Sfpp9dRerXB0noc5mvyfqdsPZukTEGUeGPwGAlSXc1BtgjUBMJczgxSAtSjTVKUUugEt mo9pF5ammeFKLfrlTnoqK4mp7JVj1mn00fcxq4KJL586wHeuslUoVyZbDx87/IcR16G+ bzMoodSq3fiwtbuasfx92+InjczP21a2jT9b+Qz2OjI4ImJIdGRdcKfODmXjaa0SgdYv MKFA== 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=+1QyxB9VF3L3LDP0FkRFZiIRGU3nsl0yUQtgusgjXHE=; b=HPVejhE1FxiWcSxjdFu15IMVI/aMJB7B1/2Re12N3XULYCtfJLRgkmmOq+ujYyA/Cl LDswzBWKHdE/tLavAgywQ7ssoBVQBnRHFvCEq2hFQHoQyIg2CmAWRoB1QWh+Gj0/EyxV r8Xtlk7rBKmTwiBCwDiUeMKiYvzNGAnZe1JDi0LuaeGJMQbAL9yZtqJK0sYXo4Eozt2E CJtMridLTAMWTBksMhoBhsqGbYRN+r1qG8G6pWdaVj7YZ5rqY7+Jz2wffAMpaIrawBSZ LpVNLHJG/hXLED7c/TbDfJgC7ROqbqzPWQHQAbNX3WkQD3PqfxzO4o7/GoUYJkJ2TWQo thTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id e5si363388edk.0.2020.12.13.23.11.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 23:11:28 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BE7BSLG023072 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXa030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 3/6] wic: bootimg-efi-isar: Add support for Ubuntu Date: Mon, 14 Dec 2020 08:11:24 +0100 Message-Id: <57c2d3cf997a0355af0dd04eb6b2924ac7920f43.1607929886.git.jan.kiszka@siemens.com> 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 192.35.17.28 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?1686036692240337834?= X-GMAIL-MSGID: =?utf-8?q?1686036692240337834?= From: Jan Kiszka Ubuntu places the kernel and initrd links under /boot. Account for that. Signed-off-by: Jan Kiszka --- meta/classes/wic-img.bbclass | 2 +- .../scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index bbf5dd8a..dedd2bf0 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -99,7 +99,7 @@ WICVARS += "\ KERNEL_NAME KERNEL_FILE" # Isar specific vars used in our plugins -WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO_ARCH" +WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO DISTRO_ARCH" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS', True) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 2285d2ef..67efa52e 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -65,6 +65,10 @@ class BootimgEFIPlugin(SourcePlugin): # Create grub configuration using parameters from wks file bootloader = creator.ks.bootloader + kernel_initrd_path = "/" + if get_bitbake_var("DISTRO").startswith("ubuntu"): + kernel_initrd_path = "/boot/" + grubefi_conf = "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" grubefi_conf += "terminal_input --append serial\n" grubefi_conf += "terminal_output --append serial\n" @@ -77,9 +81,9 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "set root=$bootdisk',gpt%d'\n" % part.realnum grubefi_conf += "\n" grubefi_conf += "menuentry 'boot'{\n" - grubefi_conf += " linux /vmlinuz root=%s rootwait %s\n" \ - % (creator.rootdev, bootloader.append or "") - grubefi_conf += " initrd /initrd.img\n" + grubefi_conf += " linux %svmlinuz root=%s rootwait %s\n" \ + % (kernel_initrd_path, creator.rootdev, bootloader.append or "") + grubefi_conf += " initrd %sinitrd.img\n" % kernel_initrd_path grubefi_conf += "}\n" logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", From patchwork Sun Dec 13 21:11:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 259 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590660ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:a2e:b70f:: with SMTP id j15mr10660154ljo.60.1607929890911; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=ImSfk31kNrJw/YnniBVORu6sxpRia8np7MG1EbfI8M1E97tvSmFl7hrPxVlsCM8+/5 BmnFJ6h0jASi6Mm4Bhg/tsrRIBrfjHtBmmz7EP621jn+qAJ+MEfoVC+FVLEgz8Fi3Who yvdGCDhBOO1rkM7gRT1/OCKTEtjqr/CiTQGNQVJG4vfA43z90CNccdIBTjRkQurkqb28 ED3H9pquVhiQLlU0z4x5w3E7enptnHY5aTPTTrQ7SGsD4EMzS/7Oljd2iHAUnT6/KTa2 TLvXihJLoOw1Rex66y+MM/aZBjJKuMTFPJUINLQ4AEcizsQyGzJel6+NkKTBofhtbvnE T/MQ== 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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=izXJL7neeEsAvVOvPqGszQwSoPbJpTFwymh27PxQUoyQwPcqTs2cU1aiHnH+caRPyF Z21Ph2NveHCG19d96X0gmNrgkJYpZNastHsnU/CF/QgCLDkrLhN0CO5BXTDm0mFZw1jU 8nIxn7S1PmfZmqkxrroRUa1Pk2KuF6RskvdhuTMjI9IMf+TYjnYmP4tWtePyAPxzWvfP fpzyqA0Ji6XEMeZXJv81juqXqtMBxV3c8yZ1sMpnW9gYEqmL+dh3HeBgvJfk45gt2f71 MRZLfahrW5wPp3vUbUITl7rfGIE/ZvFgFqSJYRdRtqlbuTLmjakjSb4NWEF7nj4H1bYG C1nQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=QWzl3cMW; 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 q6sor6810386ljp.7.2020.12.13.23.11.30 (Google Transport Security); Sun, 13 Dec 2020 23:11:30 -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=QWzl3cMW; 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=1607929890; cv=pass; d=google.com; s=arc-20160816; b=GyHLROYZ/sfj9SCbl7ZLi6jtaboIQaZ+kF+QGM+wDHhXLqAk6/nvBwVSVpxL29Gqzf IjAPssgsjtz7lo3X0amMmcWFmkHlwQTBVhNJlX8zGCAagChVuAlO7msRCnGdmnNtwx+k TtRtReNvDK60msU2lkHoXaV2fwuHIWlwbu35S1wlSZu4ViZAM3uyDGTokcb9kbCJwV5E di8DceosH8MGXGSs5tkvcWJSH1lr+lDGJFFExgibIDddic1kXO/2Fw7824G+5zae64SV U1ldvG0YwZ+j5O9dgCHD31dAHODQdpYRLBArEZe5kzXFl0TQO46OjPNFFXRIoUrjVIwX TiOA== 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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=IOidw1G+VT7hsEFJQBsUnrZvvg8223dC3IVbdCMtvJxjf2TD6mHHFOX8GcDvo4xiFG g720Mo35PNi9pkSQ2t4KjqAUnvLaa10hBHpZjm9peTRo841V3HUmL0tSzyvg9ka64lGG nEMxJxQq2aStdNTCelrBsT/d/0vb14ctyfEMhKUCxdjEVukdYI5MEMeOSh1aUWdGDcKX F6wmDfmyUdf27zjLeq/zaJUvCyeBS1INNwcyQOmqIovvHK22GSQWoFB18A88QkTpG0NH lfyzID9Um9VGaiWDvdgZyzjqGctvAz/03kfmrZ1kbIfoYMUx+2ECZG6XUW64P2AjYXm/ KGYg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=QWzl3cMWmAknKslG6rTjJ2anW6z1SwW2Xk8rw1EpCRCtu/elf3KxiisInFoR7p5w6V CsBU2y0CskVQDGMJ4HqYRgfGSgDT83HEd+Jd2gs7rn7K6tqiarKQBWVsanlYUaE/SHbB rI/Wc2ZbNEM1IJlM9qEKfgs5frxyZeVlSe4QN2UEB7nYX6u4SUsEVxCESWBvE4EmrcH/ XHXy+XQgLLlaSbGyf2ocva+u3pZk1/AmBaFUi2HterscxmA3Xvuyzg7NREjgqyTKKIup l8JnEu6km8LjlIR/OeJU2S4y05QxgUuPa0Nd76YDEpWCwGWnKUY1oALXlzM/abw594bT lhQQ== 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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=iJrzso+NQ9SPEM7AQX/zD+qaQjy+fPXjgST9lCZVqOP+/C6tfLliAp47ypweyWeueU vJ5Wbra4C6WMhfur37DlkqBmooqcmW4Z0HUoKI6JVeJyZfaB+IWcS4+Jf0xthBSiYCIq FudFD/0UG9/8+4DH6hNM7KqwPy9F9s735GKdq4avW57cHUpu2+f17O+5gzFlvBklAs6C Pv6NtmMMdA1bIE5emVBp2+ZwAmArPq9NiXPcZll41q7Ad3m6cY8/piT62yMwQjIg344E +KTYvXabX2K90JFTzh2f2KBddhnWtbR2lK9MpiUVLF6cLGlVnW5YIsC5IoVAv2AiCtC1 +lcA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532qdz0G9ETJkDme0u7lh4xWNnCj7Z5PH39+3bh9Us7ZzHT5wGcg NMicT34HKwpwkVp0lkFZp9I= X-Google-Smtp-Source: ABdhPJy69+4H5ep/0DNX/98OopuhRkOyy/FIu4rdFW4Csv1Yfn6JZKkYEuVzFEkstanDaYHC8Dfmsw== X-Received: by 2002:a2e:8110:: with SMTP id d16mr10423451ljg.280.1607929890585; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c886:: with SMTP id y128ls420283lff.0.gmail; Sun, 13 Dec 2020 23:11:29 -0800 (PST) X-Received: by 2002:a19:8116:: with SMTP id c22mr9341129lfd.211.1607929889500; Sun, 13 Dec 2020 23:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929889; cv=none; d=google.com; s=arc-20160816; b=VN+xUTHY5vxOjXlQSqQs9OQsvwNX9TCIaXhToXe9pskj7sJV+NUV8sNcoyb48Fzc9d ZttAqJQbm0UT2B7XGZSezfQVTTVebv3ixOfRt2q03oSDdN5cunK2dhQxq8PI4jRIh/e5 leTKmLRlwfJREKu5IV9OFxrf/xQcKRhCk+C5yBTUbpvWUM9JCwmwEOgsuUZokAjriXG7 xbqk3BHh9u3j3pDX1Kd2cRTIgHbv2pF0rw5SKXCzLcK3YbxM1HXxpJs02KwhAtzx3og3 WzpeLdjuhgZjEH2+uJxTgQ1UsPgzcREzuFPvOf7YQY7VE+28Cd945YypmVO3Ov7pb/NJ pxxg== 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=FVZZ5sG/D4918jBTmx+FPdHWB/7YRsp8q+8p8t9P5Tk=; b=NcA3qX3FClyZYJh5Lj6GJUNkvXaL7JW9U7Q/2K4/RcNmpohBWfeFZD1rCUSwOQwO6E Ikmzh7qLX0Em/gxzV8NvTNTsTLno3maBkTCF3sBHV7XTFty0Tvo+OAsIKr1f3e6nL91N ug2FtpnbBNPx0AtcPokO8/u1cpa7yxggm19tSLeFh0s6OIQGcnnWf2Vf/kvC3kB66wSy gDk7Dv2vH3xjmyS1NIEOq0yeqcVetlyAjy5SCSzTj7tbJWw5pjLRB5av7pKTpFb05mVI 3/56iaqJKKVAKAD/2bvq3DeeBwh62qMYxI6eOVtUwewP9xDB27/7RcOd5UgLlbAsSS3Y WIAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c15si11283ljn.0.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:29 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BE7BSQx006592 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXb030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 4/6] meta: cache_deb_src: Account for the case that resolv.conf is a non-existent link Date: Mon, 14 Dec 2020 08:11:25 +0100 Message-Id: <4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com> 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 192.35.17.14 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?1686036693346406788?= X-GMAIL-MSGID: =?utf-8?q?1686036693346406788?= From: Jan Kiszka This is true if systemd-resolve is used, like on Ubuntu. Signed-off-by: Jan Kiszka --- meta/classes/rootfs.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index efed0f65..f9151c5b 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -186,7 +186,8 @@ python do_rootfs_install() { addtask rootfs_install before do_rootfs_postprocess after do_unpack cache_deb_src() { - if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar fi rootfs_install_resolvconf @@ -199,7 +200,8 @@ cache_deb_src() { debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf - if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf fi } From patchwork Sun Dec 13 21:11:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 261 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590663ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:a9f:2624:: with SMTP id 33mr21639311uag.106.1607929891081; 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=uAfH1z2QLSXxso6pSxdjt8LsDk9wF5vo39tLjJhgU1kQPRlJBdNn/COpZRvqWRsuBa uIAt/ZLroGsbDBQirNsfg+kvncA3gsEj3oTFudRJMZnP8q+Kj+ge58ixHLI7yXHYBtO3 +kZRjN6GXMVYT6NUvQ/Pd9BDKp+hGZ1Pt9TyDvjXB8F/ROQJXcaxEWNOmshLswS6bEF2 lQ3v/W969NtYIh8ipG7Ub1PAmxX7DeUb05qFafmtkLC8IWc9rivCm7rtuSbRCgz4tHGW ZFc2hBGpU0EJewJoj3YgHT2EseSCkO6AnV17HG30O3ekOyB/ccqL0KfjFY38tusdcWPL /Ffw== 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=UYNANLsAwPqBpqskoalhBBUsLxdUh2tlJaBmbELSFAg=; b=TFrlt6dtQzai6zw1mUaJgtzjlqZ1BsLcfW/uCg2E/bbTA27ttiixyUXivNNHPPHMty 1ZisbsyJpzdYNczsi/IMZJT8DLGibcyf2nlsXXUzZzf55wbaCjHKbds3/uydOp45WId6 OlqQD/lB9CKGctRwS4KBiB4IzVfTLCyU4eppEuO6NwzpQ0BEVaLshEnEBklszRp8H/B8 Y9km5SxbCArmxysvcM8HTUmpn4zlNWWxHI5EQVrLl5f3QIaVAszZwRfYmthJySBzq/yG m5I+jZQ6sxICAo1GXJPKAJS63jHXgtQ9lsyZu/846h3rfxqGxYojflWaFBXVLYfKB4SH MUvQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=WjnUbBAS; 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 68sor10047773uat.62.2020.12.13.23.11.30 (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=WjnUbBAS; 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=1607929890; cv=pass; d=google.com; s=arc-20160816; b=Q58kMJq09ahPF2ipVoky+0rMdnQ6MjS4shTJwrWfBL8KOtgL14d7TMC5ql8W+nuFrO fH6Ns06d2wbouwrDcKE6OCOswk+k7e4PRm+aIJVbPFpNzOkdcGrH+HpvY7iP46AJrECD E4tDjxEOoiqRaxrTbZM8I3M1HadsYh1N8fy/k3fAWgi9Pm81FQ1wok8F0NfTvqmtXc59 PnVrDdqhk4nZznnzLK77W6x4gZ1JDG+L6xN7C19AFKjRNmfY76W+ZgvHyzNDzb574Smj ECZeDnaMkip3nJxlRuU/HQpvMKV13X51MbIXeWdG5c9dEgQcFNLHSTkJ8n22FjPtYaK5 Z83w== 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=UYNANLsAwPqBpqskoalhBBUsLxdUh2tlJaBmbELSFAg=; b=zYM3Yrb/AqhPQcTj/sq17zFDbK/a8FET1q6Pxj77z04zhUDenoSgkC3Zej0VHXgbWY WBlomD6hp6RER5QgXRkqQqy7Jq7ry35582Zc2Rl/ODQCnefMCR/CAMnSHgGHtRQb1e3e M7feiWVY1T2fpI+BI3XerzEVf25EzaBuhUrr2DbJfwBuOcBNtzerZTAbUZAzfTs2Sck7 jxZ2lNBsdoz2D9eAKXjqXwwS/Hpi3gs+gvWwKprX5l682Psepdz+mq1wS6cgvOnsCsCo nmixT5IGQ6AvrQSKNZ5prv3J0OA54qlFBSGgJGXn+yqQX9uBNT8gnfhbOh4LBdvOWZGy UpHw== 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=UYNANLsAwPqBpqskoalhBBUsLxdUh2tlJaBmbELSFAg=; b=WjnUbBASuLzA1FVxN5ApVmoXk/ENINwqRuLCiQ6xxvMBGz3eY+Z2yWHuvsttr57Fhm q/6EE+MZnkm3dkxVm0W/kHijfUPk5aHIkyUus1PPWsOnXU7jJNyBWq3EJ8fajAGMxqVC 75NO3+z2H+6JUvuM3uRdolFVx4NzECiieztUsBl9zWfF24qxEXrllL7cicEhuXk/7sDI B35czbm4wFdNZKkKbxH89lA56F+JKnxmZQ6K2bYXFSvl6vrZReKhjz3vlJs2VxUbdgaY u0Oj1lk1L8450hA2JPGGCEYXIBNdOHNr38/Gco5TtMwvmnffW7z11Q0EB0q14cWumci0 1I/Q== 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=UYNANLsAwPqBpqskoalhBBUsLxdUh2tlJaBmbELSFAg=; b=qvUTKtuSXY1vVDB0ZTTSfu+FmNFnVdeqvoVKb+BxvaW7pTStGdUzrtUdUpF3+kn2pJ r88hziAopn+XIw7s8UkLPlghxaW5JXxpi2V4hjMQhIz3h573gpJwS2YtdOm9sUn8Km71 rvaITuBLd2s1IuYMIrVCxNEzaHD26/UzWSLaJsffQNR9/a/0CFKHw0orQp0hQfWMYacC Tbz9qwBgrzT9jBMjwf+Oh/adWIHm3XpKKesN/UgzyYpU0SzS/yX8C/H+XTW4eTxdFGDn zTNYzSfjrcEy/XkVkCe4pRwdvNHvrUb4HIFh2dJoc0bgIIYjtPjLZ8V1suDGIuYCIh3E cX8g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532RzjfGMxw8i7cqXiJGSnWVh7GLytdJFfInb1vK2HSGR6BkvRWI fxlX536UBZf2VEF+VfGrZiA= X-Google-Smtp-Source: ABdhPJxrPc8VYkglmDnpmMZt8ChHDqjct9S8oRyHyxz9p9MXjbTKPdCf5DNMa/HjPlV/caGC127JFA== X-Received: by 2002:ab0:725:: with SMTP id h34mr21647830uah.91.1607929890783; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:fc4d:: with SMTP id p13ls1842046vsq.7.gmail; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Received: by 2002:a05:6102:3111:: with SMTP id e17mr23030608vsh.3.1607929890341; 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=rPFv0MPd2aRS7wjDVrRIN4G550haH+RRqw5UgVJhTusryjEbnAJuWvAztOiMdkTsaK WDo9ldXOsv5zXGXU7S/KCqzfK1+BSdMsBzUnx9mbkYgbqA7/U8tpX/CaoIO86JJTwrlb Xg+7SD+4MA8z/Pcsj1o8qH+uMRH4Non/y5aScbuBE6ohCaZ2bGjdX70DKgVvW4PSHQrM CuWplJzwYR/tjYr94eAp8hub1oqSpEW3mamE0iZWhTFu/3/6f99pq3QeL1JtwXGqd455 4VfZe9EHAUcc7TVdGOr6sRWPyUTqwEiavssIiJU7p6pa5sXo36eGgRfpBUAMVBDPP8GA KDsA== 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=Bxix/KwOLjD9FN0Lbxq+kzHypCwwH2O9Dxo4R+0AADE=; b=XtVM5S4JER6qXp/cAyKrZaChh2fa5GMHfd9a+0+lPymD4nhnhMiOYw7nHkZSfxmC+Q enN4fcCr+NpFWdeNCt9yP+zGp03NCfmDD3qxa64aXzGE/mtsDLZ+BEnRpm6Lfe1Xx9PX mVNsXyIOkBE3/dkTcCGndiJS7yJvNqmEL//l8AqN8uLrzIDuE3OzYfTffHT573Dez9UP Okuj3le04MHozN2DbvFATFP9tO6BOmO9PwlRr8P5RtHK8GKZGasoBRIMjXlcSKTHuDrA KOUFYRf4YykPbWhH0ikYC2reeeNWEt3Z7yVns61nYfefJSyqpEcAfwMI2WTAeU7rIqBX 6DKw== 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 e2si1385837vkk.0.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 0BE7BS1d003289 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXc030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 5/6] meta-isar: Add new distro ubuntu with suite "focal" Date: Mon, 14 Dec 2020 08:11:26 +0100 Message-Id: <22425854d3904c7b70c8aab541cabd733760bd1d.1607929886.git.jan.kiszka@siemens.com> 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?1686036693620677109?= X-GMAIL-MSGID: =?utf-8?q?1686036693620677109?= From: Henning Schild Show that Isar can even build that popular distribution. Signed-off-by: Henning Schild [Jan: rebased, switched to 20.04/focal] Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/ubuntu-focal-ports.list | 6 +++++ meta-isar/conf/distro/ubuntu-focal.conf | 24 +++++++++++++++++++ meta-isar/conf/distro/ubuntu-focal.list | 6 +++++ meta-isar/conf/local.conf.sample | 2 ++ meta-isar/conf/machine/qemuamd64.conf | 1 + meta-isar/conf/machine/qemuarm64.conf | 1 + .../conf/multiconfig/qemuamd64-focal.conf | 7 ++++++ .../conf/multiconfig/qemuarm64-focal.conf | 7 ++++++ scripts/ci_build.sh | 6 +++-- scripts/start_vm | 6 ++--- scripts/vm_smoke_test | 1 + 11 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-focal-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-focal.conf create mode 100644 meta-isar/conf/distro/ubuntu-focal.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-focal.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-focal.conf diff --git a/meta-isar/conf/distro/ubuntu-focal-ports.list b/meta-isar/conf/distro/ubuntu-focal-ports.list new file mode 100644 index 00000000..7e2d50f0 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal-ports.list @@ -0,0 +1,6 @@ +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf new file mode 100644 index 00000000..0e4557e2 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -0,0 +1,24 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +require conf/distro/debian-common.conf + +DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" +HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" + +BASE_DISTRO_CODENAME = "focal" + +# that is what debootstrap_1.0.118ubuntu1 does anyways +DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" + +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" + +DISTRO_KERNELS ?= " \ + aws azure azure-edge gcp generic gke kvm lowlatency oem virtual \ + snapdragon generic-lpae" + +IMAGE_PREINSTALL += "init" + +WIC_IMAGER_INSTALL += "python3-distutils" diff --git a/meta-isar/conf/distro/ubuntu-focal.list b/meta-isar/conf/distro/ubuntu-focal.list new file mode 100644 index 00000000..52a0b3f7 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal.list @@ -0,0 +1,6 @@ +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 3e435724..107496c1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -63,6 +63,8 @@ BBMULTICONFIG = " \ stm32mp15x-buster \ rpi-stretch \ sifive-fu540-sid-ports \ + qemuarm64-focal \ + qemuamd64-focal \ " # diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 29fc579e..238bc907 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -4,6 +4,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" +KERNEL_NAME_ubuntu-focal ?= "generic" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 246da5a5..e5e762ff 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -4,6 +4,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" +KERNEL_NAME_ubuntu-focal ?= "generic" IMAGE_TYPE ?= "ext4-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-focal.conf b/meta-isar/conf/multiconfig/qemuamd64-focal.conf new file mode 100644 index 00000000..d3566ada --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-focal.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "ubuntu-focal" diff --git a/meta-isar/conf/multiconfig/qemuarm64-focal.conf b/meta-isar/conf/multiconfig/qemuarm64-focal.conf new file mode 100644 index 00000000..1cbc8fb8 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-focal.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "ubuntu-focal" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index f4c33a37..a8d9ad97 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -31,7 +31,8 @@ TARGETS_SET="\ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ - mc:rpi-stretch:isar-image-base" + mc:rpi-stretch:isar-image-base \ + mc:qemuamd64-focal:isar-image-base" # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base # mc:qemuarm64-bullseye:isar-image-base @@ -50,7 +51,8 @@ CROSS_TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:de0-nano-soc-buster:isar-image-base \ mc:stm32mp15x-buster:isar-image-base \ - mc:rpi-stretch:isar-image-base" + mc:rpi-stretch:isar-image-base \ + mc:qemuarm64-focal:isar-image-base" CROSS_TARGETS_SET_BULLSEYE="\ mc:qemuarm-bullseye:isar-image-base \ diff --git a/scripts/start_vm b/scripts/start_vm index eda49462..dfa14c95 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -109,10 +109,10 @@ readonly ISARROOT="$(dirname "$0")"/.. readonly MACHINE_CONF=$ISARROOT/meta-isar/conf/machine/qemu$ARCH.conf eval "$(egrep 'MACHINE_SERIAL|QEMU_' $MACHINE_CONF |bb2sh)" -eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=") +eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_TYPE=\|^IMAGE_FULLNAME=\)") case "$IMAGE_TYPE" in ext4-img) - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") @@ -129,7 +129,7 @@ case "$IMAGE_TYPE" in KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" ;; wic-img) - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index 237205e2..ce082137 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -152,6 +152,7 @@ run_test arm buster # AMD64 machine if [ -z "$FAST_BUILD" ]; then run_test amd64 buster + run_test amd64 focal fi run_test amd64 stretch From patchwork Sun Dec 13 21:11:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 258 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590659ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:aed:2cc5:: with SMTP id g63mr25684003qtd.327.1607929890993; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=CxMlinSJoXZx2SQOdf6M8tPn0w3Z8WbdpwWPnO4WBJT1tNRpdPEQDbnKc9ZZQUp9+j cM6NLsJOjDX8zMcJ+uU2LoMzlUMWN6B8FlGhYv6IFG7phFHlUT6ymlbMVXIRnjGmGVX/ Rip3FAxe057IFhkHFMSymfVohdLLMR90ohn0B4sCPgCBSo1u5Bt7cGx8O8Gx93uuW2KD hzaNMwbSgJDBMtA8Swi/M+6q33WfRjLWS+8HL9TMftKONsVc4fiJsNUavFWuMKz37gi9 pkhfJhTay7j1fhEsMCD28KtgWSeRrtsuNMRRLvs/BHi1WOWutBDcxYq3Umdo+52e/xbC JcdQ== 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=m/qLf4eUV1wdjWwMv+w+UHHjsIKEwBrsZOehaCyevAc=; b=zKisfyS7gTHWcY0cqr8KPL+TVtkxTR4gLN6jYdutqlVq66AaMle7skDoOrTab3F9jo SuceAGUm5sMpNcThQJlO18Fwb7DrTwsvqmrPOslQSV2vNbjuLHj8FQtCu6kZkYpsRfD3 DJvWRzY8CPmKPvkIcx9T0x/07SQF+wqLnfjuovMmhLAcSyOJt/9pWVE2t55NEKLS3cjX mp6Kv180vxAminKZsPWXAH2g3i1GkxRvzy9ecmSKoRhL+zVhgV6l1MOgvyIS+ke2CA9G bdX5CGesc0vq1MTTHymze1nmVahtx2piyw3PD+j+/k1ifVxYiXp7k26NSv5Qr1KHiYiF 09IQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=euZMfPZz; 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 t124sor15590161qkb.50.2020.12.13.23.11.30 (Google Transport Security); Sun, 13 Dec 2020 23:11:30 -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=euZMfPZz; 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=1607929890; cv=pass; d=google.com; s=arc-20160816; b=XgCdb5MnoBqMteOjJGkZ5Jc61MD+nZ4ayFvipb82BTXCUkQDTOwuIq35rkEAg3R65G qZRyKNdj7YyfewaN3GsC1QidcdNU/xY09yV5M8G17bgTtgIfhweafrKmGLamKvNxQM9h qTDkWiEhCPD2qddEtA6bxCePwKS/59vrFPsI2t6L+Qbz0ReYzmhrkM/wWwP87iz6gZm3 UbnmGc4WU1Gv+oMEQMeF5nqAkt8rC0tkeDdf7s23eid4qMQbbeYwpFkodBPHMboaP0OX hhEeZNZEC/WDebckz7JatiOywYl1DyuIzlzSaNdOdgxu2OWKNvK+NhCz3D+9jMNbXy2s qRNw== 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=m/qLf4eUV1wdjWwMv+w+UHHjsIKEwBrsZOehaCyevAc=; b=HPIpUlYic5T3cu2Qigd+6miitAYFTr/anbiGCXYQe1xoQEdCY/iwVy5NjNibFPub5u cEeDf3Zu913pyU7/eHRkdQWX3vEOt2KSlwOcUFUKzYTZey9ZXigl7ZmCkDSu0EsD6Eie LpIpCjJDzaZUbXgbNowmytXRTx4JfaYxqcVNmylNLHL/mBnqaXJqRERsUbKqZHa6Z/0c 3QebiZmnDfgucJgqCs72xuTVAizMKhUUJW3kqQY5d0ELgduZlN/AoLpEhrGTmTZUiZ3x kkoWeoI5tNl/pD+mPre9tK1BtVUvQYSOoEKiEhGKdCBvbz5FciLXpcvouhWPD9zIOVV8 Kr1A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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=m/qLf4eUV1wdjWwMv+w+UHHjsIKEwBrsZOehaCyevAc=; b=euZMfPZz7ToZTFlzp48YRLf3K/nZTkbC6VdmHpKON9gRLHnhhjAGGeC6acutJ45a5p dPryye0JabmJcys0XXbWeJy6Bo3evloHY5DGrcqCVTFnEoO4uloBWOCetrCZFcCijo72 f4CV+kqXCmhlO9NcIPRT0CDFdxKdG0a+FcPgUWCao8MkOSrzjD/Etiz1kZxfbTdLCNDw uMOIfzh+yJbS3qdJKRBGJQUMs8W7oq7QbTR1wZSLOJxGA2jNA9yFxuGKsYRmMUR2ldly vHNb8xcsWKBv1g8b6sEBi9/qcaGZ1cvEkTtMYU6XNyggB04sVDsep93PXrIaabBBR9nM SLxQ== 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=m/qLf4eUV1wdjWwMv+w+UHHjsIKEwBrsZOehaCyevAc=; b=WPJszKOx1K2Ug9eoB3UfdsIIk+49/l9Val7SbN/5rBTXjwmadUgGzqk6JCZ95jFg2u 6J58leWyf6dmHkasxxyHII6UKfwOEnT5z72VLuD4UU5NZxFKbZ2ez+UGSn/Fgxm3Y648 4UKMJX83zXhtronWuzflQkUpwIBg4mnghDl91IXYhJwEG7kthP6uh+z5LtqFzz0nB0aN UmzC5jGo+HgaGHYJ7e5V6B8eOWuDEljqmobxBTkuhz0l0z+o97Wo+bJSji8HZY3azqCE DlmobL1o3yewltRCdr8qLuUzZgbqWTBfGmmjdWYu4WlGLlF4Y3gkzm6yGg8cn5jSZoDp +c8A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532MeJXnuwVOeF2AlW6wQESQgkHZOD/HIJwwU4M2QmCdNHzrT1Cr rblkmr/v181FVrC0LMhikOg= X-Google-Smtp-Source: ABdhPJyms2Qa7IFuPJjZLZeobMiWEgg8jEPgjlOT+k4gxpamzdFQ3U6FTH6AruGohrirAbW3JHzjyw== X-Received: by 2002:a37:a80a:: with SMTP id r10mr29931890qke.467.1607929890606; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:346:: with SMTP id r6ls4525009qtw.8.gmail; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Received: by 2002:ac8:5893:: with SMTP id t19mr30095505qta.3.1607929890231; 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=d9TFQkThfQJRbxg7BXSXviqI4R75+Uk+oJ7gtFzYnK2DK+M8Z9Bm5BFFNwvmR8aIso vR1X6ROcw7SpHQtK6CFL773oWBKh6DrfSyfSdMOl+cvMPPxngnhz/YqHD4Pt4DjC6oYC koMJvPfevS213GrVFt/Fu2GNhzQ5NPFggl2Ry0q6P/nJCZNrC7L6JKnQeM4asYPblWuo RTCn5n7y6jLVUUnzqPNC3bNDIqcl9ZI+vuimtQa9GwgYtQbH1/FYzjl2hpdWlAi7rCHh 9GZ50Vh7YNOwocKKM/7o3z9JXK5BJjHgmixbD5JPSyJrE+CNyvidehZdb7V3M9rk9vkV /rUQ== 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=gS7KfUpQj8JF3QFHkNvtyoh0yrCtFYLJsPFERVnLp1M=; b=xBoO8DIQrBlznLlTRiN5dP9rDY0yxZbn1PnzgdErG2VOK3ToibGpKowaIVsEZiQv62 TXwfwFUXUabRFt8mGQH2rMgIgMZMKxc21LV2K1RXNhgCka4EOU14mCjvTIn9LBjPOF+H H9Jm2lNAsQFtXz1NlZl0gy3L8dybqLgbwzuIy4L/S37EzLgSREg52uZKLVm2BGbcFlnR YQYK0vBxrcV1Xoq/MxmJcG5OpElavirEpx/0eHpvlXet6ceNrPYgo5nlZNruDyu0UhA1 3ROgFwM7yaM3XRCDFUxX1NeAU5voogW7Hejqrf7FP6JNvbVPcsI72g/jf7j28RjkCQoe QPSQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id z94si1072823qtc.0.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.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 0BE7BSkg015941 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:29 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXd030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 6/6] meta-isar: linux-mainline: Adjust cfg fragment test to arm64 defconfig Date: Mon, 14 Dec 2020 08:11:27 +0100 Message-Id: <525f21944446f36dc1b3934faf2c90f4271d1f14.1607929886.git.jan.kiszka@siemens.com> 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.39 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?1686036693247474715?= X-GMAIL-MSGID: =?utf-8?q?1686036693247474715?= From: Jan Kiszka On arm64, CONFIG_MTD is enabled but CONFIG_MTD_UBI is not. This leads to a false negative in of the test that tries to disable CONFIG_UBIFS_FS. Signed-off-by: Jan Kiszka --- meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb index 209ad9c0..980e137b 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb @@ -25,7 +25,8 @@ LINUX_VERSION_EXTENSION = "-isar" # For testing purposes only dpkg_configure_kernel_append() { - if ! grep "# CONFIG_MTD is not set" ${S}/${KERNEL_BUILD_DIR}/.config; then + if ! grep "# CONFIG_MTD is not set" ${S}/${KERNEL_BUILD_DIR}/.config && \ + ! grep "# CONFIG_MTD_UBI is not set" ${S}/${KERNEL_BUILD_DIR}/.config; then grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \ bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled" fi