From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995134577528274944 X-Received: by 2002:a1c:7402:: with SMTP id p2mr10479116wmc.111.1628692872035; Wed, 11 Aug 2021 07:41:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fc1:: with SMTP id o1ls3270228wmq.2.canary-gmail; Wed, 11 Aug 2021 07:41:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjSejApifx2qsvawwk3wuF4AyGOJwq5iywQMjPHACtwtYdu4MylQ8Mcg3lTLxydM7TdTpX X-Received: by 2002:a05:600c:3595:: with SMTP id p21mr10191216wmq.43.1628692870848; Wed, 11 Aug 2021 07:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628692870; cv=none; d=google.com; s=arc-20160816; b=ja21wW/ys8DIEjJ3LbQ8kcfn5QvEr6d7nQqn8fEL9nGvkbGeIogaU6nG2ty0kBioJO cnXv/1ekXbomDccj8uDVHQtJ/WxCCIZjXXwnisZXBTBdqFF8fgNRrRemJAf9/szkX7DG FlQ5wg+gDGgIds4T+nnnaisy33YzyrML7nx1JXa+d85xRNv+xKw4T9RxRoZOq0REeDKK rpCUQlyg6PQrVUSF4+f/jObGBQGeAKF3TaDntayfsh5VWHPOdQDU3POgf023nn1lfMgW GyJCeGYqHpwUbRFrLhKneCRqnNFr8JRlvC7i9yDPieNSaBcuv9aEMRjr989JaFabZiHs 5+lQ== 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:cc:to:subject; bh=anQJk7fPdXY5+n5Uoh3wCQqQhOPRhOy5pf4BCw71cP4=; b=EsgsukHl2K1VVxSQ1UmHTE48DfW0UETwtImfWm51lZJuPumrun/CD+1hkKBS0F2emV 3uPVJF9v2xexMyNQyj9Tk0XadEwEUU5nKbEiSWDBszSq15gG9ek8YvkbHplsuMUimW0s ISMAl7eN/3IErv7mdsV6ICTrkw3aT6q27ZGBqoC04xxSD7+Mw9LLZc8HPzZjakcxvGyh UDihcui7hd3XJzQ67GAplENBN0ii70ewKRakoIlVrE0Qv8JnJOhNH0V/ctV3MI8LEVFC GNHtlrHfnIRsQ2mBzBvB0I5bw0vzR3QnitQsSSJsahU4HGdG2mIGWb5gTXFCg2XSnOf6 wZLg== 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 u2si1420336wro.0.2021.08.11.07.41.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 07:41:10 -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 17BEfAdD013219 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 16:41:10 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17BEfAHs029585; Wed, 11 Aug 2021 16:41:10 +0200 Subject: Re: [PATCH] isar-bootstrap: Remove obsolete and incorrect skipping of rebuild To: Henning Schild Cc: isar-users References: <20210811135255.174166a6@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Wed, 11 Aug 2021 16:41:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210811135255.174166a6@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: CkeCI5iLwVVX On 11.08.21 13:52, Henning Schild wrote: > Am Wed, 11 Aug 2021 13:34:44 +0200 > schrieb Jan Kiszka : > >> From: Jan Kiszka >> >> This check dates back to the time isar-bootstrap could have run >> multiple times for the same distro-arch and was lock-protected to >> avoid this. Long history, locks were removed in 1cae951259b3. >> >> Now this check only prevented proper rebuilding when apt sources or >> preferences changed. >> >> Signed-off-by: Jan Kiszka >> --- >> .../isar-bootstrap/isar-bootstrap.inc | 202 >> +++++++++--------- 1 file changed, 100 insertions(+), 102 deletions(-) >> >> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index >> 0edefc5..b858c8c 100644 --- >> a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ >> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -256,125 >> +256,123 @@ isar_bootstrap() { fi >> E="${@ isar_export_proxies(d)}" >> export IS_HOST debootstrap_args E >> - if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then > > Let me guess, you removed that line and the closing "fi", and the rest > is git showing a pretty messy diff on the indentation that came with > things? > > I am almost tempted to ask for two patches ... one that does > "whitespace only" and the other one doing the real work. Because the > diff presented here can not be reviewed. Just apply and do a "git diff -b HEAD^": diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 0edefc5..b858c8c 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -256,7 +256,7 @@ isar_bootstrap() { fi E="${@ isar_export_proxies(d)}" export IS_HOST debootstrap_args E - if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then + sudo rm -rf --one-file-system "${ROOTFSDIR}" if [ "${IS_HOST}" ];then deb_dl_dir_import "${ROOTFSDIR}" "${HOST_DISTRO}" @@ -302,8 +302,7 @@ isar_bootstrap() { install -v -m644 "${APTSRCS}" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" fi - install -v -m644 "${APTSRCS_INIT}" \ - "${ROOTFSDIR}/etc/apt/sources-list" + install -v -m644 "${APTSRCS_INIT}" "${ROOTFSDIR}/etc/apt/sources-list" rm -f "${ROOTFSDIR}/etc/apt/sources.list" rm -rf "${ROOTFSDIR}/var/lib/apt/lists/"* mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" @@ -374,7 +373,6 @@ isar_bootstrap() { # Finalize debootstrap by setting the link in deploy ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" EOSUDO - fi if [ "${IS_HOST}" ];then deb_dl_dir_export "${ROOTFSDIR}" "${HOST_DISTRO}" else Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux