From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6834022395126218752 X-Received: by 2002:adf:a195:: with SMTP id u21mr11993898wru.296.1596792873030; Fri, 07 Aug 2020 02:34:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2356:: with SMTP id j83ls1206153wmj.1.canary-gmail; Fri, 07 Aug 2020 02:34:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8r2LrENSLcxOav9SXs2SmfyAS+2ej1GwTZjjHhpox/scnFcEYvxjpWkIDkdbC16ZXI1VD X-Received: by 2002:a7b:c194:: with SMTP id y20mr12542408wmi.183.1596792872475; Fri, 07 Aug 2020 02:34:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596792872; cv=none; d=google.com; s=arc-20160816; b=TszFXdc3yamP9u01ALVEkIY40pVpiZt6BMTHPSBVlGV7WaOTI2nvOvxvOhEW+NIQya nHPL61hB5imOqwxIcyc62POxCz6/HEM8QbxMj9JI3SO+Ifkq6aBemsrkPIvzf+h1S6bT +Log7ljY6KhhJ4JIlmsDpRcsHew7Rn0yd5dULejxhVWAsBHN15Rxs6QjKWMTUccAYfbV xL1ezoXG5X1DrfhzbromMGbqOGCykBXngjCJBLaW6rd+F84S+OUrItvn1jlF0IFLpwWz FdALyI/T4y71wIFzD8eZGAjoJsGb/bnl+EzKil7JEVIdEScrgLnw5pAj7PSuGgavTru1 bQGw== 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=D9vAtrl9NUmou5m4Lhj7KDvL62xrHD+SXbHSxWEJ3vU=; b=vX1LeZN+F4mJY7o6YdmR9h6fVlsPaYoXrxf/kWzzeGKwVeZuBUS6cyl0rNRk61F4HL hVVyzUcET5kQek5cc45p8oNJP02QXpDgX0saxOCfKnNhVSLZytmp5mg9JWnjriSwc1Hk plBDa4NLonQgi4B1Wq3m3zVPEofgUQ5XoZUqdH+53ZXWZWY92f3cCzT1SMvYpnjk14rS 2zLgkv0qrYhMIn3lUWabUI0BsIO9cRKEIzex0oF4R9FkXUS4cywUBIxP6j8iJhqhHvTg M6olGho1JoB8c8rMDXAsj6sONDShH7OhFxp1O2P5/1prFdGKOo8k4GwZm8SjP/trMhZh Xyig== 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 92si236229wre.0.2020.08.07.02.34.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2020 02:34:32 -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 4BNKvD1yQyz1qs10; Fri, 7 Aug 2020 11:34:32 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4BNKvD1cshz1qvJB; Fri, 7 Aug 2020 11:34:32 +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 k7bYCkPGQufC; Fri, 7 Aug 2020 11:34:31 +0200 (CEST) X-Auth-Info: rnoaeE7Veylcr31dJjY79w2d7IqBV56wCQl9ybiZU0s= 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; Fri, 7 Aug 2020 11:34:31 +0200 (CEST) Message-ID: <197310b499d5b1670c00200ef4d53fc716c5220a.camel@denx.de> Subject: Re: [PATCH] dpkg-base: Remove newly deployed debs from buildchroots From: Harald Seiler To: Jan Kiszka , isar-users Date: Fri, 07 Aug 2020 11:34:21 +0200 In-Reply-To: <2d755c85-4b38-dd1c-7450-d40dd7cda7ce@siemens.com> References: <2d755c85-4b38-dd1c-7450-d40dd7cda7ce@siemens.com> 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: /3uEE/MHLTDJ Hi Jan, after wasting way too much time hunting another bug that turned out to be caused by the bootloader not getting updated, I gave this patch another try. It works as intended, I just had to fix one small issue. See below. On Wed, 2020-06-03 at 09:37 +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. > > Signed-off-by: Jan Kiszka > --- > 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..80da713d 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 -U ${package%%_*}" I had to remove -U here. Not sure what it was for, I can't find any documentation about this switch. > + 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 > -- Harald DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-62 Fax: +49-8142-66989-80 Email: hws@denx.de