From patchwork Mon Aug 10 23:05:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:ab3:65c3:0:0:0:0:0 with SMTP id m3csp144415lti; Tue, 11 Aug 2020 00:06:02 -0700 (PDT) X-Received: by 2002:a19:be87:: with SMTP id o129mr2508503lff.180.1597129562698; Tue, 11 Aug 2020 00:06:02 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1597129562; cv=pass; d=google.com; s=arc-20160816; b=Ph3OG6hMFNEa3sYiXCOaoAKKFF/IID6IoziYAnHvy2Nb9MEOcZ3L9uVPbEOm05WWAM U99iC8Xp1jp9I5qWT5B5eyrnmT/i2aDxTqgTT4+VXSfZItOEasv7AyoOvQjq7tFfzy+t Vi+64jEExq2JJlrXnb0yrR1w5EOHVcWAxwVepVjrlccxlNNYqam/YRvT0lwPBO8yY9CW U9mqciSkIIWZvkOtKEET0+1SRxwPl/vRFguBHOBejKKltpuNOzFGVkHnFvsNrRJsGJhB Nq/2Zbg8JiksIkPQ3HcASKUKfCas67jwNdLLiiQnD4RnV9ZzrKlDztxuVekXF5JXKJR0 1e9Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=1Q+15ZO9ZOGGUCPdnMRcogNB3oBJPtMwG5GdxhS8X0A=; b=0nFYR9vvGsXhtFCve+TNLLjQvjQIq+CGz5EvFLv3viDovB2yvdPFY3lgKL5kvEWN7c Ol606FEZEMp+k4s3lSjo76dGieOqaTMZ6wSJk7YGCpiOcw9yx9DO5l4Qt4dG5aBD4rXC HSu0hQw8qZNkYEg60L0Zd1EFIPPzYLPQMT1SD7z3lkzhucCXrhoudnHldoSXwRHpzmKI MfDBH4PNBXSOw0Qj2z5cHSus7jpBWaQ7kNrBuHVAk9vhi6F2mogfc7d6dR1hqMzaXRsa 66fAQy0fjrkdphALNTHFoBWgELFvRbvAoBHV2xgO8knezipU94k3CCF+a63xIESJPYTP kBTg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=avS4SqCe; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbwugzh4qkgqehihcrgi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBWUGZH4QKGQEHIHCRGI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id o22sor4763918lff.43.2020.08.11.00.06.02 (Google Transport Security); Tue, 11 Aug 2020 00:06:02 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbwugzh4qkgqehihcrgi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=avS4SqCe; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbwugzh4qkgqehihcrgi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBWUGZH4QKGQEHIHCRGI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1597129562; cv=pass; d=google.com; s=arc-20160816; b=NzqSqpTPawun9NYZFo5z8UDOY4hNsqqMRUyO4Qh/fHpB6eGT+4QEwQkJQDadcFSKkq vPvaSMzkhdLTfqHcnPS5jqvt+7z6urMCSHNCtE3+CGUKVMrJuk3MmOG9YMM4XL/m9omu MIuzAlusd66KXC7NKNG0hnq8vniUkG9GZCAVIyPTaTXVPkiRsy0tXhSjgEqc5bMTAMlS ZjsMwY7z3GM0c/rOYarMh3s7/5ZmNufLddcf/Ci4upas+jSmIqHZn7CnOKEdzXaecMgA gRqbkJlTl9FbMQk778XibFTwmS2XO7P9GshDRXJhqDPGIk0y+L0TOqRxQs60oKxoRAuG 0uag== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=1Q+15ZO9ZOGGUCPdnMRcogNB3oBJPtMwG5GdxhS8X0A=; b=zuIvu9j2VOvmJVNosnPpL2U2qc3q7QxDdxOJWfa5vWKLqMD/pCCxpb1KfqvVgGIYbv HogBV8ByiR3pNRicEFaM1gXnXWvpt9flFSKwSbYKfAfTHMkpszP3DOYDv8ndyBNSIkk0 eYE3aLhx7fD/+W6qz6B8VGzyrbdLXKdHDlhhg+0IsJzmA+bGOo2bgP5AtpCsdDTWg/DE CUuvVDnkBDiN8pWP6NzAvV9bY1M1FRZpk2y9lya9wsVLc2CtSLX2Rnez/4qanwEWgV8b wLDuEjQJ7FkzZMyVJ27sH+lS0ZR33sGSiB3SDOSmnElfYlmOmco8TIM4AeZY+0MH4gs7 5rXg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=1Q+15ZO9ZOGGUCPdnMRcogNB3oBJPtMwG5GdxhS8X0A=; b=avS4SqCeN557AItemwPtSs1BTWgk0K5B2cj6LTbUeLHnnsaFUZTE++A/26aZXZuRER UcyxDHWmYwGhVVxtjsNlXa41NDlNy9jlqZB2jaGkcod9UuTEPblLDh1TdsC1/8ZsgD4/ bWpxffTuhZYzzyKI6decXOEaw7aMFFfuuqkTagLVy+TMAdpRLeQ3BlrfXJTYMErX70nj L/bMvpN4i+MEyVyVAsFfEdFvoPMxNsnKeb51Z+BBT0AbcCxsGUWAFDWqDPVGIgHSC6Mv SZy/LdDRitr0HWTsy3QIOL06VwOYOhh443tkk4KDptDogOW4WeZVcaRVCOcc3D7c6k1Q hv6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:subject:to:cc:message-id:date :user-agent:mime-version:content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=1Q+15ZO9ZOGGUCPdnMRcogNB3oBJPtMwG5GdxhS8X0A=; b=NfUpjpbfALnwFHkRJnmOkdIBsVidPUu9EzveZQSYMycgaEskZT1Y7Eyz8pRp1FBxKA 1LP7uNU1UJmzLx94/JKHRroHnH/9CPbxzPOubjz8NUXWo96dkYZ7Ro8ep5hZ4vO35cxC dyk7qNJacKN5jaCF92+9w92Us2Jvz6G1eMRdu8zjMq/sc9dcrD3O8DyBomy0mn5ygWW6 yOk1CvyiKU/jlQT1UoE2rtiBgzRE39h4wqDH0S6z4lQo/vOz2nhx1efuM8lZFcUjwVeD 8zFzNpqWeRrJ7poX9Mqa13Vk5PeSmcaSFCyJP2fyGxwHrSlmdbk7wi0teAQxun4P8vSP be3A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531ZBwRrCQ9cTfRZrBLHmbxeLRcyL4qT0ojpKejshDoqmzU+O1PW OGBc4/z9zKOlVzp9EQchVI8= X-Google-Smtp-Source: ABdhPJwlUZ/GeTeHXeRmO1iTjBAwC6sDxObC5WJnUuHXpG2nNWDLwmSUkg7NUPxBDd+bMgTX4LkhyQ== X-Received: by 2002:a19:c7d7:: with SMTP id x206mr2498811lff.67.1597129562286; Tue, 11 Aug 2020 00:06:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:294:: with SMTP id b20ls3390760ljo.9.gmail; Tue, 11 Aug 2020 00:06:01 -0700 (PDT) X-Received: by 2002:a2e:920c:: with SMTP id k12mr2442669ljg.29.1597129561575; Tue, 11 Aug 2020 00:06:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597129561; cv=none; d=google.com; s=arc-20160816; b=uotO5eLjODz7LR8nm/9wqoVSN8Ik9Bd4nilI1P6f1xV10s3OnDhhaoVeujrd57DTys UlbuuCSydUFuTam5y9tsqyhUQ1YBrFHLXW43mI+wrSKEUH44v4FY0vqROVVB6Uhx6WOw N3+6jELbaKOvkJXrWM21hmvk5sTrE/0jOC2L7SwXKsWfv/ZwrEctdavgcj8h/iJcPF/Q ZIwRPYeIPeXKtIb7LFpczpb5Mgd9RTRrK1lXmYrmG0rELYLlZRFC2lJZEa2lk8kDezNm SFG/NEwnyVHiQrR73cRLUzkN43FsanEWVAu0SG0gRI+pfdBYQUhEXAWHDeFKTCKOkszn aiTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=wWH5rbqhB1xt4xYmULqvX8+L4c+miOf+Y/Ar/HV0ZMg=; b=ixRd7jyHsUcl49E14Mq2cqMqM4QGMwikVYhvaktYFwZvmVLNUK3TYe9WhdzwdWWzDL f+cRjN3nnQu/Oi9HbXtSVdFcQu3gc0olWFtIuwHPxMJRWGUhW7gsQ98A2mSmUv4YweKG wisGm6UF9dImZmuou1DpelyK0kQMHHn7w2DKYn7PRb8KhLLGIDqDdHggjJHLtn8euBWn FfXMXHN8ftTlKJ9SPUA/SfooF0CmfXQw0HZUhrPDH4WYyQHdZUBZBcQ+H5xWwpm0s6ew OsYp8BYXo6uPGQijbUFkKEYvdNJdVYGbEw7LKK/+dlyrk02osrv4MAB3j1nCvY07Y4s/ YOIA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id c27si1376251ljn.3.2020.08.11.00.06.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2020 00:06:01 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 07B760pD011079 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2020 09:06:00 +0200 Received: from [167.87.76.230] ([167.87.76.230]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 07B760vs010939; Tue, 11 Aug 2020 09:06:00 +0200 From: Jan Kiszka Subject: [PATCH v2] dpkg-base: Remove newly deployed debs from buildchroots To: isar-users Cc: Harald Seiler Message-ID: Date: Tue, 11 Aug 2020 09:05:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Language: en-US X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1674358685107660980?= X-GMAIL-MSGID: =?utf-8?q?1674711728481463705?= 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 Tested-by: Harald Seiler Reviewed-by: Harald Seiler --- 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 }