summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorVivien Didelot <vdidelot@pbsc.com>2021-02-20 17:59:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:24:25 +0000
commit591609738ee125276636df69d88893a3f4409613 (patch)
tree59f1b8bdf40928d8d30952db9346562f200b0bbe /meta
parentadffa47daf67fe69ea65c665c8d39fdf2a71d512 (diff)
downloadpoky-591609738ee125276636df69d88893a3f4409613.tar.gz
systemd: Fix importd requirements comment
The comment above the importd config states curl, which does not exist in PACKAGECONFIG. Adding it results in the following error (and then misleading compilation failures): WARNING: systemd-1_244.5-r0 do_configure: QA Issue: systemd: invalid PACKAGECONFIG: curl [invalid-packageconfig] Support for curl is currently enabled through journal-upload: PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" While it might be more appropriate to deprecate "journal-upload" in favor of a "curl" PACKAGECONFIG entry, simply fix the importd comment for now by stating upload-journal instead of curl. (From OE-Core rev: e3013d4c9c46bade2f6c38c26b779936e687d57c) Signed-off-by: Vivien Didelot <vdidelot@pbsc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e6a0bced605da58ff43ff06ea6a1d67e84c98d91) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_246.9.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_246.9.bb b/meta/recipes-core/systemd/systemd_246.9.bb
index daee795cc2..6524b8216a 100644
--- a/meta/recipes-core/systemd/systemd_246.9.bb
+++ b/meta/recipes-core/systemd/systemd_246.9.bb
@@ -135,7 +135,7 @@ PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false"
135PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" 135PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false"
136PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" 136PACKAGECONFIG[idn] = "-Didn=true,-Didn=false"
137PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" 137PACKAGECONFIG[ima] = "-Dima=true,-Dima=false"
138# importd requires curl/xz/zlib/bzip2/gcrypt 138# importd requires journal-upload/xz/zlib/bzip2/gcrypt
139PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" 139PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false"
140# Update NAT firewall rules 140# Update NAT firewall rules
141PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" 141PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables"