<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii"><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
{mso-style-priority:34;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri",sans-serif;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 70.85pt 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=FR link="#0563C1" vlink="#954F72"><div class=WordSection1><p class=MsoNormal><span lang=EN-US>Systemd: - RESOLVED depends on GCRYPT, so GCRYPT should be enabled if RESOLVED is enabled<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> - ${PN}-binfmt should be added to SYSTEMD_PACKAGES only if binfmt is enabled<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>Without this patch, build fails when gcrypt is not in PACKAGECONFIG, but resolved is, or when binfmt is not in PACKAGECONFIG.<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoPlainText><span lang=EN-US>Signed-off-by: Herve Jourdain <<a href="mailto:herve.jourdain@neuf.fr">herve.jourdain@neuf.fr</a>><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>---<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>index 16af0ac..6523e0a 100644<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>--- a/meta/recipes-core/systemd/systemd_229.bb<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+++ b/meta/recipes-core/systemd/systemd_229.bb<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>@@ -97,11 +97,13 @@ PACKAGECONFIG_remove_libc-musl = "smack"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US> PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US># Sign the journal for anti-tampering<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>-PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+# RESOLVED depends on GCRYPT, so disable gcrypt only if resolved and gcrypt are NOT part of PACKAGECONFIG - done in EXTRA_OECONF<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,,libgcrypt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd"<o:p></o:p></span></p><p class=MsoNormal>PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils"<o:p></o:p></p><p class=MsoNormal><span lang=EN-US>-PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+# RESOLVED depends on GCRYPT, so enable gcrypt any time resolved is in PACKAGECONFIG<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+PACKAGECONFIG[resolved] = "--enable-resolved --enable-gcrypt,--disable-resolved,libgcrypt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>@@ -180,6 +182,9 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> --with-firmware-path=/lib/firmware \<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> --with-testdir=${PTEST_PATH} \<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> "<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+# RESOLVED depends on GCRYPT, so disable gcrypt only if resolved and gcrypt are NOT part of PACKAGECONFIG<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+EXTRA_OECONF += "<a href="mailto:$%7b@bb.utils.contains_any('PACKAGECONFIG',%20'resolved%20gcrypt',%20'',%20'--disable-gcrypt',%20d)%7d">${@bb.utils.contains_any('PACKAGECONFIG', 'resolved gcrypt', '', '--disable-gcrypt', d)}</a>"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US># per the systemd README, define VALGRIND=1 to run under valgrind<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>CFLAGS .= "<a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG',%20'valgrind',%20'%20-DVALGRIND=1',%20'',%20d)%7d">${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}</a>"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US>@@ -196,6 +201,10 @@ do_configure_prepend() {<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> else<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> cp -r ${S}/units ${S}/units.pre_sed<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> fi<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ if [ <a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG">${@bb.utils.contains('PACKAGECONFIG</a>', 'resolved', 'true', 'false', d)} -a \<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ ! <a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG">${@bb.utils.contains('PACKAGECONFIG</a>', 'gcrypt', 'true', 'false', d)} ]; then<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ PACKAGECONFIG_append = "gcrypt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ fi<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>}<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US> do_install() {<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>@@ -298,8 +307,10 @@ PACKAGES =+ "\<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> ${PN}-extra-utils \<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US>-SYSTEMD_PACKAGES = "${PN}-binfmt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>-SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+#SYSTEMD_PACKAGES = "${PN}-binfmt"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+#SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+SYSTEMD_PACKAGES = "<a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG',%20'binfmt',%20'$%7bPN%7d-binfmt',%20'',%20d)%7d">${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}</a>"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+SYSTEMD_SERVICE_${PN}-binfmt = "<a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG',%20'binfmt',%20'systemd-binfmt.service',%20'',%20d)%7d">${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'systemd-binfmt.service', '', d)}</a>"<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US> </span>USERADD_PACKAGES = "${PN}"<o:p></o:p></p><p class=MsoNormal><span lang=EN-US>USERADD_PARAM_${PN} += "<a href="mailto:$%7b@bb.utils.contains('PACKAGECONFIG',%20'microhttpd',%20'--system%20-d%20/%20-M%20--shell%20/bin/nologin%20systemd-journal-gateway;',%20'',%20d)%7d">${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}</a>"<o:p></o:p></span></p></div></body></html>