From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995134577528274944 X-Received: by 2002:ac2:4341:: with SMTP id o1mr25128059lfl.360.1628702027406; Wed, 11 Aug 2021 10:13:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8612:: with SMTP id a18ls554649lji.2.gmail; Wed, 11 Aug 2021 10:13:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4FbKbv+TUXu0tc/Cg2V/DvCzbNZZ3pAite7uNOpLWXzcbx2Mv9GJfWyMcqAtpHaowMdbo X-Received: by 2002:a2e:824e:: with SMTP id j14mr23566427ljh.77.1628702026247; Wed, 11 Aug 2021 10:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628702026; cv=none; d=google.com; s=arc-20160816; b=fwn8E4ZGw3wHCVghxPLoaXKJnB4ho5vLBYpAPvNmBVjAmiUM2G+ViEzsmwYPRgRFMh 01oZYn6BlcLgvoSvRtFcPKygxaxI5zVp/OE4d2L2LGebXEmihU7HltrWgMc28fSpixxN tao3fiVmui1eSAM4co84/iEp8SeUkcZjz59iK9w+F3H4ExvfsCCx7j9kGQVh7+dHLwnj swSOh8RnVkIGGH2WKegT6kNQL5f73+gvi0XcMj6rHImOkkMJPSGGqA1dN3xeQsIQlXtP CAgo+91sx96aJkvfNZ9xc/NQKIVn/obKTdoVRbr+5pVc5AUHqjgjMSJiahNDLg+UupM2 KhFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=uxCYkN0GA8tlJHDGhMqPIi41kqtgC18QGuOR+ub2Q8k=; b=OCDmPCzYKZit15DqRHGiy7qTwjMFNe8o/adFLth2Dz9VOs17Y641eVze9c6Wv+3TB3 HQyLdTeWOUYGTvShK3CBfCbH4Oa6FGcfRoJL2bRMTAUk91V33hBmciYDDrZUE+XxHVej msKZjSovFtcrUibwIYm3PsmUoGvn/R+CjM6tjbqU0qxbvs9fFiArRw+P036ulTr0JNSs 8ZItsIHqGh/A48CrPKF0ryp5g7TbhNyGy8XMx+mR/GjjqtH3gK3rpfpMaqQXm5MYnKT1 ZlJmR8IcjUWV1QofW4XoW4MarY9cOyeO2WzNGTUhbdNziQTRkO6SPTLtGVFiKf7KteQW cPJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@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 p17si1066268lfs.8.2021.08.11.10.13.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 10:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@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 17BHDjjf003605 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 19:13:45 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.5.58]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17BHDjZh025972; Wed, 11 Aug 2021 19:13:45 +0200 Date: Wed, 11 Aug 2021 19:13:44 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] isar-bootstrap: Remove obsolete and incorrect skipping of rebuild Message-ID: <20210811191344.14c9703b@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20210811135255.174166a6@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: +VDsLZap2Rqh Am Wed, 11 Aug 2021 16:41:09 +0200 schrieb Jan Kiszka : > 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 That might just be the culprit. You smuggle in an indent change that has nothing to do with the commit message. That alone calls for a second patch, even if the result will be "hard to review" again. Henning > "${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 >