From patchwork Wed Nov 27 17:44:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vidyasagar G C X-Patchwork-Id: 3965 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 27 Nov 2024 19:03:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f188.google.com (mail-oi1-f188.google.com [209.85.167.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4ARI33Qd014700 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Nov 2024 19:03:03 +0100 Received: by mail-oi1-f188.google.com with SMTP id 5614622812f47-3ea4bb4dcf5sf38496b6e.3 for ; Wed, 27 Nov 2024 10:03:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732730577; cv=pass; d=google.com; s=arc-20240605; b=ET2kCD7QymbYd4l2U5EWGAU7WlK23jc97wQUbA2UGRbj95MXfXruyKT/wEPB+u1Wjb 52f+AcDPsKIvjoa3qMhLD7vfkdkPlZPxA5eZAU6xDujTbSSZ/YEPuIm4KyiHgxsaa967 8jQgTuTKQrHDfdlKvriUX/NAUJ7qeUmrjiKmfNgwqv4a1yrCUDVUGoEroIAkEEMMtF6g LyozBv1t4xcJZWTIGKpu0pM7R9z4/aPLznb24EYfHMaj1XQQt/5VtHT2iV61OPS70mMf pO/gEkLYFXJ9kbp89FDd6rEU+Ln+/pIWtaTjcXATfguJtg/FKS414MIzjdY0FBQtXDPc u/xA== 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:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=10DwqOFD+nUB+zrqYOSTbUp9Cp0uuiauJ6uWFVcuJJY=; fh=RPDWPJybDgCGRNDajMM93mI7RsdZ3ZUoH/px8aeItI8=; b=cC9A25Y5wcbcEM4Ix1eILBUvc9ZoT5kq8FrxSNdsoG4476NCSaUl5neFs2fZVUseC8 RjJCamDNGSFxS92YH5u58wI1wVVbR2WVRGu12yAJmolFJMv+hPUWT9rSUn+5KeG0Lved 2JnpUSxAi6d7mMXiLbRvW51viNAmLklw3jFkfTyDBgGXu29SYUzZKXDFjY1qLrpp9rDZ GHLoh06fGjVrxyp87mO7oeS2aJvyxrBIGzHOHAO/NEjIA4gZ6ecbxPavWI9aTq21fSU/ vxYS1dIraBTT9TCXPqY6isBrSp048rXu5vR/dru+e59rpRnfIrrrWY+w1yDgLtcz9UYg Z2/Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="PE044v/j"; spf=pass (google.com: domain of gcvidyasagar@gmail.com designates 2607:f8b0:4864:20::635 as permitted sender) smtp.mailfrom=gcvidyasagar@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1732730577; x=1733335377; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=10DwqOFD+nUB+zrqYOSTbUp9Cp0uuiauJ6uWFVcuJJY=; b=dTs10c0R3YHG5/Dy3OUFCrHzgMQCBDegBQ8dRKiZ/ZC5N9q0opxUfrbA4HaosjyDhf wjrIrfSZyYTx8x6Tqs544uZC6M8swntqKJaJdK3FEIPwoH9AufOP6nABnzpJlQa2GHHa a/Ka5doJ936F+qwrQl7fTxcIt55g2DgFJtJfI6MC7BgH96oopHhvP4d/8GmhL4/SUpo3 3dFDrw9TYf1Nh25KCnxnb+bXcCuwLv/sbi7d66g4lOjKmls6O1PKqYWXmaFms/XI2bzR aE5HMA3jieA5JwQurwieMINr2DO7hz7w41UGuzXYfR1Y7E6xuoeXvc8NzvzYYRwjDouy wsaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732730577; x=1733335377; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=10DwqOFD+nUB+zrqYOSTbUp9Cp0uuiauJ6uWFVcuJJY=; b=kOB+3DKZlBx/nxOvQRS4Xp23Wjidqjnvz8BQcFAxJrXOefmqJ/vvCsMeLC+B1aEHDs kAH+DSsTH73zIPFZEzCPkQ/QMa8o9HCRt9fiSYYmEz1xljaBRazCqi1w/1UeacuX9Jee gS1LzglKqgjwTCtnbEZXdNTkKJVE7NMj/3ESZucawdGUgCh4rzXL9ZrtrB/WPoiTzuRZ PuvDhbZdQVRwuttOuw5DgnqPmQx1ChD1YeERJKHl7novLPGDNp1O7sUePc39JmMZzvf1 10LC2etw7hwd/zzWK9sC7fUkjuvBJVtV8Dogc8HaboM6Fr/1AqKHqZzpZiRbpqUiGjts YPYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732730577; x=1733335377; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=10DwqOFD+nUB+zrqYOSTbUp9Cp0uuiauJ6uWFVcuJJY=; b=SRlyATwajiTy0pyzRK1bs+LgpGHPYnEafyFy/J+NibVJekCRqJljAoVWuW05Wi/rVX 7WmgUqozUonQGK85ESmko8y+fK6kiG/PjIL4xJBvHAV6Mf8LmCfyJIU55CqFZjgyQvVu qaSZPolERersSPQ9AfemrXDa0itGV9A/0dNy2zOnYhQuPTgmPzXLhnNwldsOuc8iBsBc pkLi0jL17dI4xSlzAugUg+a/aY/8A1oiCPFfsvgz5a4Xp0enREfikShZNYD+WLI2MvIR llwfQmRpBa8vIAq+BCQdNfkNShiXt9SzGRFxVNu7Raz4CySNPcp0+OfCBkudOkM+LUvf Bj/g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXJrLmvSTEtmDO0Kw1DAAC6wzj16fQhNex42qnWI/pGm+sRTLV2bqYFHVrpsoetuijpZ4kqVLE=@isar-build.org X-Gm-Message-State: AOJu0YwygyJQXEz/1Vd/vJYvT9kOu23qlyWGaG/2NcZ7j3QCLd4SKN11 l+JlzT9brs+do0OHOW3ssMshJyVNIW/yiksPbz5h6isU7oW/XMGg X-Google-Smtp-Source: AGHT+IGTFagfoZm90N9e8dJx/kGCqTr4ksQ4PlD8qzZFjxkkurOuLHUiT71lKmskS/750F4xp9kjyg== X-Received: by 2002:a05:6871:728e:b0:287:e3e1:15f2 with SMTP id 586e51a60fabf-29dc41cb355mr4422184fac.25.1732730577248; Wed, 27 Nov 2024 10:02:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:45a4:b0:288:93de:9ec9 with SMTP id 586e51a60fabf-29de1d4998als42851fac.2.-pod-prod-03-us; Wed, 27 Nov 2024 10:02:56 -0800 (PST) X-Received: by 2002:a05:6808:19a9:b0:3ea:37a7:394 with SMTP id 5614622812f47-3ea6dd46755mr4645474b6e.34.1732730576633; Wed, 27 Nov 2024 10:02:56 -0800 (PST) Received: by 2002:a54:451a:0:b0:3e7:b3cb:fd2d with SMTP id 5614622812f47-3ea6d2c9b20msb6e; Wed, 27 Nov 2024 09:44:30 -0800 (PST) X-Received: by 2002:a17:902:f609:b0:211:f176:856c with SMTP id d9443c01a7336-21501385e90mr53688545ad.23.1732729468785; Wed, 27 Nov 2024 09:44:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732729468; cv=none; d=google.com; s=arc-20240605; b=hP9LdWwPRXeaLKA6PACSfBsA17zUk7bRqIOYxofr+qBdiKHZhyf0kQO/cYDqeeONvE nA5dF/ntiN5oUqJGrkzPWv2A0q4vUvCPAE361e0nqe6ygKQm/v91BKss/JOPVxUmBIBQ sZGyJeVwqoWX84RbnGhJ5Q75xUwbs6c3uRM0Ug5k8qI63T27fLY6Y1zC1ju++hVrC8h/ 0K8KJnOLTNuksx/1kfII1spBY+dc2KBNkPV0NdWiTvxlHsTkDdTI5/CSM4oQPNWH49ki MWmT6a7oNeGzBf++KtJqcxdfyT86E98q9BMm2hkiqWVRpq2yDXqoZAGl3Yv3+rF8ip15 66TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=lHkVwlo+0L/WnQVGttZKl9s318mq6zBUCHhyfZ7KFrQ=; fh=JZY99P0ccBHLRfd/v+Rz9qa2b09mSbNE+PuJ8/8y3kY=; b=jTEKkiA8ZfllRVZ6U5h6H8iVv20Hz1XcAtzEcz4N7rnUnGvHxJ9tqUPn6LpA0UyiSf DTcKqmXPu51zg/egP2X+kl6LRq5AZriL9vqewc6ucQzYYkM8a+8P6q7p/yZyvd6mz/NY fKefaObImebCp8j3hA0b4N8YGP29KE+PibubTeRgsX7ZZj9aJM4FJRhxjQ/4BRYKxomS vliDGEID+lyQY59NKNrMmtYaPP46wnG5Ug/E1AqNLyB7EeyLQpoUkLUvfDcrlC2/zs5d aKKD04ZGxrQgDUDfjucCtnjQiMkibWJmu8lumav83c3mfENHnDtEJM31PJUz6vNYNE/b Npyw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="PE044v/j"; spf=pass (google.com: domain of gcvidyasagar@gmail.com designates 2607:f8b0:4864:20::635 as permitted sender) smtp.mailfrom=gcvidyasagar@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.com Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com. [2607:f8b0:4864:20::635]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-2129dbd87b5si4686145ad.12.2024.11.27.09.44.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Nov 2024 09:44:28 -0800 (PST) Received-SPF: pass (google.com: domain of gcvidyasagar@gmail.com designates 2607:f8b0:4864:20::635 as permitted sender) client-ip=2607:f8b0:4864:20::635; Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-21285c1b196so66875165ad.3 for ; Wed, 27 Nov 2024 09:44:28 -0800 (PST) X-Gm-Gg: ASbGncsmjx7VzwsVRNffuvq2DPfWRXHm5Qny6GojeZev0K6mseMHJAzJJj22kkCaDa4 lkp39A4J+SO1Xh0GMOcMAinf1S9CAC6N/D74BuRAvOEmoBPPWj9/J0hD+e4klyBWWOKTDC+6ZBZ k27U0G6Diu8Z7l0youjvJMnes0cHhu1yBfeKYbHRwaACiPeEw9J6AuNFTn8ndEz/Pbd3Aq6h7o/ ECumwy9k9hT74ql1dm3usqYyyKVI/MngnXy++GNTgWXz8KblhuDUDUlNGjMKLk/cRaSapS2YMZr X-Received: by 2002:a17:902:e549:b0:20c:aed1:813a with SMTP id d9443c01a7336-2150109b3f5mr45120495ad.14.1732729467546; Wed, 27 Nov 2024 09:44:27 -0800 (PST) Received: from vidyasagar.net.plm.eds.com ([139.181.36.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2129dc15b5esm105510625ad.214.2024.11.27.09.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 09:44:26 -0800 (PST) From: Vidyasagar G C To: isar-users@googlegroups.com Cc: Vidyasagar G C Subject: [PATCH] Fix rootfs source list handling in image.bbclass Date: Wed, 27 Nov 2024 23:14:26 +0530 Message-Id: <20241127174426.4098-1-vidyasagar.gc@siemens.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Original-Sender: gcvidyasagar@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="PE044v/j"; spf=pass (google.com: domain of gcvidyasagar@gmail.com designates 2607:f8b0:4864:20::635 as permitted sender) smtp.mailfrom=gcvidyasagar@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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?= Ensure that the APT sources list is only moved if both the sources-list file and the sources.list.d directory exist. This prevents errors when APT is not installed, as the sources.list.d directory will be missing. Signed-off-by: Vidyasagar G C --- 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 472df3cf..31be4267 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -418,7 +418,7 @@ do_rootfs_finalize() { -maxdepth 1 -name 'qemu-*-static' -type f -delete fi - if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then + if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ] && [ -e "${ROOTFSDIR}/etc/apt/sources-list.d" ]; then mv "${ROOTFSDIR}/etc/apt/sources-list" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" fi