From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7061244639032901632 X-Received: by 2002:a5d:4349:: with SMTP id u9mr3598931wrr.158.1644074136198; 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-Google-Smtp-Source: ABdhPJw7XkvJd8YDnyrR1VDQ2reLB92+8v91s0fMZLl/VzoAsmCrmpLUmj0dLiyMftURGAwZ3OL2 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 Return-Path: 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; 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 Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220205151535fd0cd0c0788d1085b2 for ; Sat, 05 Feb 2022 16:15:35 +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=98yAoo8mgIOfZtaAvKQdDMNN9h7E/q8kRV0dUV3yRp0=; b=OrdLBwjBVfl09hB49WV1lpHQRHLM5uTOibq/feXCct6pQJALFHhmvW2roHVZepAtPBcvId onk7U/gjzs1vfhu0vptzwFIFK6XFIwEkyVLvayqLBgslpuEtZgQWecYSu0adDuSffolbHCnA zHtrAULMKVBLLU0YnzgbfFVdXr2iw=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-TUID: OAXFqu1ycnLT 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 -- 2.34.1