From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7061244639032901632 X-Received: by 2002:a50:ab10:: with SMTP id s16mr4838321edc.382.1644074134899; Sat, 05 Feb 2022 07:15:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:1c0c:: with SMTP id nc12ls930747ejc.5.gmail; Sat, 05 Feb 2022 07:15:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4Im8r16LnKfDHikehuIODJH3mj+4ZJmbSMA7xJ4E1pFIp07QAQ9X0C/V22YviXV0KvpMr X-Received: by 2002:a17:907:d86:: with SMTP id go6mr3430249ejc.482.1644074133960; Sat, 05 Feb 2022 07:15:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644074133; cv=none; d=google.com; s=arc-20160816; b=qeNy3mUb9N21CmOFnvrfizKDQUndlY98QOQPwxHO6Uti29fpUvmqLbCGo5YozABnlS deJT1/eRWKuOZdoD89y5IdvfPQRiz43FMs/l22y9cZOYSEgUopHYme7YLN7n74eormct vv11Krle/eytK+SiyfUl6BLG7V8pzNYVjnysrcSOB8jJyeP1+SRaAfPbddJrc3tGVG/6 iyxNOlUjsaYwabXmuTzv/ZKE3Gf8JawryJWph28+X5MU3Mq4zFqck9fSU5lFgWNFSDdn pAOYt3Dh5ETGOiRlIskce7YBc2z7EulM1UYkNXxPBPfZ79Jpz9oGm9x9rfb/O6DwcaxB +ITA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=dO6+OFEWyiaHUjQ6sdx7HDdeWEQSCv9JJACiG+wh6WM=; b=OQfwfe+3OSLx429jkxKHQ2aQO2k/7Xi/z2aAqghIeCeeLMtduZBL8Y0B9LKcpzRxqp h7s85yf03Ttsh90Kx4Ss0/M42vei/JCHCQR+dmz2MEF4B+C9du/l9SqRZH6elRWZyBFa 4ZdWi4Ty6Jvr5Cmw3qljiwvZ8/q8iqo29MQ7Kl/Dsg1NLfLNnlfYPgOtQ9MPZfmRqJN/ B+SjTnjdHNwtvRk2wU2JQ4cIoeZIS4d5f0oeAcNuM7v1Eo5Sv25awiHgT4udHPA0vkJo ntHZSbyGUVtINqTp2GGB9T7FEmDkN+7LZRdZ6eiHaL13kR7h7OV/2uaahkuWKqyyaKeH VkLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Th9w2F+x; spf=pass (google.com: domain of fm-52304-202202051515338f6cdbd4cf214e1f51-o4zt5i@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202202051515338f6cdbd4cf214e1f51-O4ZT5I@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id y8si11363edc.0.2022.02.05.07.15.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 07:15:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202202051515338f6cdbd4cf214e1f51-o4zt5i@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Th9w2F+x; spf=pass (google.com: domain of fm-52304-202202051515338f6cdbd4cf214e1f51-o4zt5i@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202202051515338f6cdbd4cf214e1f51-O4ZT5I@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202202051515338f6cdbd4cf214e1f51 for ; Sat, 05 Feb 2022 16:15:33 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=henning.schild@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=dO6+OFEWyiaHUjQ6sdx7HDdeWEQSCv9JJACiG+wh6WM=; b=Th9w2F+xFqNGi7q8WE77PKmN78z9uW12lhOYaC7r/qx+dtcvsSnNdr8ZFHJOkfCku4Oh8v qTtRVRiam1e0bhHGeU/j0r9MzlY1DyFmaJYFoz3wcP2rAUMpYnkse+wHk5xLOORTABaehlVK 15Ck9qMXbf47f3vUE8ut9xh9hhDKs=; From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Jan Kiszka , Srinuvasan A , vijai kumar , Henning Schild Subject: [PATCH 1/4] rootfs: configure apt to always retry downloads Date: Sat, 5 Feb 2022 16:15:25 +0100 Message-Id: <20220205151528.9199-2-henning.schild@siemens.com> In-Reply-To: <20220205151528.9199-1-henning.schild@siemens.com> References: <20220205151528.9199-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-TUID: +3kGKUBxJAvM Let us stop the bit by bit micro fixes and have a central place for everything "apt". To deal with download retries in case of network issues. Signed-off-by: Henning Schild --- meta/classes/image.bbclass | 1 + meta/classes/rootfs.bbclass | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6d77243cb1b1..9d783d80a228 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -221,6 +221,7 @@ do_rootfs_finalize() { rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/80isar" mv "${ROOTFSDIR}/etc/apt/sources-list" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 1fc487896f4d..e219be4f8529 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -98,6 +98,19 @@ EOF EOSUDO } +ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_apt" +rootfs_configure_apt[weight] = "2" +rootfs_configure_apt() { + sudo -s <<'EOSUDO' + set -e + + mkdir -p '${ROOTFSDIR}/etc/apt/apt.conf.d' + echo 'APT::Acquire::Retries "3";' > \ + '${ROOTFSDIR}/etc/apt/apt.conf.d/80isar' +EOSUDO +} + + ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" rootfs_install_pkgs_update[isar-apt-lock] = "acquire-before" -- 2.34.1