| Message ID | 20260218083026.3265676-1-felix.moessbauer@siemens.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] refactor: drop useless sudo from do_generate_keyrings | expand |
On 18.02.26 09:30, 'Felix Moessbauer' via isar-users wrote: > This task does not execute sudo, so we don't need to set the > corresponding bitbake hint. > You should also argue whether the does does no networking - because that is what <task>[network] = "${TASK_USE_SUDO}" means as well. Jan > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > index d5bbae70..9b4f62df 100644 > --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > @@ -51,7 +51,6 @@ def get_apt_opts(d, param): > do_generate_keyrings[cleandirs] = "${WORKDIR}/trusted.gpg.d" > do_generate_keyrings[dirs] = "${DEBDIR}" > do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" > -do_generate_keyrings[network] = "${TASK_USE_SUDO}" > do_generate_keyrings() { > export GNUPGHOME="$(mktemp -td gpghomeXXXXXXXXXX)" > if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then
On 18.02.26 10:18, 'Jan Kiszka' via isar-users wrote: > On 18.02.26 09:30, 'Felix Moessbauer' via isar-users wrote: >> This task does not execute sudo, so we don't need to set the >> corresponding bitbake hint. >> > > You should also argue whether the does does no networking - because that > is what <task>[network] = "${TASK_USE_SUDO}" means as well. > ...which it never did. The USE_SUDO actually dates back to "sudo apt-key add", and that was changed via 9ae41e0325fd7ba64a0517c34976738d6c5bf81f. Please clarify the history. Jan > Jan > >> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> >> --- >> meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc >> index d5bbae70..9b4f62df 100644 >> --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc >> +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc >> @@ -51,7 +51,6 @@ def get_apt_opts(d, param): >> do_generate_keyrings[cleandirs] = "${WORKDIR}/trusted.gpg.d" >> do_generate_keyrings[dirs] = "${DEBDIR}" >> do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" >> -do_generate_keyrings[network] = "${TASK_USE_SUDO}" >> do_generate_keyrings() { >> export GNUPGHOME="$(mktemp -td gpghomeXXXXXXXXXX)" >> if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then > >
On Wed, 2026-02-18 at 10:22 +0100, Jan Kiszka wrote: > On 18.02.26 10:18, 'Jan Kiszka' via isar-users wrote: > > On 18.02.26 09:30, 'Felix Moessbauer' via isar-users wrote: > > > This task does not execute sudo, so we don't need to set the > > > corresponding bitbake hint. > > > > > > > You should also argue whether the does does no networking - because that > > is what <task>[network] = "${TASK_USE_SUDO}" means as well. Yes, but this is an implementation detail. If it needs network, the variable should be ${TASK_USE_NETWORK}. That's why we introduced these variables in the first place instead of simply using [network]="1". > > > > ...which it never did. The USE_SUDO actually dates back to "sudo apt-key > add", and that was changed via 9ae41e0325fd7ba64a0517c34976738d6c5bf81f. > Please clarify the history. Will do in a v2. Felix > > Jan > > > Jan > > > > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > > > --- > > > meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > > > index d5bbae70..9b4f62df 100644 > > > --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > > > +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc > > > @@ -51,7 +51,6 @@ def get_apt_opts(d, param): > > > do_generate_keyrings[cleandirs] = "${WORKDIR}/trusted.gpg.d" > > > do_generate_keyrings[dirs] = "${DEBDIR}" > > > do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" > > > -do_generate_keyrings[network] = "${TASK_USE_SUDO}" > > > do_generate_keyrings() { > > > export GNUPGHOME="$(mktemp -td gpghomeXXXXXXXXXX)" > > > if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then > > > > > > -- > Siemens AG, Foundational Technologies > Linux Expert Center
diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index d5bbae70..9b4f62df 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -51,7 +51,6 @@ def get_apt_opts(d, param): do_generate_keyrings[cleandirs] = "${WORKDIR}/trusted.gpg.d" do_generate_keyrings[dirs] = "${DEBDIR}" do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" -do_generate_keyrings[network] = "${TASK_USE_SUDO}" do_generate_keyrings() { export GNUPGHOME="$(mktemp -td gpghomeXXXXXXXXXX)" if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then
This task does not execute sudo, so we don't need to set the corresponding bitbake hint. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 1 - 1 file changed, 1 deletion(-)