From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995134577528274944 X-Received: by 2002:a7b:c106:: with SMTP id w6mr11506697wmi.152.1628704604108; Wed, 11 Aug 2021 10:56:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e5c5:: with SMTP id a5ls1781462wrn.0.gmail; Wed, 11 Aug 2021 10:56:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAvbL72X+QRbcsMHuKbnT2UXTPQGpq2nL5jlXZVSM4fAnNDhpO3tqfVmzoQLlb8V6W5W/r X-Received: by 2002:adf:a3d2:: with SMTP id m18mr3962790wrb.362.1628704602998; Wed, 11 Aug 2021 10:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628704602; cv=none; d=google.com; s=arc-20160816; b=pyJeh/HDM16sP5oahJ/6ks/WwJhLOhacBGVz5/mWPClMd5fcGuNR2MXYXmXww3/I97 VsRXvLFhstQ4jtJ+Ef37hUx/8YWVNPZwCKv2vqj2pKyw99WgGmf7H0l+IZFT4W4vLhph FPYzKA6y59JZKw3Agu7J1S/RFDMZHxyuVE+3GEX2i/hmFy2OAggxmK64HTl2SiQhoX0E AqK1zH9qc2vO/NCEhFOB8ajVnucZFWOcWf+qOoyqpZgS+N/cG5yYasiVscvQAkXmETbv wBpF/Hhf2zCoudFPr8LFnAQXjazYOl7QWwKni8w1EhqR4IUzPW8tBSMDOYot+V4YXBBq IZcw== 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=bKUm2tH28OCZAurzvm+zE6RfJoBBEpuRvHhZJZ466+8=; b=u87JChPS8ccIfW84lAoLq7jW1F6tZfbg+Z9vx05TsBOZv7sCFl7TQBPn18IbmOTfJW UAKzdzKfTwDuicm6Uj0yFsQ8RTaweX33zU2pHuyV4utdRmBHWMPHo7zZ71mCT6cYeCvf xPfLKsnEPbnohDbuDsmkjnJjSKf8TTmSXItqCfbm9LjHS6Ri57Qc4faF/JyAszbrnhho YtCoq4OOEmCEtVabUeJQj5M6RUQiBNa7vnecUGfO5wqVJ+36fPonuz9d/qDdv/VZF7Qc NXLD7abuhHkdB8VqSgQ9jTwEO0LsSZiPM1zp1bmjPjU7HGsi2A3MLEyGbc9MZ182pJn6 jWlw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id l35si6178wms.1.2021.08.11.10.56.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 10:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 17BHug5x006467 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 19:56:42 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17BHufnq018619; Wed, 11 Aug 2021 19:56:42 +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> <20210811191344.14c9703b@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <095cb043-4c80-a1d6-f394-d8d3cbe7999f@siemens.com> Date: Wed, 11 Aug 2021 19:56:41 +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: <20210811191344.14c9703b@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: Kud2co+d8c+V On 11.08.21 19:13, Henning Schild wrote: > 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. Read again (but not the version your client mangled on citing): This is no functional change, just a removal of a no longer needed line wrap. > > That alone calls for a second patch, even if the result will be "hard > to review" again. I'll send v2, but only to bundle all patches - I've two more by now. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux