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