Re: [PATCH] isar-bootstrap: Remove obsolete and incorrect skipping of rebuild

[Jan Kiszka <jan.kiszka@siemens.com>]

On 11.08.21 13:52, Henning Schild wrote:
> Am Wed, 11 Aug 2021 13:34:44 +0200
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> 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 <jan.kiszka@siemens.com>
>> ---
>>  .../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