From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7174176974283210752 X-Received: by 2002:ab0:2b1a:0:b0:39f:96a1:63d3 with SMTP id e26-20020ab02b1a000000b0039f96a163d3mr44661541uar.108.1670368242589; Tue, 06 Dec 2022 15:10:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ab0:105b:0:b0:418:d23c:2e13 with SMTP id g27-20020ab0105b000000b00418d23c2e13ls36386uab.6.-pod-prod-gmail; Tue, 06 Dec 2022 15:10:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf5yQ3ZSSKMA4E75I8GCMxN5lLhJh+ap7a/7U3jzs1m9W1+5uakuYsY0GuL83qjVCmvxqvWw X-Received: by 2002:ab0:6cb1:0:b0:419:2452:150b with SMTP id j17-20020ab06cb1000000b004192452150bmr24938858uaa.20.1670368241592; Tue, 06 Dec 2022 15:10:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670368241; cv=none; d=google.com; s=arc-20160816; b=MTbZ6wgV4ITDG9F7IQLsNp4+6/FuDFtxbSEAEQHJtgA3vKofx0RUDLBYr449x3qau/ J2w5yGVMw/1B7nGIbNFtEqZ6o6tVEcffbkaPQCWtaq8R1baSCM2lPyZiOGbG17iNHvbi GT0K/J+WD9TjqG05GKlZ9fA5IGLVZ59OKAgnuH3e72YaHClInYcTqPlY8LmQZs1j6K3o 7plX3rJtOiNvNV/HWcV0qg6QACq5bLKjKTzQQCUi8KbcqL/NHqx0e757g6OEV7qwnGCu AOe1Lxaa14aWl5XClNlpI7MVlq9GI1GkLKoMbEtfuzcKpQEXE6jl4qtrsVZ5++8X8iac GXGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=mY/egAADe1HcUln5sS/KDohN8UMeUaQJAOmiek7P9qI=; b=K/HutFIyO9m04+V4ojKQVF28W5F/LTGjXx05SUVS8CGALj1e7EkDeewU/lrG6MRIxN G8C51/Qfxdwi8JaMOhk7NSjHP/qDhH0RbGGLykN7kLuzbYcfd4wg0htvtSd3gaCITL9k /Hvojd99NFhX9uUsXAaYPNkqr2VyE36sK6CSK9vrwvp+EE4o50JC9o+oFOd5Uzt4U/Xj 24Gr1SzKDUv+d+XMiu2VS3mqE7oCp5UxCupvXHagpkXa6sOqZrQ5FY2O5S0NwsBhA+XE e57QoOTrsrcSxKd7igQF0IRuIbBHT6lDMUxAS/1BL5VPTB7VcoFjSeDkAaND/LWsV6Z6 BUQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MTQ0wewC; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::82a as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com. [2607:f8b0:4864:20::82a]) by gmr-mx.google.com with ESMTPS id u7-20020ab03c47000000b004192f334e13si2180215uaw.2.2022.12.06.15.10.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 15:10:41 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::82a as permitted sender) client-ip=2607:f8b0:4864:20::82a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MTQ0wewC; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::82a as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qt1-x82a.google.com with SMTP id jr1so15012115qtb.7 for ; Tue, 06 Dec 2022 15:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=mY/egAADe1HcUln5sS/KDohN8UMeUaQJAOmiek7P9qI=; b=MTQ0wewCLY5FnyJatpyzq+YVE+KZQHOkUW25SBZyTxgkxqbxVXYvIXcFfjoL/IJo35 tDCK0RoOeef2Km9JC2bdm9ggI58eWCZANNhG62BvcyxGdVaGQrjyBLWa2HY8RWyo241k QhBd+ITA7GBMAO98q2daTOCLruY48dC4yNPRCw9XraD22w6KBsn0Jlr7vgWQXx+EiMZ/ mi6GCeEAa66jurwAITzALl28CRQZn0KbFqiN5nS7/Va8SYGBiExO3215BlzhvM95JBqL iT+Y/gucwBlcC3l2+tyVS6BbL8fhw6N73mksUY8jAnhB10B6ePQfGeFF8oAC9PoCgM7n 4hmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=mY/egAADe1HcUln5sS/KDohN8UMeUaQJAOmiek7P9qI=; b=ES6r+6Wpz5PGR/qxezRyw5d4jmhvFM7MwraB85hWJyel6oliP1e9aGi+C992Rx28qT tNh+j+DPwQiPCcftcxPBtXsEoQkn/Ai4QZLA/mX4Ide65uDvFOvV3GezGznM/7sKSaaU g6D5H/OaWWFRnT4SUBeWKhoXDtAir66bMc7Jkx1FxHY8nbFSAUPwewRE72hsmsxqgaq1 0fXTGYzqzYz90+iHxFLnysEYM6XLY7wJDFXzZoncTywQR7+WKQPI5jEJBGVM5TUJElpn 4kt/yTrXRFAqclucNvyqiMFiXXR6nY2+Q/meWh+2fK6JS30UCvAHH/NU4+9sl3zbo34+ bZHw== X-Gm-Message-State: ANoB5pnBB6OwBgILAkqL3xwnmzLyxVFv20TpK3UkIshrpylA6fLwxpAf zc1zeY7akZ9jk2liqVY08kLPfK1CWzjPp9uNgqoTnxbacfOt X-Received: by 2002:ac8:4d04:0:b0:3a7:f283:43cc with SMTP id w4-20020ac84d04000000b003a7f28343ccmr361001qtv.467.1670368240984; Tue, 06 Dec 2022 15:10:40 -0800 (PST) MIME-Version: 1.0 From: "Roberto A. Foglietta" Date: Wed, 7 Dec 2022 00:10:04 +0100 Message-ID: Subject: [PATCH] Rebuild after cleaning does not work anymore, bugfix v2 To: isar-users@googlegroups.com Content-Type: multipart/mixed; boundary="000000000000a61c3205ef30e952" X-TUID: 96BrCxhrY8uy --000000000000a61c3205ef30e952 Content-Type: text/plain; charset="UTF-8" >>From 86db16c6fe44876ae63fa89c9f25b92f2d3cb34d Mon Sep 17 00:00:00 2001 From: "Roberto A. Foglietta" Date: Tue, 6 Dec 2022 23:55:00 +0100 Subject: [PATCH] Rebuild after cleaning does not work anymore, bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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' || trFrom 86db16c6fe44876ae63fa89c9f25b92f2d3cb34d Mon Sep 17 00:00:00 2001 From: "Roberto A. Foglietta" Date: Tue, 6 Dec 2022 23:55:00 +0100 Subject: [PATCH] Rebuild after cleaning does not work anymore, bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bugfix, image and roofs 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 worng behaviour which happens when the kernel is not compile 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 ue)" 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 --000000000000a61c3205ef30e952 Content-Type: text/x-patch; charset="UTF-8"; name="0001-Rebuild-after-cleaning-does-not-work-anymore-bugfix.patch" Content-Disposition: attachment; filename="0001-Rebuild-after-cleaning-does-not-work-anymore-bugfix.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lbcu3bah0 RnJvbSA4NmRiMTZjNmZlNDQ4NzZhZTYzZmE4OWM5ZjI1YjkyZjJkM2NiMzRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiUm9iZXJ0byBBLiBGb2dsaWV0dGEiIDxyb2JlcnRvLmZvZ2xp ZXR0YUBnbWFpbC5jb20+CkRhdGU6IFR1ZSwgNiBEZWMgMjAyMiAyMzo1NTowMCArMDEwMApTdWJq ZWN0OiBbUEFUQ0hdIFJlYnVpbGQgYWZ0ZXIgY2xlYW5pbmcgZG9lcyBub3Qgd29yayBhbnltb3Jl LCBidWdmaXgKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFy c2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCmJ1Z2ZpeCwgaW1hZ2Ug YW5kIHJvb3RmcyBjbGFzc2VzLCBmYWlscyBpbiByZWJ1aWxkaW5nIC0gcmVidWlsZCBhZnRlciBj bGVhbmluZwpkb2VzIG5vdCB3b3JrIGFueW1vcmUgYnV0IGl0IGlzIHJlcXVpcmVkIHRvIHJlbW92 ZSBtYW51YWxseSBhbGwgdGhlIGRpcmVjdG9yaWVzCmFuZCB0aGlzIHdvdWxkIHRha2UgbG9uZ2Vy IHRvIHJlYnVpbGQuIFRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBuZXcgd3JvbmcKYmVoYXZpb3VyIHdo aWNoIGhhcHBlbnMgd2hlbiB0aGUga2VybmVsIGlzIG5vdCBjb21waWxlZCBidXQgaW5zdGFsbGVk LgoKUmVwcm9kdWNpYmlsaXR5OiB0aGlzIHNlcXVlbmNlIG9mIGNvbW1hbmRzIGRvZXMgbm90IHdv cmsgYW55bW9yZQoKa2NidWlsZAouL2thcy1jb250YWluZXIgLS1pc2FyIGNsZWFuCsKgIMKgIMKg WE9SL0FORApzdWRvIC4va2FzLWNvbnRhaW5lciBjbGVhbgprY2J1aWxkCgpJdCBmYWlscyB3aXRo IGVycm9yIHdoaWxlIHRoZSBmb2xsb3dpbmcgc3RpbGwgd29ya3MKCmtjYnVpbGQKc3VkbyBybSAt cmYgYnVpbGQvdG1wIGJ1aWxkL3NzdGF0ZS1jYWNoZQprY2J1aWxkCgpidXQgaXQgdGFrZXMgbW9y ZSB0aW1lIHRoYW4gdGhlIHByZXZpb3VzIHdoZW4gaXQgd2FzIHdvcmtpbmcuCgpTaWduZWQtb2Zm LWJ5OiBSb2JlcnRvIEEuIEZvZ2xpZXR0YSA8cm9iZXJ0by5mb2dsaWV0dGFAZ21haWwuY29tPgot LS0KIG1ldGEvY2xhc3Nlcy9pbWFnZS5iYmNsYXNzICB8IDkgKysrKystLS0tCiBtZXRhL2NsYXNz ZXMvcm9vdGZzLmJiY2xhc3MgfCAzICsrKwogMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWV0YS9jbGFzc2VzL2ltYWdlLmJiY2xh c3MgYi9tZXRhL2NsYXNzZXMvaW1hZ2UuYmJjbGFzcwppbmRleCA4MTNlMWYzLi5kNWMxNzNiIDEw MDY0NAotLS0gYS9tZXRhL2NsYXNzZXMvaW1hZ2UuYmJjbGFzcworKysgYi9tZXRhL2NsYXNzZXMv aW1hZ2UuYmJjbGFzcwpAQCAtMzQ2LDE3ICszNDYsMTggQEAgRFRCX0lNRyA9ICIke1BQX0RFUExP WX0vJHtAKGQuZ2V0VmFyKCdEVEJfRklMRVMnKS5zcGxpdCgpIG9yIFsnJ10pWzBdfSIKIGRvX2Nv cHlfYm9vdF9maWxlc1tkaXJzXSA9ICIke0RFUExPWV9ESVJfSU1BR0V9IgogZG9fY29weV9ib290 X2ZpbGVzW2xvY2tmaWxlc10gKz0gIiR7REVQTE9ZX0RJUl9JTUFHRX0vaXNhci5sb2NrIgogZG9f Y29weV9ib290X2ZpbGVzKCkgewotICAgIGtlcm5lbD0iJChyZWFscGF0aCAtcSAnJHtJTUFHRV9S T09URlN9Jy92bWxpbnVbeHpdKSIKKyAgICBzZXQgLXgKKyAgICBrZXJuZWw9IiQocmVhbHBhdGgg LXEgJyR7SU1BR0VfUk9PVEZTfScvdm1saW51W3h6XSB8fCB0cnVlKSIKICAgICBpZiBbICEgLWYg IiRrZXJuZWwiIF07IHRoZW4KLSAgICAgICAga2VybmVsPSIkKHJlYWxwYXRoIC1xICcke0lNQUdF X1JPT1RGU30nL2Jvb3Qvdm1saW51W3h6XSkiCisgICAgICAgIGtlcm5lbD0iJChyZWFscGF0aCAt cSAnJHtJTUFHRV9ST09URlN9Jy9ib290L3ZtbGludVt4el0gfHwgdHJ1ZSkiCiAgICAgZmkKICAg ICBpZiBbIC1mICIka2VybmVsIiBdOyB0aGVuCiAgICAgICAgIHN1ZG8gY2F0ICIka2VybmVsIiA+ ICIke0RFUExPWV9ESVJfSU1BR0V9LyR7S0VSTkVMX0lNQUdFfSIKICAgICBmaQogCi0gICAgaW5p dHJkPSIkKHJlYWxwYXRoIC1xICcke0lNQUdFX1JPT1RGU30vaW5pdHJkLmltZycpIgorICAgIGlu aXRyZD0iJChyZWFscGF0aCAtcSAnJHtJTUFHRV9ST09URlN9L2luaXRyZC5pbWcnIHx8IHRydWUp IgogICAgIGlmIFsgISAtZiAiJGluaXRyZCIgXTsgdGhlbgotICAgICAgICBpbml0cmQ9IiQocmVh bHBhdGggLXEgJyR7SU1BR0VfUk9PVEZTfS9ib290L2luaXRyZC5pbWcnKSIKKyAgICAgICAgaW5p dHJkPSIkKHJlYWxwYXRoIC1xICcke0lNQUdFX1JPT1RGU30vYm9vdC9pbml0cmQuaW1nJyB8fCB0 cnVlKSIKICAgICBmaQogICAgIGlmIFsgLWYgIiRpbml0cmQiIF07IHRoZW4KICAgICAgICAgY3Ag LWYgIiRpbml0cmQiICcke0RFUExPWV9ESVJfSU1BR0V9LyR7SU5JVFJEX0lNQUdFfScKZGlmZiAt LWdpdCBhL21ldGEvY2xhc3Nlcy9yb290ZnMuYmJjbGFzcyBiL21ldGEvY2xhc3Nlcy9yb290ZnMu YmJjbGFzcwppbmRleCBkMTlhYzAzLi4wZDE2NzU0IDEwMDY0NAotLS0gYS9tZXRhL2NsYXNzZXMv cm9vdGZzLmJiY2xhc3MKKysrIGIvbWV0YS9jbGFzc2VzL3Jvb3Rmcy5iYmNsYXNzCkBAIC0zMyw2 ICszMyw5IEBAIHJvb3Rmc19kb19tb3VudHNbd2VpZ2h0XSA9ICIzIgogcm9vdGZzX2RvX21vdW50 cygpIHsKICAgICBzdWRvIC1zIDw8J0VPU1VETycKICAgICAgICAgc2V0IC1lCisJZm9yIGkgaW4g ZGV2L3NobSBkZXYvcHRzIHByb2Mgc3lzOyBkbworCQlta2RpciAtcCAnJHtST09URlNESVJ9LyRp JworCWRvbmUKICAgICAgICAgbW91bnRwb2ludCAtcSAnJHtST09URlNESVJ9L2RldicgfHwgXAog ICAgICAgICAgICAgKCBtb3VudCAtbyBiaW5kLHByaXZhdGUgL2RldiAnJHtST09URlNESVJ9L2Rl dicgJiYKICAgICAgICAgICAgICAgbW91bnQgLXQgdG1wZnMgbm9uZSAnJHtST09URlNESVJ9L2Rl di9zaG0nICYmCi0tIAoyLjM0LjEKCg== --000000000000a61c3205ef30e952--