From patchwork Sat Feb 5 05:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1424 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Sat, 05 Feb 2022 16:15:40 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f62.google.com (mail-ed1-f62.google.com [209.85.208.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 215FFea0006550 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 5 Feb 2022 16:15:40 +0100 Received: by mail-ed1-f62.google.com with SMTP id i22-20020a0564020f1600b00407b56326a2sf4793557eda.18 for ; Sat, 05 Feb 2022 07:15:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644074135; cv=pass; d=google.com; s=arc-20160816; b=uqPRL1UV/Zpd+3rYTD6xju9AUKlqcKcHgQ779uLqeMq6r3WUKO8UD/HwOd7Nmy/VtK MlaYAgH2OwQ+FjklwGd7ET3OaZP4+2StL+hx1425dX/LtxN6hKaodhzFS6QChl6teLEi dNjgK3o8U4WNwbKDrRIWmkeXB6wENPd5TqkUtj7ZpWiLjv+3/ORz2K1JBaFTaBk1Knh8 lBv2/MmRRrLTBhhS/nUidIljmpk5tLec8P9oASuJhO4CUQAE+TbHkOi67L7iai+Nl9eF jUNyEAYviSss8uHbppCa91yQOWf1xpRWI9x/zPDe/R22NmB/31i9z29oPlnIqBGpzL2R YRxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=B07dNAJt2V6D2GbjAGWGeSs8f0WOMgofPInu9VhlKZU=; b=Z+dX36eCGWDoE0Xm0DgpjKVs/YrTgOLXklLkSPsMlr0HCfynre5DtfxlDhrEiKWeBh cRV2MEilS+Va2QRmoHVZy0vCakycPyVtOTPeShsh0Ay9+eB1WgLNio3w6CPG/kaNBOXg V1r8RJK0YLCKDYxVoCoQqwC5LdJYaWK8Nw3ITcHpJb1oDYR+SNvWO0wrIOPRQ4/WW/51 4jz5LI39658MwJo3P2kydZB2/mxpkEIflr3+Fr6xgtA9UIyl5QlLcTpq21Yd0bNxZg3f gefZ5USiagKYr5zZg/3e8xowX0x32Jv27JdWpW7LLNNVnfg/DmscWVUgIw0fcTMW7Cvx FEdg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=B07dNAJt2V6D2GbjAGWGeSs8f0WOMgofPInu9VhlKZU=; b=qz/cGElH9586xrlV2PGDiGEo2hD7p9Y1OUcCLgCDoylJlhlx0Ift0IkTw3iySvZM/a 2WhZ0fB5pdp1VtX1XyMfzZuc82LaWVZGGqjKi15Z0HCxbWCmF45hbGbYWiC2kyR4RbSe UwYdn3ukX9+RuV2VA54Qluv4R+bvagO4BZ5bJlErEBMWrZxmsMRuB/7YvpPeo2oq4NLI 7LyW4qtQXcceIXANzzGBcNfKo74xtk3OJzta86aiXbjQvQmzoP2olPB2Q3oO8qx7f9gE ehNzxWyXBvy7B8V5vj/ahAON8ScuR7RwZLkm29D+bujcNkiTAqJOL8RYMFtHRPOLboxU W/Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=B07dNAJt2V6D2GbjAGWGeSs8f0WOMgofPInu9VhlKZU=; b=Mtr1Lid1LZGs4vcNwU0Y/760J279D6dqs30mBkuyUkRizVc7wd1lBaXmRyJqxMzNz5 9NmcVed+IVyo5kEWVyFBNLCELNHcDFK+Q7b5pD4L0C2nshQeYcNVk5YD+jqnkH8KbmCf ROk5zyIADBseBdhJDpzzlVoRoUaaDN5if+QDodk1MjsqZGJ75WiGxXa/FEd7aJSdfs67 ngQs1lyxXGpJTxByisWQQ4YE957TiCNj0LvvlhLkHOh+Km5aQHrWRzJ5RiGgeSPghO/Q 5zTuJjEtcNqkQ2W8Q/OhbwNYyO4kZHl1lv/e4s1d/75qHYfZCPxHETwG4k0l8O5NEdvm tOWg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531pvNoI/VrLxY31h+CpplzUpRB6v/3b4wPLtOPLBY+PtgpOhbcx WNF4dQ50dQnsE7ve1ka1dog= X-Google-Smtp-Source: ABdhPJw3VWJOvocHgHcyhCatzvH+cPd9HDxlZUQYfjLndxQK8Myzy1CMlJWkdui2zw+gc+RVroMkpg== X-Received: by 2002:a17:907:6e1f:: with SMTP id sd31mr3511253ejc.286.1644074134803; 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-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 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; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202202051515338f6cdbd4cf214e1f51 for ; Sat, 05 Feb 2022 16:15:33 +0100 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX 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"