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" From patchwork Sat Feb 5 05:15:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1425 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-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 215FFebD006553 (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-wm1-f63.google.com with SMTP id j18-20020a05600c1c1200b0034aeea95dacsf8864649wms.8 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=eaR/kQzAtNnu6AbbTXa6eDk2ziv2hA5B1Wa8vAKI5r0xsXtsOL9F+dIYL+i1NnzRiB h0XHUtcpCZKHlN46HZSfHhS48UfnQeqyT764qgMn08IPY2P35J0tefsFGRpWbXNLNcbI Ne0Ui1oyXXajr2hkFcy1N13Vci5jQT7mBIuP72WMgJt8T+O6bBrhO33uQxlBW/hsBGih FdNcqTCFLdBam7CCS+2Q4nSpMYpN6olXLWQdF07b53cTFKKhdHqOEV1lkRIRdLdwfvLr Zhy3GWyTyPytiiwleRyil+Xlo+Wy/sZ/4mAmaKTJEe7pBUiLeyT0pVBYO30faFoo3FIX gkWQ== 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=BO5hjwXa8vc9VnMZ29xPAzBh6Pl4gwa5UG9ANohk95w=; b=bTsS8a6uZwh8QHqRB3T3OmOu3oYEzC/xWiZ9QjCDJ8gSfo64BgozWJkCV3pdCps6qe z/9i7+AKX6arUIJMYEo8Zm9dIWZIFlEeeNzmjseuVfI4IfKY0iFXIAcLFm2dCH8l2TjT KLj8BCV3c6wlZk9QJQHBYTPgMPJ1DPHWetLZJHNXonf/gA+crM1wAsGLMQhlMTv5O7z9 urwaWH9F4KaEnyZ3eF+JnrffP6ZgxEeisKsgoOl/beERnUadoAiJCqy/rQLRLXfwBIA4 E+T8J8EmvW5HoXkhAtfn4bHZV8+7Fyn5QLNYwvdlwG1oInz3cevkcXFggc/OU5ajNwri aedA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="NW3/Fo9n"; spf=pass (google.com: domain of fm-52304-2022020515153498a8af114bab37dedd-p_vemm@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153498a8af114bab37dedd-p_vEMM@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=BO5hjwXa8vc9VnMZ29xPAzBh6Pl4gwa5UG9ANohk95w=; b=jP9GHkuUlGmMqVevwU+kU0kiZucgVGr4JM7rGIh6Fv7FydsvDwNLsWPI95O6+tc9Dd sdKx7KfC3R8XX/0wPCNmFVDpHYKvPhNEaUc8aUctwiFqbKHY6EBCJ1fso3gtYut1NZEQ datX2UcxO8ter2QJXr9RwFTO5D96tKkbwOZ42JkTDJiUf04B+6BXRPkkFtUjiUnBDeGM HSiZqmkYOqUQ7VS02hVEY0oUiXS6QoLLpwdyt5AAORzYx1bX/xqtzrJIb7PDbEtMIzAy VkgDDsTZJUN+QpuXUPFy1MikNG7WPAsTLDGsp+BrZas46QZP824j1iuBaTEQWWvDvWPf /hcg== 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=BO5hjwXa8vc9VnMZ29xPAzBh6Pl4gwa5UG9ANohk95w=; b=PylYxfjIvUyiT0y9h7lhj8rVv366tQcSkxB1PpzCjsPONSf+/tayCxpwhbwtnlsjQx erQI1mpWX20RxI/6oN1YQWVU69R4DAqJKqI2mDXSbxw9wlDO4ny04D1/ofPbIDnKMQlK rESmOjAlEBAM+85mFY9ppg21i73H865dHuspABbCX/aTKb1sSjnb4pIt+ap1VOoz0TLs Ms9rfSnfXf9OjadtukGfF0OkU0dtv2EL1dSUnSPDEZcvuqrWLYMsJQE7MH4VeaC6o3Er DrWU3YwaXdVoss3/2y8MRlSTUkZcJ6221fnAgrU1p5jWb3iIfCiqlH51Cukg5KnUZZF7 /UNA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532fUL7z5UowQpgGTx2VeEQ9M3h3c1NdB7Z9RT1zmLNELaFFCEGY TWhTqyXxL+FZDSqDqS28wwM= X-Google-Smtp-Source: ABdhPJyFFgXTP9SxPKHDYJwTnVncHvQSzdPi5edRCenqmc06NjrBfvU1Q4aQ6iLkMyZ38J2C4BpuGw== X-Received: by 2002:a05:6000:2a7:: with SMTP id l7mr3409229wry.170.1644074134993; Sat, 05 Feb 2022 07:15:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4d5:: with SMTP id h21ls74795wrb.1.gmail; Sat, 05 Feb 2022 07:15:34 -0800 (PST) X-Received: by 2002:a5d:6d85:: with SMTP id l5mr831151wrs.129.1644074134256; Sat, 05 Feb 2022 07:15:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644074134; cv=none; d=google.com; s=arc-20160816; b=tICmGP4dLh5wRLjNGSu+5opAnlM2yy9g/k6STAz/LuadRB7WqGK4UFzkL5iERLe1RO FYPYoZEVEm+DFnLOr1spKPiNvkGFnicEJdGzqS5ysQ0tzfnBWABrlPl1z2iN5CYKnirD 0OuF2mtcO0fIIfusVIypv0zdjt1BD7YWV/xvX5B69e9LCTPQz5VD/+NjvMwJaImlkKqh OLZ3NOgBc2hUoXWaq7q4Nl63iiotl5ccVmU4yd1RGx8wH/syb6k/rB0JqjnknVHMMK1Q g1U7OkyIeJ8XSfQsLv0IIVRtvBdrThCsMsN5A/UrE+poehXYOXyVLs5tJoda75c9kVS1 snyg== 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=/2acTX5tkS1fLHFWBD2zFvBdqfHULM+K506KlTIBFqY=; b=bfdaH/OLc5AAohZn9S08brE/eSYdciHeU+nBqQjb6JhYbYKIn8fQwCbwTiXFOKks1K IsSDSJ24KLn8JpAi1Y9gRitq5cXav7ktQAXUlb171zgsu+1AeQ0rOo1Mq0kCwOnGQStV BnEWTcvAXL4ihbicahvPs4s6eZQcP9Gs0IQqZVz7BtAVTCehtirSgvQC+mqRdzykSdI6 E4K1jjH8EJm5Yz8rs2OU/nue5ff9loREb8unBGAMzpF5bnIZoZwp9/85jUgOI6GV6+sG XLW5chEqc3T4r2/0LF/86WJ0erxSguMY53NiEoEeURlFzEv2QPCkoR1ZDHbKBEe6MXXY 7UPA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="NW3/Fo9n"; spf=pass (google.com: domain of fm-52304-2022020515153498a8af114bab37dedd-p_vemm@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153498a8af114bab37dedd-p_vEMM@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id u14si187622wrf.0.2022.02.05.07.15.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 07:15:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-2022020515153498a8af114bab37dedd-p_vemm@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2022020515153498a8af114bab37dedd for ; Sat, 05 Feb 2022 16:15:34 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Jan Kiszka , Srinuvasan A , vijai kumar , Henning Schild Subject: [PATCH 2/4] Revert "deb-dl-dir: Retry downloads 3 times for src files" Date: Sat, 5 Feb 2022 16:15:26 +0100 Message-Id: <20220205151528.9199-3-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="NW3/Fo9n"; spf=pass (google.com: domain of fm-52304-2022020515153498a8af114bab37dedd-p_vemm@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153498a8af114bab37dedd-p_vEMM@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 This reverts commit d1cf0841362f5a9f8c2ab01d7cb084efca641208. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 42542d74ff7b..ffbff0775575 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -57,7 +57,7 @@ debsrc_download() { [ -n "$dscfile" ] && continue sudo -E chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ - sh -c ' mkdir -p "/deb-src/${1}/${2}" && cd "/deb-src/${1}/${2}" && apt-get -y -o Acquire::Retries=3 --download-only --only-source source "$2"="$3" ' download-src "${rootfs_distro}" "${src}" "${version}" + sh -c ' mkdir -p "/deb-src/${1}/${2}" && cd "/deb-src/${1}/${2}" && apt-get -y --download-only --only-source source "$2"="$3" ' download-src "${rootfs_distro}" "${src}" "${version}" done ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock" From patchwork Sat Feb 5 05:15:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1426 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:41 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 215FFe75006556 (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-wm1-f60.google.com with SMTP id l20-20020a05600c1d1400b0035153bf34c3sf8892207wms.2 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=gcwM3+AOuDFR8SZdmv+78aDthdwpOa9YgEIxW+a+VuG/ByfnRT/9jVHuqmYDG0VooI zca+7ZHcJNAfWUuQSBV0NJrICrhndmIFGgbtRXsXF4t7Hdqjwg9CY/ApL1aYw9wZ9kTO C38s4O/UuI1Q/kDa+xpZqNL8DDfBT5gFmVvM5hyzExNMPzq/UxVOAATm8qgFwEBaGOh3 4uVMEAEb2k0WFyENfT55XBFGdCpeE6tnBvjPKFLooDGEOP8IfSftHTZN02id66VTG5U3 8nZMQYb6wSmQFCjk7wf+svhuvtmdpSNZ7YGOoNs8lPhPJhwUlyo8NlsvGDTiYvbGMza3 /VoA== 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=t7kQFzszhUsDxr6cGQHWrfpW/s1Cv/qh0pPlmllqtoI=; b=X5PsmPjaBxy5sLf9dHw8DcroX3+4NR1ZxHX+AXU5SUFdPzgmBWPKUvAElf7SaZicmn T+QzRB15QAiIg+Ff4t2Pn+h2b0dTu1/CTwLqYB93+G+nea0W4hOljbn/+YzQxLD42SUg AXTfRq/hKpN5Nhh7pjUIHdbd103DBYE9UW9pSi55naljPu6XYHNeUmWIGqTKofC9hSdv OI8Js0pNTZcviVRpTTWwvc94y1geyfwfazc3Ont3m/If5/KmyQ3iCrRU12pZUU1L5Vn/ xOk60BV3kwyuphL2K9RW1UTzKF8zVlrpUkwDvb5+u8fu4wlwCd5Y75xhcImoeTm3wmH3 0HDQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ev0hQyGJ; spf=pass (google.com: domain of fm-52304-2022020515153456ad194cc90563d819-ugul21@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153456ad194cc90563d819-UGuL21@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=t7kQFzszhUsDxr6cGQHWrfpW/s1Cv/qh0pPlmllqtoI=; b=dLSGYtF6tlhwO/gnO+IK+lT+eH74bNI/7b54jEqwJmrrZvL0xVCC3WNaWa4ZuyMXpI 5v1fyn7hNul5UZhzERKPTtcBtSetsyjeg/IzJNVUtzA/epPnqg3mN51K0/GRRG19kTTX wBfi/iJRbdpQxOhpHXiGNq6QAwFmSlUyj5N4ie4Ue53L2x2qSaHGy+nvrh/1XrNNkejb h1oDte4N7/aYt2l+0leJQyclzFhNj2t6J9JcJd9As6EvEcfRqXS3q77KpSnrDkuDGUp0 /PdM6EMVmJC7ML1+wcaFCY9xp7SKf6DLz/Th3kqoEQnv8cteBniy8e25dL3keWChg7V1 6Hug== 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=t7kQFzszhUsDxr6cGQHWrfpW/s1Cv/qh0pPlmllqtoI=; b=n74iMbTj3JUJhbeXpUc99DVUc8P3Qo1Z0EsSs913Sqvcj6q4XoAhiDCdwkE3jzq1el G3kPkj9QOyWCMOMxNXS0/JRS5CPLjBmhUsDHY0POuJtBk0XFkjNh06Wowb4AWSNa9RnE EZxPNVVB73eh1LPMjzJc4em0ZIypSf697O+gu2JDMw3RtByF3OfkpQs1qm5RqUERaSZR y5PiVwFc9VS/yfHkkbFg9ZcxPrwvhU2FCp0EAaGNZrnTg8tdxt4qBbVqS5G3sW/sEMy0 KsNi1iDxo3tOs2z0dj17695bjNP9+k+CIAYIDkzJd/GK9r/okHIwrwOzWhqmnh2owJ5h gaRA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530mgBPRKTfpJhgl8yyjYvGHr+RY22DlDB/4WhA2cxxRdUzcSeFR GoVSwE9RfVndYuWl2NzJJS0= X-Google-Smtp-Source: ABdhPJynAgRzK4/H50AuMndhJio9LbHUUYK4RJ2JxQn7bRjTeg3wognJSpmO4CZgk4y7WORyI/N9+w== X-Received: by 2002:adf:fdc8:: with SMTP id i8mr3436191wrs.605.1644074135492; Sat, 05 Feb 2022 07:15:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4d5:: with SMTP id h21ls74813wrb.1.gmail; Sat, 05 Feb 2022 07:15:34 -0800 (PST) X-Received: by 2002:a05:6000:1d90:: with SMTP id bk16mr3316348wrb.217.1644074134881; Sat, 05 Feb 2022 07:15:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644074134; cv=none; d=google.com; s=arc-20160816; b=Uo7rDHcL8WNF+8VxgQo2FM6HL3JFOMViB5ZAEvvufmX1qGHifEAlG06BtqA01O+4kU BoPUF+Y7OAxO6KTL05Crv51KAzscTtVjyCveDzeZqayZiahDtkOygm1P5nEctnLIMj5A +LCdeuAox+iZRDq9zU3fmWod/HrN2cUGK4sc7ifDbDsaIuUZRAr8qtcCb9aK6yizDaKF 66He4BHAGo0nDoS8tS2sh2y6Hs2S6PwTNNJ04GWJ+C65WTI4E9TiQ4xkadX7IN/aIvRt 8znqIhdkhqyP9JvyeVSsN6WkWqPNvd9LGtPSYVreBHYF/NVJDIf4In7s/zifOvQPNmWp Kigw== 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=tsBdkuRjx4GuhhHeKa87HgExs7QZh9Z7DE6d0QAXuWU=; b=q0OKz7kv0ig44Y+v+rUsZCAhQ62aoZKXCihPvBFa7MGcuTf2wYnqlazjNUPAoJ5pPT 24j33X1xtHdVN6uqYqTi4RkdNPKc7qbEkjJ3XeeXIAxDmZL9CmGmNOW1g9eiJjHntGni 5OpQVzW4/Oj5cLX3a+jJ/0R2SNLdQC9gWsHHnMwLyO7UMVG4fLntm6OVfqDosQWqEYFv 0QaQsLyf4RWrsaE5f6G4/Lr/ZVpsdZfqjA7NU5gtYZEjK0shEYZVHABxMaVFWyUSDYiu /jivLJFWnWBmcnEtSiF3x0lhsIuLh5FOZ+ohF8IFBcLc2Jv0l+EX1J6c2ET7ZLQhlBTx ARvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ev0hQyGJ; spf=pass (google.com: domain of fm-52304-2022020515153456ad194cc90563d819-ugul21@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153456ad194cc90563d819-UGuL21@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id u14si187622wrf.0.2022.02.05.07.15.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 07:15:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-2022020515153456ad194cc90563d819-ugul21@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2022020515153456ad194cc90563d819 for ; Sat, 05 Feb 2022 16:15:34 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Jan Kiszka , Srinuvasan A , vijai kumar , Henning Schild Subject: [PATCH 3/4] Revert "rootfs: Retry downloads 3 times" Date: Sat, 5 Feb 2022 16:15:27 +0100 Message-Id: <20220205151528.9199-4-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=ev0hQyGJ; spf=pass (google.com: domain of fm-52304-2022020515153456ad194cc90563d819-ugul21@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-2022020515153456ad194cc90563d819-UGuL21@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 This reverts commit 38160d28730234c482f4698dc8a63c9599914c7d. Signed-off-by: Henning Schild --- meta/classes/rootfs.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index e219be4f8529..766a2170f43b 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -141,7 +141,7 @@ rootfs_install_pkgs_download[weight] = "600" rootfs_install_pkgs_download[isar-apt-lock] = "release-after" rootfs_install_pkgs_download() { sudo -E chroot '${ROOTFSDIR}' \ - /usr/bin/apt-get ${ROOTFS_APT_ARGS} -o Acquire::Retries=3 --download-only ${ROOTFS_PACKAGES} + /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES} } ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT ??= "" From patchwork Sat Feb 5 05:15:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1427 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:41 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f60.google.com (mail-wr1-f60.google.com [209.85.221.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 215FFf7m006557 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 5 Feb 2022 16:15:41 +0100 Received: by mail-wr1-f60.google.com with SMTP id y10-20020adfc7ca000000b001e30ed3a496sf177289wrg.15 for ; Sat, 05 Feb 2022 07:15:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644074136; cv=pass; d=google.com; s=arc-20160816; b=x2c7TlYZGeaFgYuoaIA0CXgAr4u2+aqM++RP1/tlyNpwqQLzw+5jqv4QdlsfWJJZ0r 2LxLjTxIZs3whlyvRK8I8cNguxxWEuXAbVENtuXkbPzCrd6GwYCoo4omRQIrznwPfGRZ Q4KrhjiVRsKapFgyHGvLUvwtf+z/GrJa1bYIfKmzTPfC6JhA6T3FExhQNYlCd6x3MgRX w9R6ZECFalMsLz/+EggoH7TZrzfrxMzzhM1rmk/6Ih7vMNJ50kPIPa+lUq8DOPylq+yr 5P+lNv6LQJvSVucyt1gZMDHovxcjfNrBGRnFxb05BurJfQVtderBfiHi5f9OBgfPj3nS /1Og== 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=6qwevm8azF+/1PtTLOS3uNc8YK5apAjQiwDOoS6Yp2g=; b=FXgyX66FhCKUQj+RaSU8bdd8wnUdBEbVDpfkAqhWVeYILIHMS9o9hixLeZGgGNYXFU +9zOV3jh2x/eV0a09hyZEaiE7VVrP8YXG8NMt5kCkGQn0A7BGIvvggmQHNAobPs7038r /mdrasQCgUxp7e4dIVYuWJONMIQ4xntgpw29Akh5m16eCrQlDBeuiMUBwLzgHmCj9JZX WI4kX9bfnK8fqBdY6/DpRfqtg1Fc4xN6xqezsbV6EYSH7qQQyF2HCgwxXeECzB37KVM5 u5SNFaid+Xg42Mj1MpT8DQZMDCO4X/kgxgMAjWOFWAuAtmWpHEyXAw6DJg2YAAJLyZUC O/nQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=OrdLBwjB; spf=pass (google.com: domain of fm-52304-20220205151535fd0cd0c0788d1085b2-he3ryl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20220205151535fd0cd0c0788d1085b2-hE3rYl@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=6qwevm8azF+/1PtTLOS3uNc8YK5apAjQiwDOoS6Yp2g=; b=fnsEAX3j6aEUbglRt0AuEyu3lZs8SLZJPLodO18BmC2gfqneNwSTBwrOCW+XJD5ag5 gWRtwWK8FKqAoPPp7oENa9IvgNMgpyTdpDzZWzEiQQKyJ24pcwRzoy3h7NIE8d3m2Ymu D5pvQsOHEx6f94enOseYS5lC3jP5GZIfHFE7nnLp34d5Q3I1KamNBkCx2N8rA1URaskA aq/HfwOFjXCEIVnMhCrpZxR4TtPy0u0e0XyFYMwm2Hz1XlK/UNVx3s9co6ZGQC4U8sLA 0n/6vi8wkL+QMGnd6FEsiJTyOlYQUbOBdjv/iw0AMFIdXhaDsRFd9B2Fscov7jtoigiZ cPUQ== 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=6qwevm8azF+/1PtTLOS3uNc8YK5apAjQiwDOoS6Yp2g=; b=K8YoS+qpLItp0OCxBvDSMhfT368cIiZBjMQTLGhmB6Qdco+FvlcUFyfqXFkddD+7nP s67d6Od1sNhMunMBJsAAjsfx56GFoiZFd3MN1euujIP4kh8ztY5RbVUDc4xYibNIj0fY dHUkbuM68C3dTbnAzLfEaZC64XEslbilPH2Sk4LIAc8w5l2UIIpPszDINEtlNf9rTX/e SmOdQ6TR7xGD7xCnAdaHWCtyhh+hWJk95oCt2wbd0996Xef4qpuRNNcnkKptF5ql3eWc 7ccFao8LRDMWYkGyuJIBkvEsLkoPxU+jPusBfQP8cDD53eMfVf41kq2oNst3DIICZV0w K86g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532gzkuAk+d16ejCFdmy1rEICK5NbmAsT12kVCA/Jn+VnUYem+rG kQhL2qEGLGdHRbOr9Ie62+Q= X-Google-Smtp-Source: ABdhPJzlJMMqmioSdZ91cWC06t2nHgvroow7QKHKwxnX9a4ce+I8eXR+akxIUvdqFEroSXMRAYRWcw== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr3491050wrz.500.1644074136111; Sat, 05 Feb 2022 07:15:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4d5:: with SMTP id h21ls74835wrb.1.gmail; Sat, 05 Feb 2022 07:15:35 -0800 (PST) X-Received: by 2002:a5d:408c:: with SMTP id o12mr3319763wrp.72.1644074135449; Sat, 05 Feb 2022 07:15:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644074135; cv=none; d=google.com; s=arc-20160816; b=SwQzh93/MctenpjO3/H2WdLS+HRP+Zm/R74OXzy+ZB+cjMMmI3wch6ndZPw7rVZQuD Q1IHBanHynAL2MIIA4eFAFIurk8SpVm6TqA9WpqjcuC+ihT43FEul0W4HP/sJTQyG/WS b3MJBRatmg/z/LYrmyKEJpCtv+oEfJlNjYHUtC5B/DQUs2j9h9Rl5cHdcyc3RfOkLbIf j8U1jLvvZ2e5B8NipprqQhA48NZWiDCC77NwjFJUM6z8qaPXbeiRVKYBKwhzEs3NIv0Z WsfPjmcAxZaP8Z+nD0+nDM6b9dbwUCruGHG1ibL9CIdOrQET78S385z7dcFCAwzvMnTL Cd4g== 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=98yAoo8mgIOfZtaAvKQdDMNN9h7E/q8kRV0dUV3yRp0=; b=jM/ZlU3OTUXJ0cU9N/k7fJcB0Olb1S2qrurfZrjTYd61viRkhnbmK2VIDud5GM2CJ1 xAS7dJxrqBSgHc0uxPtIOB/eF9Eo7Dzhmgzr+d4y0U+GlJNg4E3qHmlpP6XUZ2nTdgCs LGIdBKnbc9UeQ42+b6Xf+MarJJYp7/oIZb5YHgLUdL7akynhHDIil3jf9Rpf8Z9JP6qS lrfxH/Igcwou13UN1Wqd4j8mnDry+u1vMzD/Ob5aWImTi3qFKR0YR5mg3Q3qQhFQ8EmM awBYaHlr3FAqr96c8u0FR8e6n+W6IEMMKFHEQRYLdMmjaSDQxc4bjlLE6N1/iMMxm5N0 ZqxA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=OrdLBwjB; spf=pass (google.com: domain of fm-52304-20220205151535fd0cd0c0788d1085b2-he3ryl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20220205151535fd0cd0c0788d1085b2-hE3rYl@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id u14si187622wrf.0.2022.02.05.07.15.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Feb 2022 07:15:35 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20220205151535fd0cd0c0788d1085b2-he3ryl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220205151535fd0cd0c0788d1085b2 for ; Sat, 05 Feb 2022 16:15:35 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Jan Kiszka , Srinuvasan A , vijai kumar , Henning Schild Subject: [PATCH 4/4] bootstrap: do not leave 50isar.conf in final rootfss Date: Sat, 5 Feb 2022 16:15:28 +0100 Message-Id: <20220205151528.9199-5-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=OrdLBwjB; spf=pass (google.com: domain of fm-52304-20220205151535fd0cd0c0788d1085b2-he3ryl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20220205151535fd0cd0c0788d1085b2-hE3rYl@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 This commits makes sure we do not leave a file around which is really only meant for building. In case people will want to "apt-get" later they might have their own ideas on how to deal with Recommends and Suggests. And if so they should write a package to configure apt for their images. So it cleans up a file not owned by any package, and unifies the way apt configuration for the build is done. Signed-off-by: Henning Schild --- meta/classes/image.bbclass | 2 +- meta/classes/rootfs.bbclass | 7 +++++-- meta/recipes-core/isar-bootstrap/files/isar-apt.conf | 2 -- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 +---- 4 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 meta/recipes-core/isar-bootstrap/files/isar-apt.conf diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9d783d80a228..d44298bcdd7c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -221,7 +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" + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" 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 766a2170f43b..e8649975a333 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -105,8 +105,11 @@ rootfs_configure_apt() { set -e mkdir -p '${ROOTFSDIR}/etc/apt/apt.conf.d' - echo 'APT::Acquire::Retries "3";' > \ - '${ROOTFSDIR}/etc/apt/apt.conf.d/80isar' + { + echo 'APT::Acquire::Retries "3";' + echo 'APT::Install-Recommends "0";' + echo 'APT::Install-Suggests "0";' + } > '${ROOTFSDIR}/etc/apt/apt.conf.d/50isar' EOSUDO } diff --git a/meta/recipes-core/isar-bootstrap/files/isar-apt.conf b/meta/recipes-core/isar-bootstrap/files/isar-apt.conf deleted file mode 100644 index a62feb1722d6..000000000000 --- a/meta/recipes-core/isar-bootstrap/files/isar-apt.conf +++ /dev/null @@ -1,2 +0,0 @@ -APT::Install-Recommends "0"; -APT::Install-Suggests "0"; diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 26205192ed9e..2f483f5a1b6a 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -9,7 +9,6 @@ LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" FILESPATH_prepend := "${THISDIR}/files:" SRC_URI = " \ - file://isar-apt.conf \ file://isar-apt-fallback.conf \ file://locale \ file://chroot-setup.sh" @@ -327,9 +326,6 @@ do_bootstrap() { 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" - install -v -m644 "${WORKDIR}/isar-apt.conf" \ - "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" find ${APT_KEYS_DIR}/ -type f | while read keyfile do MY_GPGHOME="$(chroot "${ROOTFSDIR}" mktemp -d /tmp/gpghomeXXXXXXXXXX)" @@ -348,6 +344,7 @@ do_bootstrap() { done if [ "${@get_distro_suite(d)}" = "stretch" ] && [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then + mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \ "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" fi