From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7174176974283210752 X-Received: by 2002:a05:6808:aab:b0:35a:3618:58fc with SMTP id r11-20020a0568080aab00b0035a361858fcmr34525881oij.47.1670402188947; 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-Google-Smtp-Source: AA0mqf50jbpH00Cq07/xO/CpiSkURuYTJiUBJW1n4r7spL70qXKgGoukTblpumqHkamTnxy9aPMx 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 Return-Path: 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; 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 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: =?us-ascii?q?=3Cmailto=3Aunsubscribe+zSDn8QJ94dVZ6PT1M=5FNazQ2=40bounces=2Eelasticem?= =?us-ascii?q?ail=2Enet=3Fsubject=3Dunsubscribe=3E=2C?= =?us-ascii?q?_=3Chttp=3A=2F=2F16F0H=2Etrk=2Eelasticemail=2Ecom=2Ftracking=2Funsubscribe=3Fmsgid?= =?us-ascii?q?=3DzSDn8QJ94dVZ6PT1M=5FNazQ2&c=3D1588198146759178339=3E?= X-Msg-EID: zSDn8QJ94dVZ6PT1M_NazQ2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-TUID: D06CqceKNwNX 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' && -- 2.34.1 https://16F0H.trk.elasticemail.com/tracking/unsubscribe?d=0BhLedwb8RnzpF9xsxE1N6U4M53j71ETTFG3t-ArDsB2YSL7TqPXb1srd7wQSlw-9_02R9Sqf44QPXwv8ekQNoU48QmMTmgH3YwRTOw-ffld0