Patchwork [3/3] systemd: Enable building microhttpd

login
register
mail settings
Submitter Khem Raj
Date Feb. 11, 2014, 3:33 a.m.
Message ID <5eeeedfcaec0bd520449d7926da70085eb033991.1392089446.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/66563/
State New
Headers show

Comments

Khem Raj - Feb. 11, 2014, 3:33 a.m.
This enabled journald-gatewayd

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/systemd/systemd_208.bb |    2 ++
 1 file changed, 2 insertions(+)
Ross Burton - Feb. 11, 2014, 10:43 a.m.
On 11 February 2014 03:33, Khem Raj <raj.khem@gmail.com> wrote:
> +PACKAGECONFIG[microhttpd] = "--enable-microhttpd,,libmicrohttpd"

There isn't a disabled option here, and you don't set PACKAGECONFIG to
enable it so in theory it's disabled by default.  Is this sufficiently
"core" to be in oe-core?  Alternatively we could have the
packageconfig blocks in oe-core but libmicrohttpd in meta-oe.

Ross
Khem Raj - Feb. 11, 2014, 2:49 p.m.
On Tue, Feb 11, 2014 at 2:43 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 11 February 2014 03:33, Khem Raj <raj.khem@gmail.com> wrote:
>> +PACKAGECONFIG[microhttpd] = "--enable-microhttpd,,libmicrohttpd"
>
> There isn't a disabled option here,

thats the default one can add --disable-microhttpd too

 and you don't set PACKAGECONFIG to
> enable it so in theory it's disabled by default.  Is this sufficiently
> "core" to be in oe-core?  Alternatively we could have the
> packageconfig blocks in oe-core but libmicrohttpd in meta-oe.

I am fine either way. It just makes life harder for folks who don't use meta-oe
but hopefully there are handful of them. I can resend remainder of
patch to meta-oe

>
> Ross
Ross Burton - Feb. 11, 2014, 3:04 p.m.
On 11 February 2014 14:49, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, Feb 11, 2014 at 2:43 AM, Burton, Ross <ross.burton@intel.com> wrote:
>> On 11 February 2014 03:33, Khem Raj <raj.khem@gmail.com> wrote:
>>> +PACKAGECONFIG[microhttpd] = "--enable-microhttpd,,libmicrohttpd"
>>
>> There isn't a disabled option here,
>
> thats the default one can add --disable-microhttpd too

Please add it for clarity.

>  and you don't set PACKAGECONFIG to
>> enable it so in theory it's disabled by default.  Is this sufficiently
>> "core" to be in oe-core?  Alternatively we could have the
>> packageconfig blocks in oe-core but libmicrohttpd in meta-oe.
>
> I am fine either way. It just makes life harder for folks who don't use meta-oe
> but hopefully there are handful of them. I can resend remainder of
> patch to meta-oe

This was just the usual "is it core?" question for new recipes.
Anyone else have an opinion?

Ross
Khem Raj - Feb. 11, 2014, 3:07 p.m.
On Tue, Feb 11, 2014 at 7:04 AM, Burton, Ross <ross.burton@intel.com> wrote:
>> thats the default one can add --disable-microhttpd too
>
> Please add it for clarity.

Do you suggest to add it to configure cmdline or in comments
Ross Burton - Feb. 11, 2014, 3:29 p.m.
On 11 February 2014 15:07, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, Feb 11, 2014 at 7:04 AM, Burton, Ross <ross.burton@intel.com> wrote:
>>> thats the default one can add --disable-microhttpd too
>>
>> Please add it for clarity.
>
> Do you suggest to add it to configure cmdline or in comments

I meant this:

+PACKAGECONFIG[microhttpd] =
"--enable-microhttpd,--disable-microhttpd,libmicrohttpd"

Clear to the person reading the .bb, and if systemd changes the
behaviour when the option isn't specified (to enable, or automatically
detect) then our build doesn't change.

Ross
Khem Raj - Feb. 11, 2014, 4:46 p.m.
On Tue, Feb 11, 2014 at 7:29 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 11 February 2014 15:07, Khem Raj <raj.khem@gmail.com> wrote:
>> On Tue, Feb 11, 2014 at 7:04 AM, Burton, Ross <ross.burton@intel.com> wrote:
>>>> thats the default one can add --disable-microhttpd too
>>>
>>> Please add it for clarity.
>>
>> Do you suggest to add it to configure cmdline or in comments
>
> I meant this:
>
> +PACKAGECONFIG[microhttpd] =
> "--enable-microhttpd,--disable-microhttpd,libmicrohttpd"

We already had --disable-microhttpd in EXTRA_OECONF so I removed it from there
and moved that piece to PACKAGECONFIG and pushed the patch to pull
tree, take a look.


>
> Clear to the person reading the .bb, and if systemd changes the
> behaviour when the option isn't specified (to enable, or automatically
> detect) then our build doesn't change.
>
> Ross
Ross Burton - Feb. 11, 2014, 4:55 p.m.
On 11 February 2014 16:46, Khem Raj <raj.khem@gmail.com> wrote:
> We already had --disable-microhttpd in EXTRA_OECONF so I removed it from there
> and moved that piece to PACKAGECONFIG and pushed the patch to pull
> tree, take a look.

Yeah, that. :)

Ross

Patch

diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index f94ce56..fe88a7a 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -58,6 +58,7 @@  DEPENDS += "libgcrypt"
 PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
 PACKAGECONFIG[tcp-wrappers] = "--enable-tcpwrap,--disable-tcpwrap,tcp-wrappers"
 PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup"
+PACKAGECONFIG[microhttpd] = "--enable-microhttpd,,libmicrohttpd"
 
 CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
 
@@ -149,6 +150,7 @@  SYSTEMD_PACKAGES = "${PN}-binfmt"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
 
 USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} += "--system systemd-journal-gateway"
 GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
 
 FILES_${PN}-analyze = "${bindir}/systemd-analyze"