From 5b6ea2a099b2f6ebbe3a2872d4b36db3012920df Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 26 Apr 2025 12:30:01 +0200 Subject: [PATCH] recipes: fix whitespace warnings Since OE bitbake commit 24772dd2ae6c ("parse/ConfHandler: Add warning for deprecated whitespace usage"), the current build generates the following warning (as example): | WARNING: ...meta-security/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend:7 | has a lack of whitespace around the assignment: | 'EXTRA_OEMESON:append= " ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '-Dtpm2=true', '', d)} "' Fix all the warnings. Signed-off-by: Max Krummenacher Signed-off-by: Armin Kuster --- meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend | 2 +- meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb | 4 ++-- meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend b/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend index 712a764..55323aa 100644 --- a/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend +++ b/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend @@ -2,6 +2,6 @@ DEPENDS += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2-tss libtss2 libtss2-tcti-device', '', d)} \ " -EXTRA_OEMESON:append= "\ +EXTRA_OEMESON:append = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '-Dtpm2=true', '', d)} \ " diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb index 3e58c33..c7159e0 100644 --- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb +++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb @@ -15,8 +15,8 @@ S = "${WORKDIR}/git" PARALLEL_MAKE = "" inherit autotools pkgconfig perlnative -TSS_USER="tss" -TSS_GROUP="tss" +TSS_USER = "tss" +TSS_GROUP = "tss" PACKAGECONFIG ?= "openssl gnutls" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb index 24fd5b5..1b8eff1 100644 --- a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb @@ -35,7 +35,7 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" -PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" do_install:append() {