From patchwork Thu Jan 5 19:06:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberto A. Foglietta" X-Patchwork-Id: 2408 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 05 Jan 2023 20:07:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-io1-f60.google.com (mail-io1-f60.google.com [209.85.166.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 305J77Fq009315 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 Jan 2023 20:07:08 +0100 Received: by mail-io1-f60.google.com with SMTP id u24-20020a6be918000000b006ed1e9ad302sf11458474iof.22; Thu, 05 Jan 2023 11:07:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672945622; cv=pass; d=google.com; s=arc-20160816; b=Dku24J6syuqEeLCHSCtG9jtmByrakP01n3gBN6cU+TE+8K+DNczTovz+crXINBbzgn /7f8Pi/HU+6CHe4wKEiONW8vR7CFZ4GRswjD9mq/uPcj/X19rW6rB13rTCqEP9t6hDIi RXEfVKGJ3F0N87vRbqgAqupMozBb91aKiH1c5PaHD9lI+nvLQcHpSAJemLTiu7ZRYioe 6ct2MhCu7/qAb4FqATWVSsKnDXdLSQ/iOahJ/R+xEIrtpT5ril37A3sw7yCy4GIGotjT ppw+aBUkAjKYTCYL9X90ticpR+MBpxaVN59aupIbY4nYI0Hl7BV0ye3a0GnZAssf6J6V jJIQ== 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:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=UtVQeBWzo3CNhXKmISoCTO8YMDmhrCvJ450r86JUUaY=; b=y/KJ3/GbusPSKhETlNW0H049y3oSfZYV84O7xpJNX7qKjxyw1aPq53tvB8NKrCVDMw s7VR92SBf7rv4nRSC3b3660j8OKFY9u8dGPhX9KMoh0RcSnJzEsHKC66utpz+Mk6idCi OXSC3nUcUsWZ8Nx1E4XUnqnEFR2JkaxvLzMX/F6dMDrboKEvgHrpErcUrh8++T0H8NZT YSjeD8Rs/0WAiz/U1acIZWuqnpSTWf4IXTkBUJn3l/5UrWAOWlfhRuRRFBV+7UIW0sLT dsyBKDw6gRQNkiYDunAF6xH8ScxRClUGH3to7b8PvFID14Dok7xL+PLJK2S5miQ45zjB 5b+Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; 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=UtVQeBWzo3CNhXKmISoCTO8YMDmhrCvJ450r86JUUaY=; b=s63zgM6bA57pGNu6mkXaz62XrYedsqwhj3UqK6UTVasufTcbJQPcIH5kWDxkMloxy8 8+7b9FWm0XRnsAHlJzhG8YCK8SdROj8i1ZS/8uaiqOnAtuBu6PMOktUtZNK0UoFFb7WY MotWl6bVZWfLyRhVjC7hpiBgpiGeziZY8tp8jBd+JuikL2eLWnES5a0pufADJh2aRx0X OOO1uuRm7E0Fwf6vYlArVV1I8MMlPDXOMLL/M5lUthVnOyulQJ9+sevDuWkRB8glLlGF ZVTatEyPJla857iIfM0sprHd7Q+ZJmVIOeeDb0u/864+WD1kWd4AbFshVTnYGZAwLiiO TYGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=UtVQeBWzo3CNhXKmISoCTO8YMDmhrCvJ450r86JUUaY=; b=4W5fxTUOpfJlI25K5Oi80AqldyP4CftCDp4XOUyaw8SzWImLUlSlYutIBzMXEE1Ozg CLn1senzPn6nIMh9pTQDMPWSfZkM8pMW9BeTSRyiaTd55CuAiRaISKQXx9qtf8jPN5AI P0XkJ4VILb+x23WyNAjhusw2qcR0QX+6qgLT7/mbHAER2s5gSEgBB5l1Az+YZvsqFZ/6 Y2D2Y0BWbSJUNcIzZ05ZDp/zO9SkDrTPSmZxNhYGi2g6AUozt6KyIR1vgc6U8oY6Fl+Z dVH9PG+5yPJz8xfbTc+cYxflNynco7TH6iMLytzszrekSE8Y+5itc7UweCjCKo9Pwp34 B5Kg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kqijrnYF5YX1AbsqvInzRj2xc/5QzsWmiXRJAczNC27TOvYuPSw pFk/6oNU7z93vOEUduI8Qb0= X-Google-Smtp-Source: AMrXdXsAeVS3lZXxjsTJOphu1mcyQbrDYPwyzR7dEtZRYdwG4z+TdWBRj0PyyeFr1Gm3a1R5Bp1TVA== X-Received: by 2002:a92:cc84:0:b0:304:c600:b4bd with SMTP id x4-20020a92cc84000000b00304c600b4bdmr3943603ilo.252.1672945621893; Thu, 05 Jan 2023 11:07:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:12b4:b0:304:ca87:c0ba with SMTP id f20-20020a056e0212b400b00304ca87c0bals7747048ilr.2.-pod-prod-gmail; Thu, 05 Jan 2023 11:07:01 -0800 (PST) X-Received: by 2002:a05:6e02:1d0a:b0:304:ba64:f094 with SMTP id i10-20020a056e021d0a00b00304ba64f094mr45074201ila.6.1672945621555; Thu, 05 Jan 2023 11:07:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672945621; cv=none; d=google.com; s=arc-20160816; b=qdr3Y9hGzDtoLnCzbiY4Ov6tHnlvTwiRh+lYElAXWNXMdI15tN9pv52DX8dXW+mQHc vzL7aCwDV4v3hwuz/Sccyrc62yFtrms+sA/8NN/HRbNpN0SeaNnTF3CgBC88WjH3uH0j lb0XekKr6J4stt3psLY3Mf6dAq7TxVvtnfWHlC0zeQoMdvnzLCSFLfU5vDk7tubAwpmH e54qHsuAOMlQoysHAnjYTQj0TiFdcJYIzRQte9r95gnQjjNi2OVJg+qYT2GsYOkvTKX6 3tXAQIgoO/6+AQeExpCXhoCgxHy1kdvHOjsD0hURmFL+wOKfyYBYDciMnI4lwGcsgInp UFqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=0X3M9F/K/nIl6+koXhVHyortaALeKwi/vnB6sHuWzlE=; b=c69H4RIssxofZeBJNITXapU2YX224Li6UK5LHL0CRGzcuQmIksNMJ7zaoAa/KVN/dA trMMimGbvOgUX5+UpvHmrYxFJbcUWQLTK4tA6h2soI2W/8sFfM2SR8mLftquiXKqrY32 rzvplxx5vX29N8/XVj7NUF5f7IWtAIMfW7gAIPQisE8f/uYWeRGSFLtA5+gFDWxmTyTr r9yfsMFpw1IO8ubv5kRL6ek6Bl7/7BG44qxvNEniLNfwNSFR+cO8G7A6Ry85vZl6t8RD 6v22OcCwfBztwztwSPY1cRilL5dmOsghApbCuaM8t3SF/1bWEuuzwpxNsKwBr7oBpq9P pocQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from relay08.th.seeweb.it (relay08.th.seeweb.it. [2001:4b7a:2000:18::169]) by gmr-mx.google.com with ESMTPS id x1-20020a92b001000000b00302df8abfa9si2331978ilh.1.2023.01.05.11.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 11:07:01 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as permitted sender) client-ip=2001:4b7a:2000:18::169; Received: from localhost.localdomain (unknown [IPv6:2a02:8071:3187:7b80:4cac:985f:1a32:e06e]) by m-r2.th.seeweb.it (Postfix) with ESMTPA id 01A4D3F1EB; Thu, 5 Jan 2023 20:06:59 +0100 (CET) From: roberto.foglietta@gmail.com To: isar-users@googlegroups.com Cc: roberto.foglietta@gmail.com Subject: [PATCH] image class bugfix: interuption does not break the rebuild Date: Thu, 5 Jan 2023 20:06:54 +0100 Message-Id: <20230105190654.2760731-1-roberto.foglietta@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Original-Sender: roberto.foglietta@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning roberto.foglietta@gmail.com does not designate 2001:4b7a:2000:18::169 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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: "Roberto A. Foglietta" image class bugfix: interuption does not break the rebuild Signed-off-by: Roberto A. Foglietta --- meta/classes/image.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d72b8fa..b04826b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -428,10 +428,11 @@ do_rootfs_finalize() { rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" - mv "${ROOTFSDIR}/etc/apt/sources-list" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - - rm -f "${ROOTFSDIR}/etc/apt/sources-list" + if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then + mv "${ROOTFSDIR}/etc/apt/sources-list" \ + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || : + rm "${ROOTFSDIR}/etc/apt/sources-list" -f + fi BTROOTFS="${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target" for i in $(ls -1d ${BTROOTFS}/*/rootfs/ 2>/dev/null || true); do