From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6997052726746021888 X-Received: by 2002:ac2:4119:: with SMTP id b25mr2357373lfi.284.1629203910292; Tue, 17 Aug 2021 05:38:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls1351544lfi.2.gmail; Tue, 17 Aug 2021 05:38:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIen2IGcU1tVVeJNyg56dNOasNNVNrHw1gIzgUAclZVudya+A1PGiCJWLY3+9JxWZg9x/V X-Received: by 2002:a05:6512:a90:: with SMTP id m16mr2175417lfu.349.1629203909167; Tue, 17 Aug 2021 05:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629203909; cv=none; d=google.com; s=arc-20160816; b=iHMlALpwQH2Nkeq3R7wT7+jxORU4UH9WKvU8wzsH3ZDT0T2jjugxEuhT9yH65eVa85 wlUjIjcvP8NfSUQB+GZlwkW/QIF6eSdo/qg9CnFdawf3xvNKQyoIiYMBFvjDoo3iItIW m9Fe+f5zJ0YlMdxtXJrGXPcewZiiTe+CRzxTtgAbEMeeke+QEm3hlu/y+qSYDGmx7EKt d4PzfC6RHvk6ak2y+QhhcrQFnU6nnBRwty4SCIzcm9PSIijk3Bk7uLij/HOuEd2xY+bY CXxbH1UhVKyj24Wj2nYG7YmnLnECaYyUQ7LD7OFfR3bzVy1bDNJIU4R+8vA1M2xc/elI QUQw== 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=v6cSmdXbLcoq307LZN54215eLu+lYpFSaLDW1a271aVTg+L2uipzUKbxemtg2ajBLr RpUbnBA6hD688xTdeCNUATMRYABV3VKQI2f2ROHlcvr+Wpsb3IQc/3LYOqmAYDG2Fedl JACsu3pziVu7tkhwhtKGWgT9AuKTsDbkNHUmfOs7Fytuw2AoJ6WPLU/d45I8n7PNQHZL +PSRXRN0740dCisvpOwlb8LxPGXVJios+JwovHnC4EoGOWTPkHBJJeyDdePPNMblvqwG wDtox0w8xcxt/E1nokKdlmHrqbRME3RNRqOan/wZKmzj9jssDuOIWjni3wewGaZaIVcb ZxhQ== 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 q8si111626ljm.2.2021.08.17.05.38.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Aug 2021 05:38:29 -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-146-26-214-37.mgts.dynamic.pppoe.byfly.by [37.214.26.146] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17HCcFsP008270 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Aug 2021 14:38:24 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 2/5] dpkg: Limit unmount loop Date: Tue, 17 Aug 2021 15:38:05 +0300 Message-Id: <20210817123808.3563834-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817123808.3563834-1-amikan@ilbers.de> References: <20210817123808.3563834-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: cFCSFnis6229 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