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",