[PATCH 13/13] bootstrap: do not add ca-certificates

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

As we now use the host apt for all operations, there is no need to have
the ca-certificates in the rootfs. Drop it and remove related
infrastructure. If it is desired to have it in the generated rootfs,
just add it using IMAGE_PREINSTALL.

As sbuild might require it (e.g. if the apt sources use https), we just
unconditionally add it.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 .../recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 12 ------------
 .../recipes-devtools/sbuild-chroot/sbuild-chroot.inc |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index 103d03bf..4a99fdb9 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -10,7 +10,6 @@ inherit compat
 inherit deb-dl-dir
 
 DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales"
-DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates"
 
 BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir"
 DEPLOYDIR = "${WORKDIR}/deploy"
@@ -31,17 +30,6 @@ MMOPTS ?= ""
 
 DISTRO_BOOTSTRAP_KEYRING = "${WORKDIR}/distro-keyring.gpg"
 
-def get_distro_have_https_source(d):
-    return any(source[2].startswith("https://") for source in generate_distro_sources(d))
-
-def get_distro_needs_https_support(d):
-    if get_distro_have_https_source(d):
-        return "https-support"
-    else:
-        return ""
-
-OVERRIDES:append = ":${@get_distro_needs_https_support(d)}"
-
 def get_apt_opts(d, param):
     opts = []
     retries = d.getVar('ISAR_APT_RETRIES') or "3"
diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
index 8414f4b8..7ddf7b46 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
@@ -55,6 +55,7 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \
     devscripts \
     equivs \
     apt \
+    ca-certificates \
 "
 
 SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs"
-- 
2.55.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20261002144936.246628-14-felix.moessbauer%40siemens.com.