From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6834022395126218752 X-Received: by 2002:a05:651c:88:: with SMTP id 8mr2448451ljq.277.1597129069807; Mon, 10 Aug 2020 23:57:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:60e:: with SMTP id 14ls855859lfg.0.gmail; Mon, 10 Aug 2020 23:57:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrRug//IpG0SaLpmNFyfOJV4inSvLcNZOF5F22VN0ZkCpp3a0ZobOXC9gAtpGyAcGtxO4k X-Received: by 2002:a19:ac02:: with SMTP id g2mr2493999lfc.155.1597129069030; Mon, 10 Aug 2020 23:57:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597129069; cv=none; d=google.com; s=arc-20160816; b=RpqPmUYsynCz0C2S33g5xY9xk30xUsUH5/+TwrAHvsqaUIpNDJojRlz+kMyzvAXT0Z M/T8kOJ6dlfnLy3sMT2gWQBbZhuTyNwJmry+xmEvJoOjC5ilza00YEO8n82shcoyurgN cdaRdYB5ryV3wyBUmNkm/cl2YRgyHNqEZdgBTQhYFFuvJXKm2UyEzaNqZLZScKXtLry/ nDHRWOxIL/0Drgo/2DBTLDKLC2ybRA4fyt0vSokPs1HsRSQqugrzK0FNR+dsUlhJiQ7F oXsJe1dEpRf5gcWFdt3L4YxI2Wj5wvciyS7Wh9KKXuALYyheqXAXDTpXcfRg+QSD3Qhl 8XmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=q0BmjmDc7tXCJ4v1vIa8fXT1nxANN++ZgvKSq+/7DYw=; b=oYRkd4kHi7Nr3GniC2vv1noQljd6FmcOFSyXIy7NvwpHjGKot4VKAYMNY3oXsGkmrP voYOnDtUZgKmbkDUBsXoiUskYwYe66X1zL/wVKsoF54fxAW478KfJeSZa04eL43XPKvW 9K6mNDzfMKSxnpzKTpBlQfHNjEI3tJe7HWE/f6A2fysSY5fm2iaFuL9KPmWTLML3kd7c uzBz5YTkfj3d7vpvnmYRUKE7ip1UNcNnR3kx7SAMIshflIL1jT+DITqfKqRqABiTDdUJ ybOaWU5TUZwvD/Ai3ps2ViTXZXsL6rKx1dpPTzcotOIBQKMsPV6ZowmcJepJEFVIDN7G /7gA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id o13si854539lfc.0.2020.08.10.23.57.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2020 23:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 07B6vlLY028383 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2020 08:57:47 +0200 Received: from [167.87.76.230] ([167.87.76.230]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 07B6vk4w002695; Tue, 11 Aug 2020 08:57:47 +0200 Subject: Re: [PATCH] dpkg-base: Remove newly deployed debs from buildchroots To: Harald Seiler , isar-users References: <2d755c85-4b38-dd1c-7450-d40dd7cda7ce@siemens.com> <197310b499d5b1670c00200ef4d53fc716c5220a.camel@denx.de> From: Jan Kiszka Message-ID: Date: Tue, 11 Aug 2020 08:57:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <197310b499d5b1670c00200ef4d53fc716c5220a.camel@denx.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: AdRYFjRq7qBI On 07.08.20 11:34, Harald Seiler wrote: > 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. > No idea anymore where it came from - and why it worked. I'll send v2. Jan >> + 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 >> -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux