From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6997052726746021888 X-Received: by 2002:a19:5517:: with SMTP id n23mr23933478lfe.264.1629714248109; Mon, 23 Aug 2021 03:24:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:597:: with SMTP id 145ls2613220ljf.7.gmail; Mon, 23 Aug 2021 03:24:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCJDd+GWvv/fiZeDstr0rBI8C0w2uMr1nkFhg7OQ3ZfPFBjMRzHDJ0oCNTKI9Oe0rXdZGg X-Received: by 2002:a2e:b4a5:: with SMTP id q5mr26606866ljm.11.1629714247064; Mon, 23 Aug 2021 03:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629714247; cv=none; d=google.com; s=arc-20160816; b=dQPSnJ4VPsKleuHkTvuZlFusmGVxy1Gi2KNAHoddNqPk/BzBsoDO/mhkx2/QKepTqH cFVEL81izB5afkbnm6Ueje+3bKshaPP9Wb8DpXmv703oLSWw75cZY5YXn4YSLirNiURz XCs0kdSQEB4ePHxQ3n2tPhzqrmiLevdbdWffQ6CxLDNCubg0zGgAT2cvhF512vWE6c+V ff+triZ1P0QFHUWXxfooNElKvBcKcnw80CkxLboqR1vugm9vQeb1yCwKoj/qjAS28tBf R5saeZNzC8NO7TCEOW8gVCRpnNGTh3Ao4urjlJp6goHRcJHyVaCM9qpTgzRmerly8p+M R9jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=MlJNwOQFxxPIQt3AQ2QIlCwLM/VekoMio8nR3XUkMkU=; b=kJQT08iR4AWv/uy/wgSkidkvEnORapzpvwKk+eXWooPAiefKTfkRQJCApRz8Rl70uW di/F/JZ4VgBzJztgL14SY46ZVL1K8SEAZEwdlJuFMK6Sl5UreVWltgylIQYNSNVMUfqt awRnWoUdv5PzE7TPKj9YITirZ3LMB/HL+fhmLwZMSNa2lzn5fqQDr3kuwRPj2oSq7xn9 YOTllQFvM8Yfisu7x8wp4rtr9TPLU13ZxVs+zl+o9gu6FZm4EAOHASoMTiueeC3rfd65 f5qJMVbZJatJIRJ/YQVXUfPWT5H8VY6wnAu1udwcgRPBz/pyYR8vGp5+SwpS2O/e4syS sYhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z4si72035lfr.2.2021.08.23.03.24.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Aug 2021 03:24:07 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-31-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.31] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17NANo5f001835 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Aug 2021 12:24:01 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 2/6] dpkg: Limit unmount loop Date: Mon, 23 Aug 2021 13:23:38 +0300 Message-Id: <20210823102342.3674387-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210823102342.3674387-1-amikan@ilbers.de> References: <20210823102342.3674387-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: 9oU3lD6cYUxt In the past, unmounting WORKDIR caused infinite looping with the "Couldn't unmount, retrying..." warning if the first linux-mainline task failed and the second one succeeded (it is built for de0-nano-soc-buster and stm32mp15x-buster). This change limits the loop to 1000 s. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 4b189f1..46b9700 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -157,14 +157,16 @@ dpkg_do_mounts() { } dpkg_undo_mounts() { - i=1 + i=0 while ! sudo umount ${BUILDROOT}; do sleep 0.1 - i=`expr $i + 1` - if [ $i -gt 100 ]; then - bbwarn "${BUILDROOT}: Couldn't unmount, retrying..." - i=1 + if [ `expr $i % 100` -eq 0 ] ; then + bbwarn "${BUILDROOT}: Couldn't unmount ($i), retrying..." + fi + if [ $i -ge 10000 ]; then + bbfatal "${BUILDROOT}: Couldn't unmount after timeout" fi + i=`expr $i + 1` done sudo rmdir ${BUILDROOT} } -- 2.25.1