* [PATCH 0/3] Journald fixes
@ 2014-02-11 3:33 Khem Raj
2014-02-11 3:33 ` [PATCH 1/3] systemd: Fix misc journald memory bugs Khem Raj
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Khem Raj @ 2014-02-11 3:33 UTC (permalink / raw)
To: openembedded-core
This patchset does two things. Enables systemd-journald-gatewayd
Fixes journald for various memory leaks and memory allocation problems
as seen under stress and big-endian architectures.
The following changes since commit b5b4898cd409036161c62891e9618d9ab3f891f9:
python-pycurl: upgrade to 7.19.3 (2014-02-08 21:03:27 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/journald-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/journald-fixes
Khem Raj (3):
systemd: Fix misc journald memory bugs
libmicrohttpd: add recipe
systemd: Enable building microhttpd
...ournal-Add-missing-byte-order-conversions.patch | 60 ++++++++++++++
.../journal-file-protect-against-alloca-0.patch | 23 ++++++
...n-appending-to-journal-file-allocate-larg.patch | 83 ++++++++++++++++++++
.../systemd/journald-add-missing-error-check.patch | 16 ++++
.../systemd/journald-fix-minor-memory-leak.patch | 16 ++++
meta/recipes-core/systemd/systemd_208.bb | 7 ++
.../libmicrohttpd/libmicrohttpd_0.9.33.bb | 18 +++++
7 files changed, 223 insertions(+)
create mode 100644 meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch
create mode 100644 meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch
create mode 100644 meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch
create mode 100644 meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch
create mode 100644 meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch
create mode 100644 meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb
--
1.7.10.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/3] systemd: Fix misc journald memory bugs 2014-02-11 3:33 [PATCH 0/3] Journald fixes Khem Raj @ 2014-02-11 3:33 ` Khem Raj 2014-02-11 3:33 ` [PATCH 2/3] libmicrohttpd: add recipe Khem Raj 2014-02-11 3:33 ` [PATCH 3/3] systemd: Enable building microhttpd Khem Raj 2 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2014-02-11 3:33 UTC (permalink / raw) To: openembedded-core These set of patches fix journald exhibiting some issues under load. One of the prevelant issues is that when appending to journal it is not able to allocate memory and starts taking 100% cpu spewing errors like systemd-journald[2934]: Failed to write entry (19 items, 452 bytes), ignoring: Cannot allocate memory Other memory issues crept up with time e.g.vacuuming Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...ournal-Add-missing-byte-order-conversions.patch | 60 ++++++++++++++ .../journal-file-protect-against-alloca-0.patch | 23 ++++++ ...n-appending-to-journal-file-allocate-larg.patch | 83 ++++++++++++++++++++ .../systemd/journald-add-missing-error-check.patch | 16 ++++ .../systemd/journald-fix-minor-memory-leak.patch | 16 ++++ meta/recipes-core/systemd/systemd_208.bb | 5 ++ 6 files changed, 203 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch create mode 100644 meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch create mode 100644 meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch create mode 100644 meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch create mode 100644 meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch diff --git a/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch b/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch new file mode 100644 index 0000000..21ea0f9 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch @@ -0,0 +1,60 @@ +From 43539d6b60ef0db3e98d00bef0024614c8c1807a Mon Sep 17 00:00:00 2001 +From: George McCollister <george.mccollister@gmail.com> +Date: Tue, 31 Dec 2013 14:37:32 -0600 +Subject: [PATCH] journal: Add missing byte order conversions + +Convert entry_array.items[0] to host byte order prior to passing it to +chain_cache_put(). + +[zj: also use le64toh in journal-verify.c] + +https://bugs.freedesktop.org/show_bug.cgi?id=73194 + +Upstream-Status: Backport [Fedora] +--- + src/journal/journal-file.c | 4 ++-- + src/journal/journal-verify.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: systemd-208/src/journal/journal-file.c +=================================================================== +--- systemd-208.orig/src/journal/journal-file.c 2014-02-07 22:51:44.000000000 -0800 ++++ systemd-208/src/journal/journal-file.c 2014-02-07 22:58:40.665062951 -0800 +@@ -1447,7 +1447,7 @@ + + found: + /* Let's cache this item for the next invocation */ +- chain_cache_put(f->chain_cache, ci, first, a, o->entry_array.items[0], t); ++ chain_cache_put(f->chain_cache, ci, first, a, le64toh(o->entry_array.items[0]), t); + + r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o); + if (r < 0) +@@ -1624,7 +1624,7 @@ + return 0; + + /* Let's cache this item for the next invocation */ +- chain_cache_put(f->chain_cache, ci, first, a, array->entry_array.items[0], t); ++ chain_cache_put(f->chain_cache, ci, first, a, le64toh(array->entry_array.items[0]), t); + + if (subtract_one && i == 0) + p = last_p; +Index: systemd-208/src/journal/journal-verify.c +=================================================================== +--- systemd-208.orig/src/journal/journal-verify.c 2013-08-13 13:02:46.000000000 -0700 ++++ systemd-208/src/journal/journal-verify.c 2014-02-07 22:57:14.849308409 -0800 +@@ -249,12 +249,12 @@ + } + + for (i = 0; i < journal_file_entry_array_n_items(o); i++) +- if (o->entry_array.items[i] != 0 && +- !VALID64(o->entry_array.items[i])) { ++ if (le64toh(o->entry_array.items[i]) != 0 && ++ !VALID64(le64toh(o->entry_array.items[i]))) { + log_error(OFSfmt": invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt, + offset, + i, journal_file_entry_array_n_items(o), +- o->entry_array.items[i]); ++ le64toh(o->entry_array.items[i])); + return -EBADMSG; + } + diff --git a/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch b/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch new file mode 100644 index 0000000..953373e --- /dev/null +++ b/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch @@ -0,0 +1,23 @@ +From a25fd0d4bd3cf652e55c24e7dc873fe530fa111a Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com> +Date: Mon, 16 Dec 2013 23:35:30 +0100 +Subject: [PATCH] journal-file: protect against alloca(0) + +--- + src/journal/journal-file.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 090cf97..8ea258b 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -2737,7 +2737,8 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6 + ts.realtime = le64toh(o->entry.realtime); + + n = journal_file_entry_n_items(o); +- items = alloca(sizeof(EntryItem) * n); ++ /* alloca() can't take 0, hence let's allocate at least one */ ++ items = alloca(sizeof(EntryItem) * MAX(1u, n)); + + for (i = 0; i < n; i++) { + uint64_t l, h; diff --git a/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch b/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch new file mode 100644 index 0000000..89573bb --- /dev/null +++ b/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch @@ -0,0 +1,83 @@ +From c0658e1948c301177b1527227be0c18932cd7cce Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 26 Nov 2013 18:39:42 +0100 +Subject: [PATCH] journal: when appending to journal file, allocate larger + blocks at once + +(cherry picked from commit a676e66535e12458ea6d366a653f8dd60f982504) + +Conflicts: + src/journal/journal-file.c +--- + src/journal/journal-file.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +Upstream-Status: Backport + +Index: systemd-208/src/journal/journal-file.c +=================================================================== +--- systemd-208.orig/src/journal/journal-file.c 2014-02-07 22:37:06.013722798 -0800 ++++ systemd-208/src/journal/journal-file.c 2014-02-07 22:44:51.563341090 -0800 +@@ -68,6 +68,9 @@ + /* How many entries to keep in the entry array chain cache at max */ + #define CHAIN_CACHE_MAX 20 + ++/* How much to increase the journal file size at once each time we allocate something new. */ ++#define FILE_SIZE_INCREASE (8ULL*1024ULL*1024ULL) /* 8MB */ ++ + int journal_file_set_online(JournalFile *f) { + assert(f); + +@@ -218,8 +221,7 @@ + journal_file_set_online(f); + + /* Sync the online state to disk */ +- msync(f->header, PAGE_ALIGN(sizeof(Header)), MS_SYNC); +- fdatasync(f->fd); ++ fsync(f->fd); + + return 0; + } +@@ -313,7 +315,7 @@ + } + + static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { +- uint64_t old_size, new_size; ++ uint64_t old_size, new_size, file_size; + int r; + + assert(f); +@@ -333,12 +335,10 @@ + if (new_size <= old_size) + return 0; + +- if (f->metrics.max_size > 0 && +- new_size > f->metrics.max_size) ++ if (f->metrics.max_size > 0 && new_size > f->metrics.max_size) + return -E2BIG; + +- if (new_size > f->metrics.min_size && +- f->metrics.keep_free > 0) { ++ if (new_size > f->metrics.min_size && f->metrics.keep_free > 0) { + struct statvfs svfs; + + if (fstatvfs(f->fd, &svfs) >= 0) { +@@ -363,8 +363,16 @@ + if (r != 0) + return -r; + +- if (fstat(f->fd, &f->last_stat) < 0) +- return -errno; ++ /* Increase the file size a bit further than this, so that we ++ * we can create larger memory maps to cache */ ++ file_size = ((new_size+FILE_SIZE_INCREASE-1) / FILE_SIZE_INCREASE) * FILE_SIZE_INCREASE; ++ if (file_size > (uint64_t) f->last_stat.st_size) { ++ if (file_size > new_size) ++ ftruncate(f->fd, file_size); ++ ++ if (fstat(f->fd, &f->last_stat) < 0) ++ return -errno; ++ } + + f->header->arena_size = htole64(new_size - le64toh(f->header->header_size)); + diff --git a/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch b/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch new file mode 100644 index 0000000..10590e1 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch @@ -0,0 +1,16 @@ +Upstream-Status: Backport [Fedora] + +Index: systemd-208/src/journal/journal-file.c +=================================================================== +--- systemd-208.orig/src/journal/journal-file.c 2013-08-13 13:02:46.397707086 -0700 ++++ systemd-208/src/journal/journal-file.c 2014-02-07 22:29:01.398794277 -0800 +@@ -907,7 +907,8 @@ + + osize = offsetof(Object, field.payload) + size; + r = journal_file_append_object(f, OBJECT_FIELD, osize, &o, &p); +- ++ if (r < 0) ++ return r; + o->field.hash = htole64(hash); + memcpy(o->field.payload, field, size); + diff --git a/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch b/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch new file mode 100644 index 0000000..9b90ed2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch @@ -0,0 +1,16 @@ +Fix minor memory leak + +Upstream-Status: Backport [Fedora] + +Index: systemd-208/src/journal/journal-vacuum.c +=================================================================== +--- systemd-208.orig/src/journal/journal-vacuum.c 2013-09-12 05:51:57.258256643 -0700 ++++ systemd-208/src/journal/journal-vacuum.c 2014-02-07 22:35:55.695747001 -0800 +@@ -277,6 +277,7 @@ + freed += size; + } else if (errno != ENOENT) + log_warning("Failed to delete %s/%s: %m", directory, p); ++ free(p); + + continue; + } diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 5ed31c3..f94ce56 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -20,6 +20,11 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \ file://binfmt-install.patch \ + file://journald-add-missing-error-check.patch \ + file://journald-fix-minor-memory-leak.patch \ + file://journal-when-appending-to-journal-file-allocate-larg.patch \ + file://journal-file-protect-against-alloca-0.patch \ + file://journal-Add-missing-byte-order-conversions.patch \ file://touchscreen.rules \ ${UCLIBCPATCHES} \ file://00-create-volatile.conf \ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] libmicrohttpd: add recipe 2014-02-11 3:33 [PATCH 0/3] Journald fixes Khem Raj 2014-02-11 3:33 ` [PATCH 1/3] systemd: Fix misc journald memory bugs Khem Raj @ 2014-02-11 3:33 ` Khem Raj 2014-02-11 3:33 ` [PATCH 3/3] systemd: Enable building microhttpd Khem Raj 2 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2014-02-11 3:33 UTC (permalink / raw) To: openembedded-core libmicrohttpd is needed by systemd-journald-gatewayd Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../libmicrohttpd/libmicrohttpd_0.9.33.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb diff --git a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb new file mode 100644 index 0000000..d56af76 --- /dev/null +++ b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb @@ -0,0 +1,18 @@ +# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" +SECTION = "net" +DEPENDS = "gnutls libgcrypt" + +SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "013b10f9de1cda5448b29c81305354a3" +SRC_URI[sha256sum] = "d9587e8497548f820650cd607daf3615ea3272435779378983032c570f1cd559" + +inherit autotools +EXTRA_OECONF += "--disable-dependency-tracking --enable-largefile \ + --enable-curl --enable-messages --with-pic" + -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 3:33 [PATCH 0/3] Journald fixes Khem Raj 2014-02-11 3:33 ` [PATCH 1/3] systemd: Fix misc journald memory bugs Khem Raj 2014-02-11 3:33 ` [PATCH 2/3] libmicrohttpd: add recipe Khem Raj @ 2014-02-11 3:33 ` Khem Raj 2014-02-11 10:43 ` Burton, Ross 2 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2014-02-11 3:33 UTC (permalink / raw) To: openembedded-core 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(+) 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" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 3:33 ` [PATCH 3/3] systemd: Enable building microhttpd Khem Raj @ 2014-02-11 10:43 ` Burton, Ross 2014-02-11 14:49 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Burton, Ross @ 2014-02-11 10:43 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 10:43 ` Burton, Ross @ 2014-02-11 14:49 ` Khem Raj 2014-02-11 15:04 ` Burton, Ross 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2014-02-11 14:49 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 14:49 ` Khem Raj @ 2014-02-11 15:04 ` Burton, Ross 2014-02-11 15:07 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Burton, Ross @ 2014-02-11 15:04 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 15:04 ` Burton, Ross @ 2014-02-11 15:07 ` Khem Raj 2014-02-11 15:29 ` Burton, Ross 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2014-02-11 15:07 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 15:07 ` Khem Raj @ 2014-02-11 15:29 ` Burton, Ross 2014-02-11 16:46 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Burton, Ross @ 2014-02-11 15:29 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 15:29 ` Burton, Ross @ 2014-02-11 16:46 ` Khem Raj 2014-02-11 16:55 ` Burton, Ross 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2014-02-11 16:46 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] systemd: Enable building microhttpd 2014-02-11 16:46 ` Khem Raj @ 2014-02-11 16:55 ` Burton, Ross 0 siblings, 0 replies; 11+ messages in thread From: Burton, Ross @ 2014-02-11 16:55 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-02-11 16:56 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-11 3:33 [PATCH 0/3] Journald fixes Khem Raj 2014-02-11 3:33 ` [PATCH 1/3] systemd: Fix misc journald memory bugs Khem Raj 2014-02-11 3:33 ` [PATCH 2/3] libmicrohttpd: add recipe Khem Raj 2014-02-11 3:33 ` [PATCH 3/3] systemd: Enable building microhttpd Khem Raj 2014-02-11 10:43 ` Burton, Ross 2014-02-11 14:49 ` Khem Raj 2014-02-11 15:04 ` Burton, Ross 2014-02-11 15:07 ` Khem Raj 2014-02-11 15:29 ` Burton, Ross 2014-02-11 16:46 ` Khem Raj 2014-02-11 16:55 ` Burton, Ross
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.