From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6834022395126218752 X-Received: by 2002:a1c:1f12:: with SMTP id f18mr3012163wmf.66.1597132070155; Tue, 11 Aug 2020 00:47:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a50e:: with SMTP id o14ls944417wme.3.gmail; Tue, 11 Aug 2020 00:47:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKEWiAkEWX6ZyknJF8pgPHYFEYAjToqDCJ1gjCKQlj2cIQDdLHAs0+vPuxJZQktNe56nFV X-Received: by 2002:a1c:2646:: with SMTP id m67mr2926012wmm.137.1597132069617; Tue, 11 Aug 2020 00:47:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597132069; cv=none; d=google.com; s=arc-20160816; b=o2mVH4rYpEFLHBpapOphGbykCL5/UDyEmeAoKMkMS4b3aeMIUfy+Jd6iDTbEqpjxqL puGpmp2hM5++rZyLuOhkCMsWsDUd9vo8rlNSMD76b2afAvZTmLLDfV7p66PNuTUR4i7I EW+DBkdOiMVgNpE0VJrTZoOvg8TPI6mgLNsu7BkTwouFtM3gmZdIhs/QH7SrWgsPmQbI lJenSIuKdmp2kemue/DL+DZnwLQ5Ei0qnDB/HT9BzlTxYvCKVJ1BgUtCLgwP+JPYFCTC FiCTzbYDXjGbl9Mb3Av/G+fk3UOC+ph+j1Z8UviOG846jAkCmC3aqv7tMdEW5g24W4XJ AZug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id; bh=Rw5Hg2leoATTnOnJWjxmoWPMkavjNsvIeCreZ2ckIQY=; b=rl1vba7amGlMPutvhcPFw5yf/4kCP6aVcVynEgb+MV9WXhZkg3ybhp9P8r6ql9DVkn 2+X51WxBZSg6g1tyKL4TJUfw06xMg5enbVG/0hX9HIA0gE03wYvJCelbYkXxZqas9sfS 863fN3Yh/4JsQ11ko/cnldsiYtpYJs6zNZCtV54Qp3AW9NAgxWa4cqB4PAdUCD5KIM2+ 9eWq1r0as+xf6qfAGhf2whgvxSdve93ouClFy1inP4gaj54nnMMrOWeBbi42PvWbavST gMxxJYPZv6yRQibtNgy0yFRvg4WsHs/r3gcO+abD5Eqg3t+pkU8pqvcMerGrvEKcQQOc 1qwA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id z23si98188wml.1.2020.08.11.00.47.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2020 00:47:49 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.9; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4BQlLF2Xckz1qs1B; Tue, 11 Aug 2020 09:47:49 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4BQlLF2K4Sz1qxp8; Tue, 11 Aug 2020 09:47:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id uUVoUawabydZ; Tue, 11 Aug 2020 09:47:48 +0200 (CEST) X-Auth-Info: vm7CmlJLrmEmBdy92iZJgPLHWTKnQDpSgV0ocDUXsN4= Received: from maia.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 11 Aug 2020 09:47:48 +0200 (CEST) Message-ID: <51528dc720315e84e397c3dc3ab0001ab92d846d.camel@denx.de> Subject: Re: [PATCH v2] dpkg-base: Remove newly deployed debs from buildchroots From: Harald Seiler To: Jan Kiszka , isar-users Date: Tue, 11 Aug 2020 09:47:41 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.4 (3.36.4-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUID: 4/mY0Wepv3kv On Tue, 2020-08-11 at 09:05 +0200, Jan Kiszka wrote: > From: Jan Kiszka > > This ensures clean reinstallation after partial rebuilds. > > A typical error pattern so far was that firmware packages pulled by the > buildchroot-target were not updated there on rebuilds, causing the old > firmware being deployed into the image. Tested-by: Harald Seiler Reviewed-by: Harald Seiler > Signed-off-by: Jan Kiszka > --- > > Changes in v2: > - removed bogus -U options which sneaked in from reading the wrong man > page (zypper's apt-get wrapper: -U, --no-clean-deps) > > meta/classes/dpkg-base.bbclass | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 9aa2d546..08880d7d 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -154,20 +154,26 @@ python do_dpkg_build() { > > addtask dpkg_build before do_build > > -CLEANFUNCS += "repo_clean" > +CLEANFUNCS += "deb_clean" > > -repo_clean() { > +deb_clean() { > DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] ) > if [ -n "${DEBS}" ]; then > for d in ${DEBS}; do > repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ > "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" > + package=$(basename "${d}") > + package_remove="/usr/bin/apt-get remove -y ${package%%_*}" > + sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true > + if [ "${BUILDCHROOT_DIR}" != "${BUILDCHROOT_TARGET_DIR}" ]; then > + sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${package_remove} || true > + fi > done > fi > } > > do_deploy_deb() { > - repo_clean > + deb_clean > repo_add_packages "${REPO_ISAR_DIR}"/"${DISTRO}" \ > "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${S}/../*.deb > } > -- > 2.26.2 >