From patchwork Tue Dec 6 23:11:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Roberto A. Foglietta" X-Patchwork-Id: 2276 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 07 Dec 2022 09:36:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f55.google.com (mail-oa1-f55.google.com [209.85.160.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2B78aYsc005065 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 7 Dec 2022 09:36:35 +0100 Received: by mail-oa1-f55.google.com with SMTP id 586e51a60fabf-1446f190493sf4924701fac.9; Wed, 07 Dec 2022 00:36:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670402189; cv=pass; d=google.com; s=arc-20160816; b=NAIR7IIJ1IbG7jS38c0I8Zyl7SiZaN1gcNrttY8YhrSBBk072flI27fLxuUmUfvoSY Y3Ui+dzZJHQcEomj3Wfa/KCHX0O2lH8jeqkQry9dBS5I9LfkGvjW7iHiJ05w32cVF9eV iahxdyqvzP+uDLZhGB/Oc4/e/1vx3YY5bwZE0ojz0chkt9/tLwYBpBySbCcutHQllSga Us+Y89jRPflAWGHBvJ5gBMHF8dxBu77eMNXsUbkjiGl53l1e0waXOCrIMS3Deet5hjca KSRc2rejmorwVaDSXY4icIr+HjhtlPC0FmCrb8D9LPCR+JCxCo3HwuG2EapmWsDg5f2V ZfgQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-subscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :list-unsubscribe:cc:to:reply-to:message-id:subject:date:from:sender :dkim-signature; bh=FW+DLmkzm0qrfmJ81PBpQA4f2ay+TXcXumQObkrn4i4=; b=ZS6Xlf2L816tORLPxdG2HuX8npMfRievnlTNx65rAKkkOcIbQJHySe1hcAUVP+18KY 5aXzsJCAN96fniGGgV9gVbmzC4C77nOdplb8Kz5Cr+ru4EjU+oqKr91S/YUjiy/apkjJ BXltxCplJk+plUe+RiNWS+QX7vvi/AGelOOfyNI6uYqlJKutm3+Flh0zF3uB07bJT5xC CWFGo0wMiDIOfHH1VqUkgn4pJYi8W7CapKecSAcbsqmTYgNJVjLxcsTPHRqZFTQtIF7Z GILffEx1gXbPzUF2qs+o9HE1PsuBnR3lkBaMBIHAzsL53lF7kNR+U9lSjyci1kWfWTgl L/pg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of bounces+zsdn8qj94dvz6pt1m_nazq2@bounces.elasticemail.net designates 216.169.99.3 as permitted sender) smtp.mailfrom=bounces+zSDn8QJ94dVZ6PT1M_NazQ2@bounces.elasticemail.net; 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-subscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version :list-unsubscribe:cc:to:reply-to:message-id:subject:date:from:sender :from:to:cc:subject:date:message-id:reply-to; bh=FW+DLmkzm0qrfmJ81PBpQA4f2ay+TXcXumQObkrn4i4=; b=bVGuBchEPoqsMWlfUyuXTGptRBaWqRilaJ2SUVtWiodlueYhH/j2A8+pdXebesXux1 m1OHy0qZ737kl4QoSzP54PsyDISDdAl3NyyjJFaH1ES4qUJ9yf8BlbpAtU5qbb331s3i RYTxLPCmeut5wBMRFEQL1Gs6PwPuTN4aOpLxf6SK+vCxbJ47BClIZvpLEq3groDokhce ukI/QNHWZld2giZm2XM4r8alLDttAX3bf5PZ7jmsn+5xjjT55OGoW1QDC51etEbfCGc7 qgBexPZDNml7p3xlBFbkgFdOMNyDlIA91wRG/VIRhePKTYkicpTSAc2rVX0JMy7N4bvY PMHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-subscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version :list-unsubscribe:cc:to:reply-to:message-id:subject:date:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=FW+DLmkzm0qrfmJ81PBpQA4f2ay+TXcXumQObkrn4i4=; b=d0UdL6ALDNK+F8CPlw47X5Zq1+6UjZo63XmQSg9WMHxnyb6mHhsY4jv/cxXvwGb/FJ kCQmB57SToZ7lvgx8FfgX7XoA4dpbY3RADqZxweeWqNX7IzelKuT6zj/oRGaZAPYPbWZ 3k0yv+U6EPSdLPLuhw7L9AbqjBVJS+7OPnYdYjWRTjYClb61t0s8Wwsju1mHujGn5RPg HmA+d5Vwb+taLZ0bW/OIorccTFScTCzk/KmuCG9NIUOnSpKLporo/0gp7rXhZ5zW7zPm dPhdbpwKPefmPTucxAViWldY8zHyiGG95AraMgLeek5ufGFX/mHVcfAL7vQ25Ml6iRy+ exZw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkwYYbSEHSuGAaQf3gdxTnJYZ7DbYbmJ5QtmgkGTjofTO7tXkgD n98IYWEQeQU8YRoCTE/cs5U= X-Google-Smtp-Source: AA0mqf5OIqW5vqy3zbmgKFzNZaOstnwO5YEI54/ZPGTnk8OC/aznUdwXsDpzhTL5f21gheAZmKxkRw== X-Received: by 2002:a05:6808:642:b0:353:b8c5:4845 with SMTP id z2-20020a056808064200b00353b8c54845mr35063964oih.267.1670402188889; Wed, 07 Dec 2022 00:36:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a54:4f1e:0:b0:35b:dfea:7af0 with SMTP id e30-20020a544f1e000000b0035bdfea7af0ls498831oiy.7.-pod-prod-gmail; Wed, 07 Dec 2022 00:36:28 -0800 (PST) X-Received: by 2002:aca:190b:0:b0:35e:3a11:36c with SMTP id l11-20020aca190b000000b0035e3a11036cmr327687oii.63.1670402188615; Wed, 07 Dec 2022 00:36:28 -0800 (PST) Received: by 2002:aca:bf41:0:b0:355:6b46:5158 with SMTP id 5614622812f47-35e2fe000a9msb6e; Tue, 6 Dec 2022 15:11:36 -0800 (PST) X-Received: by 2002:a62:1ec2:0:b0:572:7b49:4f48 with SMTP id e185-20020a621ec2000000b005727b494f48mr71924700pfe.33.1670368295343; Tue, 06 Dec 2022 15:11:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670368295; cv=none; d=google.com; s=arc-20160816; b=fKM8LVrXhrH5Z0JRAGfbpXWjzyuG8gqKxRG3ZeXEZZs5o4McEmefT2krxCUJr72p57 yk4WTw2T/6E9AktxypS7uizimO12KCdG9n8TUZexn2hgMEP8GIjIMt+fl3tRDfZ/QBH1 drtGXnvX+xftbeDfXoWFw95RjwtbBCdWmMSaLLzXGDD7MwaKoOPGL3puK8NEIwOmlfrp 289ZXJ5dBQSTLHy7gOluvmO9AHK1kj1jjDt6HEpIzp6fOtv/9C6gNxcAWDTUszyrNlFr KI+xSFcrnjTkF+yQLJPBZd/R6TSgzE1fT+9TMYG7PYQAsc+eM1OLPL6DLwjR/4yA2pvm H1Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe:cc:to :reply-to:message-id:subject:date:from; bh=vx9l//RDHnOaGwLwVky26wf9v5XmKuUbpLixGSvOlzk=; b=vpv8JnnQ4a/oO5N6BC978+C1a+eXFPdVfGw0iry58Lh3nuToYMGJy/8wFrk3MeAJWt gfjJfYPSZvunptm695oJEdwYEyKVNUdVAIhyeSkJ7UVWDraUh32Ht3MWQm+lX9AX+pIg Ig0c9eqG7ZYPfXTg2Z8wrJKsHWr2PFbraF652L9Z5x3IQIt3dyT/5qxsSCGvhygzp//F B66rxeJ1rAr2ccXb6RdeMdjeREzNq+4TY9pKBbkDPXTQgNLm3hPEbcipZ/QdaWG9sg9B U1LzF36cTsmwf2rA805DwEfAxybke50ShxxM5DEnvJrPwBk7jQ0BaYP1pqdT7stPtkgB fFvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of bounces+zsdn8qj94dvz6pt1m_nazq2@bounces.elasticemail.net designates 216.169.99.3 as permitted sender) smtp.mailfrom=bounces+zSDn8QJ94dVZ6PT1M_NazQ2@bounces.elasticemail.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pn3.mxout.mta2.net (pn3.mxout.mta2.net. [216.169.99.3]) by gmr-mx.google.com with ESMTPS id mg19-20020a17090b371300b00219c8920cd0si521354pjb.0.2022.12.06.15.11.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 15:11:35 -0800 (PST) Received-SPF: pass (google.com: domain of bounces+zsdn8qj94dvz6pt1m_nazq2@bounces.elasticemail.net designates 216.169.99.3 as permitted sender) client-ip=216.169.99.3; From: roberto.foglietta@gmail.com Date: Tue, 06 Dec 2022 23:11:33 +0000 Subject: [PATCH] Rebuild after cleaning does not work anymore, bugfix v2 Message-Id: <4uil9p27ybiw.zSDn8QJ94dVZ6PT1M_NazQ2@16F0H.trk.elasticemail.com> Reply-To: roberto.foglietta@gmail.com To: isar-users@googlegroups.com Cc: roberto.foglietta@gmail.com List-Unsubscribe: , X-Msg-EID: zSDn8QJ94dVZ6PT1M_NazQ2 MIME-Version: 1.0 X-Original-Sender: roberto.foglietta@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of bounces+zsdn8qj94dvz6pt1m_nazq2@bounces.elasticemail.net designates 216.169.99.3 as permitted sender) smtp.mailfrom=bounces+zSDn8QJ94dVZ6PT1M_NazQ2@bounces.elasticemail.net; 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-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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" bugfix, image and rootfs classes, fails in rebuilding - rebuild after cleaning does not work anymore but it is required to remove manually all the directories and this would take longer to rebuild. This patch fixes this new wrong behaviour which happens when the kernel is not compiled but installed. Reproducibility: this sequence of commands does not work anymore kcbuild ./kas-container --isar clean      XOR/AND sudo ./kas-container clean kcbuild It fails with error while the following still works kcbuild sudo rm -rf build/tmp build/sstate-cache kcbuild but it takes more time than the previous when it was working. Signed-off-by: Roberto A. Foglietta --- meta/classes/image.bbclass | 9 +++++---- meta/classes/rootfs.bbclass | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 813e1f3..d5c173b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -346,17 +346,18 @@ DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock" do_copy_boot_files() { - kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" + set -x + kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz] || true)" if [ ! -f "$kernel" ]; then - kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" + kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz] || true)" fi if [ -f "$kernel" ]; then sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" fi - initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" + initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img' || true)" if [ ! -f "$initrd" ]; then - initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" + initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img' || true)" fi if [ -f "$initrd" ]; then cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index d19ac03..0d16754 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -33,6 +33,9 @@ rootfs_do_mounts[weight] = "3" rootfs_do_mounts() { sudo -s <<'EOSUDO' set -e + for i in dev/shm dev/pts proc sys; do + mkdir -p '${ROOTFSDIR}/$i' + done mountpoint -q '${ROOTFSDIR}/dev' || \ ( mount -o bind,private /dev '${ROOTFSDIR}/dev' && mount -t tmpfs none '${ROOTFSDIR}/dev/shm' &&