From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7178866829012500480 X-Received: by 2002:a05:6808:608:b0:35e:8b6f:f6e6 with SMTP id y8-20020a056808060800b0035e8b6ff6e6mr1342863oih.248.1671460187485; Mon, 19 Dec 2022 06:29:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:3742:b0:661:91c7:c50b with SMTP id bm2-20020a056830374200b0066191c7c50bls1534814otb.0.-pod-prod-gmail; Mon, 19 Dec 2022 06:29:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXt7WYeERKDoA2t+mIVI+FOtuxKBvZtHx39eDDoMA81tKynWSliGzx7rIu7oNLSVVTTg1skP X-Received: by 2002:a9d:7cda:0:b0:678:2963:3831 with SMTP id r26-20020a9d7cda000000b0067829633831mr1860271otn.22.1671460186990; Mon, 19 Dec 2022 06:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671460186; cv=none; d=google.com; s=arc-20160816; b=W1FAL+RinajPS7WkuAjxUBFP/E/b7jQzV4y0QCjL9MfOjRrMxSy3ArcyII+oW1yFsX PREr6dUOo2xa2rUwKdSkWxPm/eq8/eciu2AdTuzxkNHC3g2jHFpRhldL4aJ8wt/B0IkJ Vg2NLEHYnAQTClPsv+4Z7ZqYupL7zpXiQZNqNOiXGMUtHG2qHPMGgqjnqyD8/QAFkprc 9DsCoXmTTjvHXKWICP2ihIQo5EjXx94hImZ60kmzBPcCkw4T04MImqcqLNBZFEXl/Q3h g2hPlxGl/gDypHaaOPtsR0ACWyXlc31VMA9PS96kN+1jq5vKnWa1KgNebZ4iHe8obtS9 00Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=hlSzMgda5RLFR8VpIpiuLz9MRIo/FMArxYX1iktDQqo=; b=X/RYkGdjmRHcmZ9XPJusb6ccqisEPrboGByN7PvGmaQu/wPmgEqcvvfI+LzUUhuQvh 9VpVxpgMr5pLLIzpcyMFuZvvJBjBnReam0J2Y1cj0GVuz8MnH7BEo0YW4ciEqcmH6dXo HsfjUwq14tBFDXCOavuyh2D17eCQKvFFZEhl2B4O+2/cnAPOaZEhzmHLY900Vn4q0myq fcW/n7AIvaoIzHxH+pWKGO7MC5uDOgsXhOOQACSceNwjPRRwJF+JkD4qYaJFt9aPGKn1 5LBIp7MZ2jkZ7LaN3xWGfEcyNDYqrK0hkPOxgOaFAK75LE1xYW3IOhXrlKzbgL+fJtW6 ZVAQ== 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 l17-20020a9d1b11000000b0066da9f2faeesi877481otl.0.2022.12.19.06.29.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Dec 2022 06:29:46 -0800 (PST) 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 alena-nb.promwad.com ([194.49.52.147]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BJETfTa029168 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Dec 2022 15:29:44 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/5] dpkg-base: remove deprecated code Date: Mon, 19 Dec 2022 17:29:31 +0300 Message-Id: <20221219142933.12437-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219142933.12437-1-amikan@ilbers.de> References: <20221219142933.12437-1-amikan@ilbers.de> 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: 0opuk7RZAY1A As building of packages was moved to sbuild there is no need in unusable buildroot-related code. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 260aa73e..f2b883a6 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -123,9 +123,6 @@ do_apt_fetch() { addtask apt_fetch do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -# Add dependency from the correct buildchroot: host or target -do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" - # Add dependency from the correct schroot: host or target do_apt_fetch[depends] += "${SCHROOT_DEP}" @@ -188,30 +185,6 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build do_prepare_build[deptask] = "do_deploy_deb" do_prepare_build[depends] = "${SCHROOT_DEP}" -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" - -dpkg_do_mounts() { - mkdir -p ${BUILDROOT} - sudo mount --bind ${WORKDIR} ${BUILDROOT} - - buildchroot_do_mounts -} - -dpkg_undo_mounts() { - i=0 - while ! sudo umount ${BUILDROOT}; do - sleep 0.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} -} - do_prepare_build_append() { # Make a local copy of isar-apt repo that is not affected by other parallel builds mkdir -p ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} -- 2.17.1