From 0d87a2371269888fdad764a2f5a3756cf917d620 Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Wed, 17 Dec 2025 09:02:24 -0500 Subject: [PATCH] update other dnf callsites to include sslcacert --- src/commands/ext/dnf.rs | 1 + src/commands/ext/install.rs | 1 + src/commands/fetch.rs | 5 +++++ src/commands/install.rs | 2 ++ src/commands/runtime/dnf.rs | 1 + src/commands/sdk/install.rs | 1 + 6 files changed, 11 insertions(+) diff --git a/src/commands/ext/dnf.rs b/src/commands/ext/dnf.rs index 36fa86e..f5d1abb 100644 --- a/src/commands/ext/dnf.rs +++ b/src/commands/ext/dnf.rs @@ -324,6 +324,7 @@ RPM_CONFIGDIR=$AVOCADO_SDK_PREFIX/ext-rpm-config-scripts \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot={installroot} \ --disablerepo=${{AVOCADO_TARGET}}-target-ext \ {dnf_args_str} \ diff --git a/src/commands/ext/install.rs b/src/commands/ext/install.rs index ff8eb5e..1d83ece 100644 --- a/src/commands/ext/install.rs +++ b/src/commands/ext/install.rs @@ -378,6 +378,7 @@ RPM_CONFIGDIR=$AVOCADO_SDK_PREFIX/ext-rpm-config-scripts \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot={} \ --disablerepo=${{AVOCADO_TARGET}}-target-ext \ {} \ diff --git a/src/commands/fetch.rs b/src/commands/fetch.rs index 35dd473..67109d5 100644 --- a/src/commands/fetch.rs +++ b/src/commands/fetch.rs @@ -199,6 +199,7 @@ RPM_CONFIGDIR=$AVOCADO_SDK_PREFIX/ext-rpm-config \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot=$AVOCADO_EXT_SYSROOTS/{extension} \ {dnf_args_str} \ makecache @@ -300,6 +301,7 @@ $DNF_SDK_HOST \ RPM_ETCCONFIGDIR="$DNF_SDK_TARGET_PREFIX" \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot={installroot_path} \ {dnf_args_str} \ makecache @@ -513,6 +515,7 @@ $DNF_SDK_HOST $DNF_SDK_HOST_OPTS $DNF_SDK_HOST_REPO_CONF \ RPM_ETCCONFIGDIR="$DNF_SDK_TARGET_PREFIX" \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot=$AVOCADO_PREFIX/rootfs \ {dnf_args_str} \ makecache @@ -591,6 +594,7 @@ $DNF_SDK_HOST \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot=$AVOCADO_SDK_PREFIX/target-sysroot \ {dnf_args_str} \ makecache @@ -881,6 +885,7 @@ RPM_CONFIGDIR=$AVOCADO_SDK_PREFIX/ext-rpm-config \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot=$AVOCADO_EXT_SYSROOTS/{ext_name} \ {dnf_args_str} \ makecache diff --git a/src/commands/install.rs b/src/commands/install.rs index 3b2a49b..fb89e85 100644 --- a/src/commands/install.rs +++ b/src/commands/install.rs @@ -679,6 +679,7 @@ RPM_CONFIGDIR=$AVOCADO_SDK_PREFIX/ext-rpm-config-scripts \ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot={} \ --disablerepo=${{AVOCADO_TARGET}}-target-ext \ {} \ @@ -833,6 +834,7 @@ RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST \ $DNF_NO_SCRIPTS \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --setopt=persistdir={installroot}/var/lib/extension.d/ \ --installroot={installroot} \ --enablerepo=${{AVOCADO_TARGET}}-target-ext \ diff --git a/src/commands/runtime/dnf.rs b/src/commands/runtime/dnf.rs index 1c9b3c1..4ef18a8 100644 --- a/src/commands/runtime/dnf.rs +++ b/src/commands/runtime/dnf.rs @@ -284,6 +284,7 @@ RPM_ETCCONFIGDIR="$DNF_SDK_TARGET_PREFIX" \ $DNF_SDK_HOST \ $DNF_NO_SCRIPTS \ $DNF_SDK_TARGET_REPO_CONF \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot={installroot} \ --disablerepo=${{AVOCADO_TARGET}}-target-ext \ {dnf_args_str} \ diff --git a/src/commands/sdk/install.rs b/src/commands/sdk/install.rs index 566e8c4..209cbb3 100644 --- a/src/commands/sdk/install.rs +++ b/src/commands/sdk/install.rs @@ -191,6 +191,7 @@ $DNF_SDK_HOST \ r#" RPM_ETCCONFIGDIR=$DNF_SDK_TARGET_PREFIX \ $DNF_SDK_HOST $DNF_NO_SCRIPTS \ + --setopt=sslcacert=${{SSL_CERT_FILE}} \ --installroot {} \ --setopt=install_weak_deps=0 \ --nodocs \