From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155069296107847680 X-Received: by 2002:a05:651c:1612:b0:26f:a378:3dfd with SMTP id f18-20020a05651c161200b0026fa3783dfdmr3372368ljq.469.1665992993680; Mon, 17 Oct 2022 00:49:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:94c5:0:b0:26f:b018:381 with SMTP id r5-20020a2e94c5000000b0026fb0180381ls1937158ljh.10.-pod-prod-gmail; Mon, 17 Oct 2022 00:49:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OPDszrlmvg+ADn16TOMtoo7db7LdasHLpZAUyn9j2GPBoWKxkonOUQ8InR2jX93laoC/s X-Received: by 2002:a2e:a1c8:0:b0:261:e4e5:1cc3 with SMTP id c8-20020a2ea1c8000000b00261e4e51cc3mr3828915ljm.248.1665992992474; Mon, 17 Oct 2022 00:49:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1665992992; cv=pass; d=google.com; s=arc-20160816; b=Tabqe3Z4c5guo6LO7+27oSLFarGlW8yvO5unc834/+rgg6Yxjado8OwxjzIhCP7VRq Qd9JRbzVhOfg08Q7xv9++17or5eL7MDyo6RH83MiuSeYeyl2xhPu31ZUb7uLF1tNE8M2 5Jg9Slvh25LjSRtpu/3JlXS9GVOp1IuyOj9Mw2xT5Br9WiWLe5dyGp8ju3C/KW2e6mN4 lSh0NZInJcBiW/H7foA92PPNnf6hTMatF1BElKZdGCx06hB1YnWiVDjDkbXqj67UAcsi hLRNz3ZKMbS/iKZvy7au1fXbqDcFUQpR5A7CzVoZRGuUQU//s8ywVO6xjGNUkpq+SUl/ eFww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=0OAwoGSzVCAzVQmYNjZ8vGSy6a43w+qUGXoT2s33EZc=; b=tRCqOoLvCTEhMmNWWugEANeTRctT9ar1nLLQSWURI3xC/nm4njGTl8voAjuQjGcwNy 9iCKSUnVE4Mw8tjwiAXRxcNGBv4ox872My6tfnfP8DwBrFQQtOjx8RGQBbK++ta71IWq 32B9cd/phAmhTg7xP3l86ijSFuEvA53q7UA16PpB7mgrACHI98sKPF2r5H+N3nRkl5GP iH00NRjQutOW1PQaUvcN98R2AO1zs729uz7rWs8zjPKr3BR7fkHMFUZ4IYLrRpbYdXvA dmYedAidWNUpv0ruuwxjiF7GvC6Ymc/0lb6hS8ffzUebKd7vTg/LVavZsDsSoS3z3y4P /6kg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CqbgJ0qt; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.75 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2075.outbound.protection.outlook.com. [40.107.22.75]) by gmr-mx.google.com with ESMTPS id o17-20020ac24e91000000b0048b38f379d7si342878lfr.0.2022.10.17.00.49.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2022 00:49:52 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.75 as permitted sender) client-ip=40.107.22.75; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CqbgJ0qt; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.75 as permitted sender) smtp.mailfrom=henning.schild@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=DaWx/1nm68vBZT6JGGLXpVjsCRBv6MY4U4iv6CgAtt4CrwFymVfeBHtjEgaYk1T9sNTp/5m2MaYO3k8zLO5jMIK5pbNaoyJQoEuIJ/K3pxyAyY6UNRCCpy199B4FtE6H6zzpYB8ZjXgmKT70JbpuOWOFwUym/aPCfrSGfMcC1noHAtcFqMt+5FhlSz1+flndXHv9pLRfz2jUeQfFYGOpxs7N/HHenXVh4xGqVuSeZXybliPC3o/do5eVXcZybtCZekclRHDqBjbbTHrQvWnJSA0pZ63rBb01QaQ3EnJmEN3bmO1hRQJ0wTa9hetR7VIi6181hL47IU0IClDKziZ+xQ== 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=0OAwoGSzVCAzVQmYNjZ8vGSy6a43w+qUGXoT2s33EZc=; b=Nld0i7HfAbvefVpbBG9kN/vtPSB3Kcvqd/p9o2/ii3BnFdRHA4BLLexPSassmsNUMB0WQFfFGXzqD+SNDQCLRuS59zggfv9y/ELQ0+QbtAYvdaBFZoiDR4sV9OEkyIxACbslQ8kqnHptjEw0p9ni43TcnsBD0Rxj0iddKaMZqHQjlxhXi0zyVE1RDlU/clArVvZGN138d13iSElgpf50YAq2Nlq0Le6fkLKHpOgEwU/M/c8f7exrN5Enm2PCzkP61MgmaClIOr4REHGSi0VsPBsfdbzsW8jKzw80WOWeBZQp6lRujJ57jkR9iTC3zP+P/1hoYeDjZ6ffLFxpdkL6ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=0OAwoGSzVCAzVQmYNjZ8vGSy6a43w+qUGXoT2s33EZc=; b=CqbgJ0qtIcgP0gYT+NwsZcfeGsVaeKj8/qDKiyYj4Gxq7ZGMWg2x6QmHIj+Jk3oWR7A/oc9iPI4SQ886PN3KvptXHrpfjakfnuME46kB75x87g/Il3IacBIAfI4xhgZLAriBiQ/N22ge/A5U4IQpuWNootAHOl19yuprNUDT96J1itFaFgxFPFhr3v3qFvwNsQue2zvFE9JzJRbOWxdQKTJrqkLaozfI0g3AbpoS/C9IEY2wkoqez0mJ6y15Z/XdY1PXDYgZwVwDd4CJsd6UpQciiyVe2Kpqne++4IIDKO0KhymVMg1ehWn8ooB55tHb26BPDp7i/FqNo4rOJ/rKzg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by DB8PR10MB3578.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:131::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 07:49:51 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2%9]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 07:49:51 +0000 Date: Mon, 17 Oct 2022 09:49:44 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] wic: Fix non-existing initrd case Message-ID: <20221017094944.1eb72c20@md1za8fc.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0142.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::15) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|DB8PR10MB3578:EE_ X-MS-Office365-Filtering-Correlation-Id: d0de3d05-ca35-41f5-ad3d-08dab0142c1c X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bdHovW0pThsm77EFwMm4B8zqYs5vDW6adJGED4bzpKDe32CMUA4m7QLd+TJYwFF4loUlvWx5h7xVbTNyBU+WzR1JHA22ZdrF4NFhXOSSSJW4j7Olk6SjAvZlYGFGPkAy0u5FIuv5B7XMnZG2VAInv8mpI7TvuRm0wPKE1TYgT+8gxb/jOO18Qqaq7H+9t5JMRe/JxSiTfyxxQBmJViu20YZDtkXU0LFjAZjwpdpM+5C2UVqIIs86u/NpqS1unZl+xVSTbR2elv0EN0iMeOsbJVyMhBcmhig7SO2NJPortutuZ3CvDEDWixhGEYJQCZOcxaOAmU/qFaVO+PyXZ1vvKbO2Akb3tWTf5AxVNfePxpoyIfnkowYOYyfKFuM5bKINlCRDCsLmxvxb8STWJkDoa0hVWfymrpqQonJXFVIE5HSNuY9fNv3AeLouwc5D0M26g9hlKuF8uYzU4vf7xIrbxgCQ0f3GasjYt9xXiH2ftqsTeCe9JQYza8Wf/0YeoqzZHsV1i/DVBHsri7BUbMSoDPjhCxLoBKG48vMXkjicIG4xd6dBxjQzuKLPJRaXT9+TbT2bJkb8iV2ROS2PiztZSie7+wLf40UioWcG5NYOs5AxzZvWvep/NbHmwoh0kVAcS/Ltg9BwrN3fJShU7isfTxEJMIfKGUOa3u0i5qZueaIQmKYECyOT3ZAMUgO93sCLhYjoiFlvkMIJ/ZQ2dMNt3w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(39860400002)(396003)(136003)(366004)(346002)(451199015)(6486002)(186003)(1076003)(83380400001)(86362001)(82960400001)(38100700002)(5660300002)(2906002)(44832011)(41300700001)(4326008)(6666004)(6862004)(8676002)(478600001)(6512007)(9686003)(6506007)(316002)(66476007)(66556008)(66946007)(6636002)(26005)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UJ18oYTzIR84LtF12SmstnO0U5KUHEH/qAmEAWwBRu35BhDmtrKhnCgtavZ2?= =?us-ascii?Q?nMZTAy68rLpvDxgEzqU0XgRFuJlmpfI4BM4kioEYC5Deo9v/FDcBHDjtX1g/?= =?us-ascii?Q?cihsYWEjVVz+ZN/MxPDU0wWVB/3UyuJmgweTJstVCPwBgiWkhw/1GtrcJAjE?= =?us-ascii?Q?XuiVK8sp+PGuKjK+jsKs66ggbZvV+nXRW7bPWZk8JhgLjsdtTrcQHH4lPZ7V?= =?us-ascii?Q?TTLZIUnYRMRltuxOTDSrkHVnQ5eyFwyXNs5vx4lyZD62wOQf97Kgga0a/biZ?= =?us-ascii?Q?FH7lY//IXOWN7cYAULK9nAoX0cM2UK6bo4jmPqL3BmU2hbYR1TO9fuMSbdzK?= =?us-ascii?Q?sZhe+sGK9p7SHZ3Nk9dePSUxdNLoTPRhSXp5Km/yXnhVmU4rv0pfdPdb/zY2?= =?us-ascii?Q?Yv6SdZWtOpVT0jnHJKkj0l90JLJuOgBp1kzIK+lvHqv7QwjSGDLcqglGdK5/?= =?us-ascii?Q?31C+2yB11gej3/8rjQwoj7a/eD3uh0jsJEdbnhJXxsRBrZxCyV6uC1ASCrrl?= =?us-ascii?Q?uZttxwPMHyCK1DPu/28r56/JZ4k9Lb2tOyhV6t6mFGViUjmz686EbMgrMTt7?= =?us-ascii?Q?w08MQTjo3Xx1ePGyC5X2/Nub7OIIDna4VoEJdpkcLCwTlUc+3hlfkwhulFQy?= =?us-ascii?Q?G3rF9mkxowIu+Jw/W4Yc5mAMnyUc1vrwE/vrtrDTmXEl7E7Ke02f8mPn08ik?= =?us-ascii?Q?Zz94PABmdUTTAUq8HGFHSyK/H5/JrHYvi/Jf9upgPUaOVer0w2mRhny/Id32?= =?us-ascii?Q?sPcCSmafwUGp7IwiucJj+8Dli9g4+pRwJKuo0oidrqSnsZh83LISigAUvQMa?= =?us-ascii?Q?2vuWUaeSchbKoxdNdJlp5mAXTmLYD1h5MhLaRd5adSSHzTyW7FAekLFoGg4g?= =?us-ascii?Q?NWU527YOFvA87YoVWUK8bMcy/P/n3ZI5lzGUb+fMnVpCIsgjdw4lKACmOBr1?= =?us-ascii?Q?dH+mMA27heclRTHsMOXrWfOr9dd7B95GQSpQ4rEsWS/6EdfOFji5fet7xyYD?= =?us-ascii?Q?lnEPhbbBYMe461KO13q3qt1XRe4Q10/3AGjBMgya1v4/AJ+HE4SamNye2i3X?= =?us-ascii?Q?GSiypQ54W2gdBrc80SWMggtwLKmIKrfyTiwfeyGfDI4IsRNxKny2gXGe5RsB?= =?us-ascii?Q?0FLl3OwpVMK0ZSx776D2HkF6JXW3aujk4r9GmnUSX4o/c37JU6FKBa9tt4xi?= =?us-ascii?Q?sy3XVGLB2/J/vhbrlnNtNMTUAMQOyETXOgrBPybX4Vbeb3psSpw2X539v6iP?= =?us-ascii?Q?Z3OUotDdQo296mZ7c4GsApkWIj4SB16xmhdL0N78ZtEzGlLYnogcvMSdrsMV?= =?us-ascii?Q?Mj7MocmTJ1F4it3B52Y853xhZ+Z9QGeMJNMSQpQ9vYgFiF0//Q5agY/mSMSx?= =?us-ascii?Q?FXqyuhYqWdUlySJsAQtFx31iP9urXCvOHc1qaKebQv6o9xCkRiLrasuBGk6t?= =?us-ascii?Q?BC0fV7EnPfci0Z+DJmBWj8zzNcd/kygiMSu56vxvkmmOgFg0Xtt6Q4nojB2i?= =?us-ascii?Q?Ks52s5CFLXbTyrIIw2kh6hv111ofjEm0xFXYDkywjMqeDOTsQlybSDFBiYNi?= =?us-ascii?Q?p8Y4H+XCpYZpayjBrAHm93ItlN+M+g6AGEgMqXsn7sPNUstlCQTllVCthEVk?= =?us-ascii?Q?Wg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0de3d05-ca35-41f5-ad3d-08dab0142c1c X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 07:49:51.3195 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2Ef92ZLQZrREAnxqhcMQbmeKBsVznCTnZfWNhn523Yl8OGLjrbBghDvcPaDRNS4YsMj7H0SxIgqB2L1ZEKtx031juQTMgm+8uuPQlVAm+0w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3578 X-TUID: TkOHf/5Aoape 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. Henning > logger.debug("Writing syslinux config > %s/hdd/boot/syslinux.cfg", cr_workdir)