From patchwork Fri Dec 13 13:45:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 3983 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 13 Dec 2024 14:37:49 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f58.google.com (mail-oa1-f58.google.com [209.85.160.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BDDblr6009378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Dec 2024 14:37:48 +0100 Received: by mail-oa1-f58.google.com with SMTP id 586e51a60fabf-29e61ef3897sf1409232fac.1 for ; Fri, 13 Dec 2024 05:37:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1734097062; cv=pass; d=google.com; s=arc-20240605; b=BbZPGB0YU4nzn3fbt00crf5WDQA2yj2il3w56aSrEZhc+eDYecHP+sxw5qSMYcwJHX ZpZ99ZE38LZt9kxY4sFQ6406EVGc6LGOs5yJuriEpNUGLr1MsIhJKkoR81iqOHvUOc3I 3otgiOZYW3hWQe4x9KadALuFSOIHIjTqaGXe1C8vY8AMAnJUKTlyafpIV46nh46yZPab tJv/TTP3tI4KTvDXRdiT2ggsCK4bSqTXiOVVgjVAbQFehwceN420bC/Bp838aQIRYoKE gfPMpKVxYaBe9dI5+H4S0LlLd3ekofRtJFv3HnsUnE23OIOetTDux9vdUQZsnyQ8w9+T b/Zw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xdp3xx5/+zTz7gtZ6J/F2J6lfZjf94Hu7sMSs4gFK18=; fh=sriqOuWDraMxDoO7n+CHeO66o343HS2dSGt8bQ8WHyc=; b=hbh3uxwZv0x9aEZI6aRKxeVzUHjrO1iTzEXsoqmpwdK1429WvQ3jJDqe7ztDspP6Zq ggwFtbCxFX7E2ohCbDDLy6ZE7usc67YGg4rBSXeO7+Tlh57OGj3uDJeQCpfO0YfB3aTd GWxR16wqCB0hWQ1I9GVxpozQTgtBN4Jsx/MeP4qERGVIWqVSx+Ydsx3Ml36GX4yxS8Pf OL5AVxD5Ui/u3y/yQbYHm+92Bo0F9s18b11vk8ZeF4MEzhgGwDP0554SpFojQVAhiXr3 VoPnFcp63SwzpjS8o4iTMc7XmUqAu8ITdNDpoVAsd5bAhCc8ByFGYtU9/ktn8VQnaH4Y UYxw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=XGXj9jH3; spf=pass (google.com: domain of fm-1324425-20241213133738dcfd836e7b556b361a-sqslwv@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-20241213133738dcfd836e7b556b361a-sqSlwv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1734097062; x=1734701862; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=xdp3xx5/+zTz7gtZ6J/F2J6lfZjf94Hu7sMSs4gFK18=; b=vL2G6XmyghCIdUriUGwZpUG+cGP0tVwngk1YCpgofP9B//q9Qwqc1KFR2LAEswSaFG D7808vVRT1qtx1jlP9cZoAA0+CExAv7oz5ciCoLw9NOyoFPlv4mAy2KqS2gnQ0s9QevY IpRi7g7aIcsJbXZzmbFqokW+TCHYSAsTywUlRV/sNKH1H8C/x3sHQpUGXJ2GI5K+RfFk 2pO12tug3+gjK6iCFaxCu1aGCSBma3k7VG5EraC5ZkgBDeh7dnlHbvj7413QSSifkM45 oSO0CKl+3VLJS4s63xg8/O2rKRSpKJTC3dmjqLpShdDKPQ0jde5MSRWgpcw0FbQc5cVs A5AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734097062; x=1734701862; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xdp3xx5/+zTz7gtZ6J/F2J6lfZjf94Hu7sMSs4gFK18=; b=fgZ6w5f1KsBHaHOu+Zw7SP56GRoWvGnvyheLNrIZoO1o8PEJfQAziD6xwCjn5BzyQa OtS9i3tDUPoV3zSwNqwHbqia0xKTSlAfksfIPM8a44G9maZGqkyHH9axueIg64+9+G1J SUpVsFQreHAMHlnADvHCY2f2xi1Ykz7JjHyWCVHiun9m6icYwnNG1EwycLwsiyuOwhKr VQg5PY32LLEOyXp7Aql8R0Xom05pLvPHOl5X+xrKwo2unnePC1Uf91G5TRhBEvGqvPfB i9YchuUe9rhf7+kOKp++GRCt9eRWnT9vQqHAJSrLI/7ZZaxalsTw9b8Vi2wcNbnDCVnl gynw== X-Forwarded-Encrypted: i=2; AJvYcCWrg8m5giA5Eot11vFZeEVaQgOnB1nPdhGIb7URGRz8hzq/7KnofliSsW6TSiOg6N2FkpbJNpo=@isar-build.org X-Gm-Message-State: AOJu0YyeXINfoKYKLFENMvVzvtGSXhuH/fVfOFXMaQiT/iXTl5Kan39c r2mwejQQLn2ngrbQvIYIU52OYYKl0RyKWQBfg84fEytKyfTjDvvT X-Google-Smtp-Source: AGHT+IHNWTkgZrWscmfIu36mppyNiynD1lNhFdMUbt2uLet+uKXPW5VHVZja0OEMhufGiSKvNuTUpA== X-Received: by 2002:a05:6871:d204:b0:29e:4c37:b471 with SMTP id 586e51a60fabf-2a3ac8de561mr1515806fac.30.1734097061865; Fri, 13 Dec 2024 05:37:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:1689:b0:2a0:218e:bd25 with SMTP id 586e51a60fabf-2a3af94fa49ls207142fac.2.-pod-prod-04-us; Fri, 13 Dec 2024 05:37:41 -0800 (PST) X-Received: by 2002:a05:6870:d150:b0:29e:5e54:76d9 with SMTP id 586e51a60fabf-2a3ac62af62mr1226495fac.11.1734097061058; Fri, 13 Dec 2024 05:37:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734097061; cv=none; d=google.com; s=arc-20240605; b=hXLR6Oem+wgGIQlckGR+23KGJ19b+iXViISqplEbUYkd+41Whvd5s99CHs3LaPYmOu Eichap/9cqp2cJnlwr3cPxyj9TpAortZWgIT5aMiq+ly9j4JxD1xsapUFvoyDlIufPQv v2/6alvAmS15ZnkRXZXFnNSMf9EQWjzPlLINYb96hwO6ttHFOrC5wQirSuZjSwJYi66Q UYjynSnCW63boTlUyA/XWKDMsBS9uUzZd+z8WIoJYdLO0g4ifPdcHPoRYhdkOnbHK5Ze GT9rmsvQOtG60SWFwggEJ9nZJz4yu6XeCAXZzNDS+DKCKkO5pZg+GAUp79wEVyY2DikE QMlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=r4y4SqZLaZjZU6UEiWLC71R0RgpVsDL4v4tj2RWBvhg=; fh=cFyOCrM5dwX4TVqcDVos2BKSO4EWUtox/KhQSJ+lJJ8=; b=EHRdmabuSqBFrZlIoMglIyplkZLnyJpUDNhMxYZVigNnwO5atqBRcxstxyQOXwpnm7 jdiJsffqmJ0wM1dAX7AU7udxa/McM0pZZ3NkrvtEsPCOs9oBMHVEPid17JYpUt/TatIu ovFVKV35ARpYI72umaLDJNkDT8DUOq503AC/FnaktW7Te6JP4eLeoDf4HZksnrGkh9U8 3k8V7EqNKCWm0ZDa0Vgm93OLBcg0wAKpHkK7h7QzC8SsI5uuwvYwuYTaxU2hAUKS47CB nJKe3zzROLVL8nWvPrFw6yIJR68H+Lu7+cWYefAoJCBHKbcZAn+qzAUH3olv/V67TmuN 0q6g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=XGXj9jH3; spf=pass (google.com: domain of fm-1324425-20241213133738dcfd836e7b556b361a-sqslwv@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-20241213133738dcfd836e7b556b361a-sqSlwv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 586e51a60fabf-2a000cd4654si392517fac.4.2024.12.13.05.37.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2024 05:37:40 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-20241213133738dcfd836e7b556b361a-sqslwv@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20241213133738dcfd836e7b556b361a for ; Fri, 13 Dec 2024 14:37:38 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: ubely@ilbers.de, vidyasagar.gc@siemens.com, srinuvasan Subject: [PATCH] meta/classes/image: move sources-list as bootstrap.list in rootfs_finalize Date: Fri, 13 Dec 2024 19:15:38 +0530 Message-Id: <20241213134538.1261599-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=XGXj9jH3; spf=pass (google.com: domain of fm-1324425-20241213133738dcfd836e7b556b361a-sqslwv@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-20241213133738dcfd836e7b556b361a-sqSlwv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: srinuvasan Presently, sources-list is not moved as bootstrap.list, even though the source-list file and sources.list.d directory present, this regression introduced in 8c10710 Make sure to use -d if the directory exists and use the correct name of the directory (sources.list.d). Signed-off-by: srinuvasan --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4ed9123f..db21cc76 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -416,7 +416,7 @@ do_rootfs_finalize() { -maxdepth 1 -name 'qemu-*-static' -type f -delete fi - if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ] && [ -e "${ROOTFSDIR}/etc/apt/sources-list.d" ]; then + if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ] && [ -d "${ROOTFSDIR}/etc/apt/sources.list.d" ]; then mv "${ROOTFSDIR}/etc/apt/sources-list" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" fi