From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155069296107847680 X-Received: by 2002:a05:6870:f112:b0:131:f181:2c60 with SMTP id k18-20020a056870f11200b00131f1812c60mr4756952oac.164.1665993531307; Mon, 17 Oct 2022 00:58:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:741:0:b0:345:9a88:c799 with SMTP id 62-20020aca0741000000b003459a88c799ls2998193oih.5.-pod-prod-gmail; Mon, 17 Oct 2022 00:58:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4iAV1xPz4UfnUoIBGTMowQ6mGs8zNwfoQGZKv5ygnJtZiDaZ/kaG+4NkUyx8izEUNPLtlW X-Received: by 2002:a05:6808:181e:b0:350:e92a:9ab1 with SMTP id bh30-20020a056808181e00b00350e92a9ab1mr4141049oib.209.1665993530734; Mon, 17 Oct 2022 00:58:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1665993530; cv=pass; d=google.com; s=arc-20160816; b=ETipKD3vqqjXeoi0lq/ytPrcb3k+SBpcrnaiHozhn/FIHdIY1uXF7pQ7x19dxoJihW UuMgTnKuqrZKYzner4t6dy/G/NUEf8PBKFHoFEFKZqLR7xLAzDmxB1+YB4C7i/uRBXP/ jdd8bCnxXt4eR1/FrTzrCYrjwTIOGfewYjE/pHYgp9zeKkdqeM+FC39QF25iexNllpB4 FegbtSEC8z6MMOQZJHnilDrZb0eIoaeQQjvTQO4U90nPe+mFcrfrIcaProlwBvpoFTmu SJ17jzmo3Ogf1LkwtrMWDW957PKaq6xtLxj5Vv7wHax7WFPNYpDEaU9kbxEgtrem0Zv5 1Pwg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=JoOOkKau0KXiSCH6meLwiAfk9l1BtopSC/g+pLFfAlA=; b=Fad+9teVuiHTUKcyjTk6yglzhGlaPMdx/QcW51vqa7/aJxtJLg3SqlOgIQQQNvwzXK 2aTfT1L/DChBdMv86BXGJdV9O2otI8xmqJOkgnHcjjntZAY5teAcG2HI614f83IaQZD2 I7gtqphPcVKOjIrK9jPp4qTkoU4W0LRQXig5cZ8Ublk54snYuMumx2IhLQJoXadm+57r nvv6zQs5QVC68DSgOhU46yaNe2v6sx+mOh0A7bZiV3RK4mgfUvYforZnSUp6hQwrWSrK 7ryhgfidx389BlPWPxNCQJhigfWFkfZFn6Gcv0UXjDRIk5F4VOZwQpkTDUu3go0R9QEH kRfg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iG4wVpMa; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.105.77 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2077.outbound.protection.outlook.com. [40.107.105.77]) by gmr-mx.google.com with ESMTPS id j75-20020acaeb4e000000b00353e4e7f335si472314oih.4.2022.10.17.00.58.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2022 00:58:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.105.77 as permitted sender) client-ip=40.107.105.77; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iG4wVpMa; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.105.77 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PYs8KIsbgvIIo6F9/FfE/KK80VUhvCrn2ZHihlNPcOitO/Znq0x33lQ1nxsMCv+AvBNEunzjgMyA28HbNnwLHEqu2GBXMwM+m3CNTNyR/rv19HqN+gdEI9A2cekgGku4H6onuAxvHZXMJDeelUUv1Y38eZyRFMsxdbrI/D71n2ltUUtf6axcCwUeFIu7laf4/jVTphdJGg59uhngO4vC5VnxldMHhqr9u8dI9Jhcf5cvh/vYQRrruIf3XtvxInYTsxVmugs7XWHZ8oZurn3YWzqXkwS15YvLJjWksLQOOnQqxdksqe7wPi3jeREL5UqoYiLNWPZDpytksOJmr+tmnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JoOOkKau0KXiSCH6meLwiAfk9l1BtopSC/g+pLFfAlA=; b=lbiPPn66XOVYOc9mvWPyhEZEQOxcSOJ8f2cNHaWMWNg6uV+F7ODgFVfKuduI9p1+ZtCG3o66ctpAxAjuF+1v76ZAW0rRlRbK4nwbSuEHZAobMf3kim7sQK1YTl4RuDnulsGd0BpJ03CID6v/mox3jGCuWDG3nBj0fqIazg9JhFFjP8Voh95/OwT1fekhPdjqLtCce5l3gyFGQiUHjvoFV/ddl9eQ430Ke5LcLQvX38pTFN/2WfBWglNOwr5YQiaCU54qvkdlKscRq0slOeQQSDx9DBcwxj9D2+INAizwrPL9c93S9gdMUYaSP/BgaTwjxOeFARY8Xo9xWPVhaSNn2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JoOOkKau0KXiSCH6meLwiAfk9l1BtopSC/g+pLFfAlA=; b=iG4wVpMaBWxZk2v9sFvQKLk/yYoBrGDpuGw+0g2MycygMZTYxE5YmSmG+rJvZwXJTBi6wnVVzIBT5TlB46/JFqPBSDYe3xnVOWFLlvh4kAQDM0y7lSSjxlWQeKBW1O3ZlC3TTC+sr4wawVs+Hi9P8Kh+/vI2phsXZOz9XpTngjhQkYISaPCVN6O645xPyM/Z6OshgY5GSlp0GlpR5EL19JimcUmU8b0Ou6ZTigMlGWk/BsdZV6C8EQosKzcryss7fu0ZEB8695JkaOmX3t24sE0+fFumVTpSIIqJna5nTXN0T58/VUpEhEajSKDyCkz2sGfRfowtHpirVtuL3VM+0g== Received: from OS6P279CA0013.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:30::15) by AS1PR10MB5554.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:475::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Mon, 17 Oct 2022 07:58:48 +0000 Received: from HE1EUR01FT037.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:30:cafe::2f) by OS6P279CA0013.outlook.office365.com (2603:10a6:e10:30::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31 via Frontend Transport; Mon, 17 Oct 2022 07:58:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by HE1EUR01FT037.mail.protection.outlook.com (10.152.1.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20 via Frontend Transport; Mon, 17 Oct 2022 07:58:48 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.12; Mon, 17 Oct 2022 09:58:47 +0200 Received: from [139.22.133.53] (139.22.133.53) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.12; Mon, 17 Oct 2022 09:58:47 +0200 Message-ID: <129fc928-92a3-b8e0-f7ef-8e71e16ea553@siemens.com> Date: Mon, 17 Oct 2022 09:58:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH] wic: Fix non-existing initrd case Content-Language: en-US From: Jan Kiszka To: Henning Schild CC: isar-users References: <20221017094944.1eb72c20@md1za8fc.ad001.siemens.net> <9bbc8c30-7ca7-25cb-0f5a-786028fa939f@siemens.com> In-Reply-To: <9bbc8c30-7ca7-25cb-0f5a-786028fa939f@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.22.133.53] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--13.221300-8.000000 X-TMASE-MatchedRID: vIFHZ/uiyj85QaOxwNGfvo9bHfxDWoibW6eKzKKCgnNweJDozYf4K215 iJF8eE6rvLL0od1HqmDJ/xZIRP3JckqQBTXuA1Ce0I0xE7y3y0XEQS2ecfkpF2vOwg12ikVSP6T ki+9nU3+2ZO4LLn5VSmSSWxIg3If8vTFNo8PUukg25ztIijgyPgnbQnr9fWNSec1y1wrvN8UEa8 g1x8eqFyleBpqCo+tIByyVimjmJJMr59u/gzv5MLUzq8RBkJuGcNYIRle9ggeeAiCmPx4NwLTrd aH1ZWqC1B0Hk1Q1KyLUZxEAlFPo846HM5rqDwqtvZyI4c1RRe08PTsaW3C8A0nhM3jwPkbiyTAn fyStBe5XnqZMDiySOA== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.221300-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 382D7DA9F95324984557AF02243839AF061B02942D9BBCAB48DC550C0D60B3F42000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT037:EE_|AS1PR10MB5554:EE_ X-MS-Office365-Filtering-Correlation-Id: b1763680-b36d-4c1f-fcba-08dab0156c46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sYx2dgBYR37tYIHpEDg+9zid5Gs9dR6rxcZMugnq8BPaVXtJU7PI5BeTUR6815br5r2gAJ+dBSF4vdjS2Xp4IejrpmxTDuY4DmkafLtRhJX8fPvf7nk+b/AXiIx9SLbOcjZ9v7TojhjnJzQFALvCi30frOyhoO1arH2Pr/3F7fmaeO5OUaGurdEK6uorEkk+1kWhiPVoB1mOEftO7OuG4C4vgboq2hYTvglvIW9LN++KGh1OdNzymo/sajBDoqfgWBQRSio5vaZO3htEYHLOnrzp7RBsfj3YITpHFBVx53BJjY5z7qK/8oo/sIhzTXHaPoye9CsttWXtL3p41+TpjjctSoUfxbm1g9/VyS4bDLUVsyvvEaiCgbbMsSJcxXpKIs89qBUzf2HhFDzMFpx13PPDuCTfytRoimCSK65jmaikGcVzlXbPkTdEo2vzv+xNM3sH2A29KyKriDq7NkhaTZqTW07Fb3WEdYJsZ9OlskcJEIyKE5pIz+tbPAzst/B2VT1vFIu5fEpqCTeVTbP4zU6exZsKABrysgpg47B73QNv5iM0cDlS2nf8GgNx+iHQ0syIk5VPPLePiVBrAjI4g4AxrKZmuIAtuEvRlGpDlr/ozreWa2mswkGDTMF8mFxFWHdk+3sE5Di0Vje/Ci0fKPUNVZcK3PfYXzKoTJ7EjbKWSSK7X390Nzbl1O1YEVhrm70LdiUSKhKDqG+FVvrlSf+pHgaa7GS9PwG/afcuGTIrF67YrpJ3SwVrxHQpZ6RSFtAXNlQuP/QdcYO5CKOYe95q2DFTfJWpDZdmu64veVsewzJvilkdVhaL7ewF97AF+toX7k5CeovkqLwKRM+fG9rceAYoW4awZ4fTUDVuMiAoOuh/NKlamWncshTp9SQM3ttNzgMxodu7ffgi5zNr3A== X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(376002)(136003)(346002)(39860400002)(396003)(451199015)(40470700004)(36840700001)(46966006)(37006003)(70206006)(70586007)(53546011)(6706004)(83380400001)(6666004)(8676002)(31696002)(6636002)(316002)(41300700001)(36756003)(5660300002)(36860700001)(16576012)(34020700004)(26005)(47076005)(86362001)(8936002)(6862004)(40480700001)(356005)(40460700003)(81166007)(31686004)(2906002)(82960400001)(82740400003)(2616005)(4326008)(186003)(16526019)(956004)(478600001)(82310400005)(336012)(44832011)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 07:58:48.2802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1763680-b36d-4c1f-fcba-08dab0156c46 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT037.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB5554 X-TUID: cYdBU/ew9fbr On 17.10.22 09:55, Jan Kiszka wrote: > On 17.10.22 09:49, Henning Schild wrote: >> Am Sun, 16 Oct 2022 13:22:52 +0200 >> schrieb Jan Kiszka : >> >>> From: Jan Kiszka >>> >>> An initrd is optional, and most callers of isar_get_filenames are >>> taking this into acount already. Adjust the last one and stop bailing >>> out from the helper if there is no initrd file. >>> >>> Signed-off-by: Jan Kiszka >>> --- >>> meta/scripts/lib/wic/plugins/isarpluginbase.py | 2 +- >>> .../scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 8 >>> +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) >>> >>> diff --git a/meta/scripts/lib/wic/plugins/isarpluginbase.py >>> b/meta/scripts/lib/wic/plugins/isarpluginbase.py index >>> 68af2208..99e552e0 100644 --- >>> a/meta/scripts/lib/wic/plugins/isarpluginbase.py +++ >>> b/meta/scripts/lib/wic/plugins/isarpluginbase.py @@ -36,6 +36,6 @@ >>> def isar_get_filenames(rootfs_dir): if not >>> os.path.isfile(os.path.join(rootfs_dir, "boot", kernel)): raise >>> WicError("kernel %s not found" % (os.path.join(rootfs_dir, "boot", >>> kernel))) if not os.path.isfile(os.path.join(rootfs_dir, "boot", >>> initrd)): >>> - raise WicError("initrd %s not found" % >>> (os.path.join(rootfs_dir, "boot", initrd))) >>> + initrd = None >>> >>> return kernel, initrd >>> diff --git >>> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py >>> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index >>> 7fb0f2a8..43f4bec4 100644 --- >>> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ >>> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ >>> -141,9 +141,11 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): >>> syslinux_conf += "APPEND label=boot root=%s %s\n" % \ >>> (creator.rootdev, bootloader.append) >>> - # we are using an initrd, smuggle it in >>> - syslinux_conf = syslinux_conf.replace(" root=%s " % >>> (creator.rootdev), >>> - " root=%s >>> initrd=%s " % (creator.rootdev, initrd)) >>> + # if we are using an initrd, smuggle it in >>> + if initrd: >>> + syslinux_conf = syslinux_conf.replace( >>> + " root=%s " % (creator.rootdev), >>> + " root=%s initrd=%s " % (creator.rootdev, >>> initrd)) >> >> I did not check but am pretty sure this is forking patch we should >> rather get applied in OE first. >> > > Forking -isar in OE core??? Hard to believe ;) > And if your concern was oe-core/scripts/lib/wic/plugins/source/bootimg-pcbios.py: It does not have initrd support at all. Jan -- Siemens AG, Technology Competence Center Embedded Linux