From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6997052726746021888 X-Received: by 2002:a05:6512:702:: with SMTP id b2mr11945317lfs.222.1629128302375; Mon, 16 Aug 2021 08:38:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a592:: with SMTP id m18ls1470742ljp.11.gmail; Mon, 16 Aug 2021 08:38:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEWmEPTDTU2qjCamN+yf6kgcKLv1c7ZxNhontMd7BC5ne+chGTcfOR6J2ZdanvzzIGs8fu X-Received: by 2002:a2e:3c01:: with SMTP id j1mr12852530lja.230.1629128301294; Mon, 16 Aug 2021 08:38:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629128301; cv=none; d=google.com; s=arc-20160816; b=q675kZUDcstJDYmxAm5V2g6gbMeukMcgYRzkwQrnaA3j/9eC40mQa+WWz7Eo8SHb9R gyiRzJsISrb8nKkZ0k7WgbeTuWkmJiGAG3nQStuJTuwBfyUfaIIVJ++++yx72BoDkjiA ctqip4UM9XpcDmbgP5cNDgmW+4MyemVf4FLuwnfvVHSHi0XLb08DGApn3WHwL14tUUwr TRa2lCmyTcNyB6kMchYNGWnaQBSMza1EyPb3shVEv8/QSTRX/YjUnbqigfoHM/sd4o3Z zeruv5aajfjgFnptqcx9crYK0DN1gKwfhNowvrmkewoHT6EAUXnT8TkVQ5bYCBu7Tt9c mhZw== 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=I1mYRdr1wgbDHM9aiKVZOxZVo35WL49sDtXU15SwNJk=; b=rK9u0AuOJhCymlaet76JPNt1XNxUiWXQkFw3ppQ2Ji0mFiRZHRrzcxCA2nKiYvG8qm 1O4FDpV91lM70MOFLPuPt3h3NCe0HNhJDaSosm0lgvMuXokHATObwmlFA1x7tkfEsUcN L32I+AVcPVNiRUqt9dHMEwd/WakGlzmo2g0gOZPPEu/hDjlvLpOV1OizzI6sv57UPPL1 t0JKXk5f+P+rW35KhOlJVjCfGN4mBjduAV37DgqOWqfnqthQm004qtGHd0eiqRQwKCit 86twSJQ4uAI3ln62DPqNbo1m/183jpuFKYZ/daIEan5EqChkUOwWBXC5O7svxk9gpQRw JN2A== 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 t9si192811lfk.1.2021.08.16.08.38.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Aug 2021 08:38:21 -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 17GFc3h0004556 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Aug 2021 17:38:16 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 2/5] dpkg: Limit unmount loop Date: Mon, 16 Aug 2021 18:37:53 +0300 Message-Id: <20210816153756.3549038-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210816153756.3549038-1-amikan@ilbers.de> References: <20210816153756.3549038-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: xgqjHUtKEvrU 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..105a1e6 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 -gt 10000 ]; then + bbfatal "${BUILDROOT}: Couldn't unmount after timeout" fi + i=`expr $i + 1` done sudo rmdir ${BUILDROOT} } -- 2.25.1