* npm.bbclass support for deep native modules?
From: Peter A. Bigot @ 2016-11-27 0:17 UTC (permalink / raw)
To: OE-core
I'm using the current head of morty and trying to get a handle on the
new nodejs support in OE.
I'm failing to build a recipe for statsd. Starting with this:
devtool add 'npm://registry.npmjs.org;name=statsd;version=0.8.0'
bitbake statsd
produces an error related to the modern-syslog dependency:
DEBUG: Executing shell function do_compile
| npm ERR! Linux 4.4.0-47-generic
| npm ERR! argv
"/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin/node"
"/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin/npm"
"--arch=arm" "--target_arch=arm" "--production" "--no-registry" "install"
| npm ERR! node v4.6.1
| npm ERR! npm v2.15.9
|
| npm ERR! Registry not defined and registry files not found:
"/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/statsd/0.8.0-r0/npm_cache/noregistry/modern-syslog/.cache.json",
"/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/statsd/0.8.0-r0/npm_cache/modern-syslog/.cache.json".
modern-syslog 1.1.2 needs node-gyp to build a native component and
https://wiki.yoctoproject.org/wiki/TipsAndTricks/NPM notes that devtool
can't detect such things. Doing this works fine to build that package:
devtool add 'npm://registry.npmjs.org;name=modern-syslog;version=1.1.2'
bitbake modern-syslog
but I'm having no luck getting "bitbake statsd" to find the result.
I've added:
DEPENDS = "modern-syslog"
to statsd_0.8.0.bb but that isn't helping. It looks like I need some
way to have the recipe install the prepared modern-syslog into the cache
(or globally?) before baking statsd, but since the cache gets cleared in
npm_do_compile() it's not clear how to make that happen.
I'm very rusty with OE (two years away), so am I missing something or is
this just beyond what the bitbake infrastructure can currently handle?
If so, can somebody suggest a way to hand-patch the recipe, or outline
how npm.bbclass might be extended to support this?
Thanks.
Peter
^ permalink raw reply
* [PATCH] terminal.py: Pass string instead of bytes to ExecutionError to avoid exception
From: Martin Vuille @ 2016-11-27 20:02 UTC (permalink / raw)
To: openembedded-core
Based on run() in bitbake/lib/bb/process.py, ExecutionError() expects strings
not bytes. Passing bytes results in a "TypeError: Can't convert 'bytes' object
to str implicitly" exception.
Fixes Bug 10729
Signed-off-by: Martin Vuille <jpmv27@yahoo.com>
---
meta/lib/oe/terminal.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 3901ad3..3c8ef59 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -227,6 +227,8 @@ def spawn(name, sh_cmd, title=None, env=None, d=None):
pipe = terminal(sh_cmd, title, env, d)
output = pipe.communicate()[0]
+ if output:
+ output = output.decode("utf-8")
if pipe.returncode != 0:
raise ExecutionError(sh_cmd, pipe.returncode, output)
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] u-boot: Update to v2016.11 release
From: Marek Vasut @ 2016-11-28 2:42 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-core
In-Reply-To: <20161118202449.GQ2546@bill-the-cat>
On 11/18/2016 09:24 PM, Tom Rini wrote:
> On Fri, Nov 18, 2016 at 08:29:55PM +0100, Marek Vasut wrote:
>
>> Upgrade U-Boot to the latest version.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
>> Cc: Denys Dmytriyenko <denis@denix.org>
>> Cc: Ross Burton <ross.burton@intel.com>
>
> Reviewed-by: Tom Rini <trini@konsulko.com>
>
Bump, can we get the u-boot update finally applied ?
--
Best regards,
Marek Vasut
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-28 7:07 UTC (permalink / raw)
To: ed.bartosh; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161125163332.GB4830@linux.intel.com>
On 25/11/16 17:33, Ed Bartosh wrote:
> On Fri, Nov 25, 2016 at 01:35:53PM +0100, Kristian Amlie wrote:
>> On 25/11/16 13:28, Maciej Borzęcki wrote:
>>> On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
>>>> + # Disallow '..', because doing so could be quite disastrous
>>>> + # (we will delete the directory).
>>>> + remaining = path
>>>> + while True:
>>>> + (head, tail) = os.path.split(remaining)
>>>> + if tail == '..':
>>>> + msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
>>>> + elif head == "":
>>>> + break
>>>> + remaining = head
>>>
>>> Why not do this instead?
>>>
>>> if '..' in path:
>>> msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
>>>
> would "'/..' in path" or something similar work?
'/..my-file' is a valid file name, so no, it wouldn't work. I realize
that this would be uncommon, and it makes the check more complex, so I'm
ok with making it simpler if you want me to, but we have to trade
simplicity for correctness in that case.
--
Kristian
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-28 7:15 UTC (permalink / raw)
To: ed.bartosh; +Cc: openembedded-core
In-Reply-To: <20161125163103.GA4830@linux.intel.com>
On 25/11/16 17:31, Ed Bartosh wrote:
> On Fri, Nov 25, 2016 at 01:07:34PM +0100, Kristian Amlie wrote:
>> On 25/11/16 11:33, Patrick Ohly wrote:
>>> On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
>>>> + if os.stat(real_rootfs_dir).st_dev ==
>>>> os.stat(cr_workdir).st_dev:
>>>> + # Optimization if both directories are on the same
>>>> file system:
>>>> + # copy using hardlinks.
>>>> + cp_args = "-al"
>>>> + else:
>>>> + cp_args = "-a"
>>>> + exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
>>>> new_rootfs))
>>>
>>> Not a full review (I'll leave that to Ed), just one thing which caught
>>> my eye: when the rootfs contains xattrs, they get lost here.
>>>
>>> Use oe.path.copyhardlinktree() instead, it also does the hardlinking
>>> trick.
>>
>> Thanks, that's a good tip! I'll include that in the next patchset.
>>
>
> Thank you for so fast implementation!
>
> Sorry for not answering on original e-mail. I've lost it somehow.
>
> My comments so far:
>
> What's the reason of insisting that path must be absolute?
> May be it's just me, but I find it a bit scaring to use absolute path in .wks
> The patch is relative to the rootfs directory from my point of view.
>
> It also looks quite strange in the code to insist on absolute path
> + if not os.path.isabs(path):
> + msger.error("Must be absolute: --exclude-path=%s" %
>
> and then immediately making it relative:
> +
> + while os.path.isabs(path):
> + path = path[1:]
Not really any strong reason. I just thought it was a logical thing to
do from a user perspective: When you're making an image you're thinking
about paths in the final image, and the path after "part" is absolute,
so I thought this one should be too.
The fact that it's made relative in the code is just an implementation
detail to make join() work correctly.
I'm fine either way, so just let me know which you prefer.
> I know, this is just a matter of taste, but I'd not use brackets around
> head, tail here. They're redundant and the code looks better without
> them from my point of view.
> + (head, tail) = os.path.split(remaining)
Noted, I'll remove the brackets.
> This causes rmtree to throw NotADirectoryError on files:
> + for entry in os.listdir(full_path):
> + shutil.rmtree(os.path.join(full_path, entry))
Oh, nice catch. I will fix that one as well!
Thanks for the review!
--
Kristian
^ permalink raw reply
* [PATCH] tiff: Security fix CVE-2016-9540
From: Zhixiong Chi @ 2016-11-28 8:12 UTC (permalink / raw)
To: openembedded-core
tools/tiffcp.c in libtiff 4.0.6 has an out-of-bounds write on tiled
images with odd tile width versus image width. Reported as MSVR 35103,
aka "cpStripToTile heap-buffer-overflow."
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-9540
Patch from:
https://github.com/vadz/libtiff/commit/5ad9d8016fbb60109302d558f7edb2cb2a3bb8e3
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
---
.../libtiff/files/CVE-2016-9540.patch | 60 ++++++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 61 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-9540.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-9540.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-9540.patch
new file mode 100644
index 0000000..dddaa0c
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-9540.patch
@@ -0,0 +1,60 @@
+From 5ad9d8016fbb60109302d558f7edb2cb2a3bb8e3 Mon Sep 17 00:00:00 2001
+From: erouault <erouault>
+Date: Sat, 8 Oct 2016 15:54:56 +0000
+Subject: [PATCH] fix CVE-2016-9540
+ * tools/tiffcp.c: fix out-of-bounds write on tiled images with odd
+ tile width vs image width. Reported as MSVR 35103
+ by Axel Souchet and Vishal Chauhan from the MSRC Vulnerabilities &
+ Mitigations team.
+
+CVE: CVE-2016-9540
+
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/5ad9d8016fbb60109302d558f7edb2cb2a3bb8e3
+
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+---
+ ChangeLog | 7 +++++++
+ tools/tiffcp.c | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+Index: tiff-4.0.4/ChangeLog
+===================================================================
+--- tiff-4.0.4.orig/ChangeLog 2016-11-24 14:40:43.046867737 +0800
++++ tiff-4.0.4/ChangeLog 2016-11-28 14:38:01.681276171 +0800
+@@ -17,6 +17,13 @@
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2500
+ (CVE-2014-8127, duplicate: CVE-2016-3658)
+
++2016-10-08 Even Rouault <even.rouault at spatialys.com>
++
++ * tools/tiffcp.c: fix out-of-bounds write on tiled images with odd
++ tile width vs image width. Reported as MSVR 35103
++ by Axel Souchet and Vishal Chauhan from the MSRC Vulnerabilities &
++ Mitigations team.
++
+ 2016-09-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject attempts to
+Index: tiff-4.0.4/tools/tiffcp.c
+===================================================================
+--- tiff-4.0.4.orig/tools/tiffcp.c 2015-06-21 09:09:10.000000000 +0800
++++ tiff-4.0.4/tools/tiffcp.c 2016-11-28 14:41:02.221277430 +0800
+@@ -1338,7 +1338,7 @@
+ uint32 colb = 0;
+ uint32 col;
+
+- for (col = 0; col < imagewidth; col += tw) {
++ for (col = 0; col < imagewidth && colb < imagew; col += tw) {
+ if (TIFFReadTile(in, tilebuf, col, row, 0, 0) < 0
+ && !ignore) {
+ TIFFError(TIFFFileName(in),
+@@ -1523,7 +1523,7 @@
+ uint32 colb = 0;
+ uint32 col;
+
+- for (col = 0; col < imagewidth; col += tw) {
++ for (col = 0; col < imagewidth && colb < imagew; col += tw) {
+ /*
+ * Tile is clipped horizontally. Calculate
+ * visible portion and skewing factors.
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 9b4aff3..3057121 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2016-3622.patch \
file://CVE-2016-3658.patch \
file://CVE-2016-3632.patch \
+ file://CVE-2016-9540.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
1.9.1
^ permalink raw reply related
* [PATCH] tiff: Security fix CVE-2016-9539
From: Zhixiong Chi @ 2016-11-28 9:52 UTC (permalink / raw)
To: openembedded-core
tools/tiffcrop.c in libtiff 4.0.6 has an out-of-bounds read in
readContigTilesIntoBuffer(). Reported as MSVR 35092.
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-9539
Patch from:
https://github.com/vadz/libtiff/commit/ae9365db1b271b62b35ce018eac8799b1d5e8a53
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
---
.../libtiff/files/CVE-2016-9539.patch | 60 ++++++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 61 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-9539.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-9539.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-9539.patch
new file mode 100644
index 0000000..1d9be42
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-9539.patch
@@ -0,0 +1,60 @@
+From ae9365db1b271b62b35ce018eac8799b1d5e8a53 Mon Sep 17 00:00:00 2001
+From: erouault <erouault>
+Date: Fri, 14 Oct 2016 19:13:20 +0000
+Subject: [PATCH ] * tools/tiffcrop.c: fix out-of-bound read of up to 3 bytes
+ in readContigTilesIntoBuffer(). Reported as MSVR 35092 by Axel Souchet
+ & Vishal Chauhan from the MSRC Vulnerabilities & Mitigations team.
+
+CVE: CVE-2016-9539
+
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/ae9365db1b271b62b35ce018eac8799b1d5e8a53
+
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+
+---
+ ChangeLog | 6 ++++++
+ tools/tiffcrop.c | 11 ++++++++++-
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+Index: tiff-4.0.6/ChangeLog
+===================================================================
+--- tiff-4.0.6.orig/ChangeLog 2016-11-28 14:56:32.109283913 +0800
++++ tiff-4.0.6/ChangeLog 2016-11-28 16:36:01.805325534 +0800
+@@ -17,6 +17,12 @@
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2500
+ (CVE-2014-8127, duplicate: CVE-2016-3658)
+
++2016-10-14 Even Rouault <even.rouault at spatialys.com>
++
++ * tools/tiffcrop.c: fix out-of-bound read of up to 3 bytes in
++ readContigTilesIntoBuffer(). Reported as MSVR 35092 by Axel Souchet
++ & Vishal Chauhan from the MSRC Vulnerabilities & Mitigations team.
++
+ 2016-10-08 Even Rouault <even.rouault at spatialys.com>
+
+ * tools/tiffcp.c: fix out-of-bounds write on tiled images with odd
+Index: tiff-4.0.6/tools/tiffcrop.c
+===================================================================
+--- tiff-4.0.6.orig/tools/tiffcrop.c 2016-11-28 14:56:31.433283908 +0800
++++ tiff-4.0.6/tools/tiffcrop.c 2016-11-28 16:42:13.793328128 +0800
+@@ -819,9 +819,18 @@
+ }
+ }
+
+- tilebuf = _TIFFmalloc(tile_buffsize);
++ /* Add 3 padding bytes for extractContigSamplesShifted32bits */
++ if( tile_buffsize > 0xFFFFFFFFU - 3 )
++ {
++ TIFFError("readContigTilesIntoBuffer", "Integer overflow when calculating buffer size.");
++ exit(-1);
++ }
++ tilebuf = _TIFFmalloc(tile_buffsize + 3);
+ if (tilebuf == 0)
+ return 0;
++ tilebuf[tile_buffsize] = 0;
++ tilebuf[tile_buffsize+1] = 0;
++ tilebuf[tile_buffsize+2] = 0;
+
+ dst_rowsize = ((imagewidth * bps * spp) + 7) / 8;
+ for (row = 0; row < imagelength; row += tl)
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 3057121..3a7906a 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -18,6 +18,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2016-3658.patch \
file://CVE-2016-3632.patch \
file://CVE-2016-9540.patch \
+ file://CVE-2016-9539.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
1.9.1
^ permalink raw reply related
* [PATCH] libxml2: Security fix CVE-2016-5131
From: Yi Zhao @ 2016-11-28 9:55 UTC (permalink / raw)
To: openembedded-core
CVE-2016-5131 libxml2: Use-after-free vulnerability in libxml2 through
2.9.4, as used in Google Chrome before 52.0.2743.82, allows remote
attackers to cause a denial of service or possibly have unspecified
other impact via vectors related to the XPointer range-to function.
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-5131
Patch from:
https://git.gnome.org/browse/libxml2/commit/?id=9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../libxml/libxml2/libxml2-CVE-2016-5131.patch | 180 +++++++++++++++++++++
meta/recipes-core/libxml/libxml2_2.9.4.bb | 1 +
2 files changed, 181 insertions(+)
create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2016-5131.patch
diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2016-5131.patch b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2016-5131.patch
new file mode 100644
index 0000000..9d47d02
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2016-5131.patch
@@ -0,0 +1,180 @@
+From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Tue, 28 Jun 2016 14:22:23 +0200
+Subject: [PATCH] Fix XPointer paths beginning with range-to
+
+The old code would invoke the broken xmlXPtrRangeToFunction. range-to
+isn't really a function but a special kind of location step. Remove
+this function and always handle range-to in the XPath code.
+
+The old xmlXPtrRangeToFunction could also be abused to trigger a
+use-after-free error with the potential for remote code execution.
+
+Found with afl-fuzz.
+
+Fixes CVE-2016-5131.
+
+CVE: CVE-2016-5131
+Upstream-Status: Backport
+https://git.gnome.org/browse/libxml2/commit/?id=9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e
+
+Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
+---
+ result/XPath/xptr/vidbase | 13 ++++++++
+ test/XPath/xptr/vidbase | 1 +
+ xpath.c | 7 ++++-
+ xpointer.c | 76 ++++-------------------------------------------
+ 4 files changed, 26 insertions(+), 71 deletions(-)
+
+diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase
+index 8b9e92d..f19193e 100644
+--- a/result/XPath/xptr/vidbase
++++ b/result/XPath/xptr/vidbase
+@@ -17,3 +17,16 @@ Object is a Location Set:
+ To node
+ ELEMENT p
+
++
++========================
++Expression: xpointer(range-to(id('chapter2')))
++Object is a Location Set:
++1 : Object is a range :
++ From node
++ /
++ To node
++ ELEMENT chapter
++ ATTRIBUTE id
++ TEXT
++ content=chapter2
++
+diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase
+index b146383..884b106 100644
+--- a/test/XPath/xptr/vidbase
++++ b/test/XPath/xptr/vidbase
+@@ -1,2 +1,3 @@
+ xpointer(id('chapter1')/p)
+ xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2]))
++xpointer(range-to(id('chapter2')))
+diff --git a/xpath.c b/xpath.c
+index d992841..5a01b1b 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) {
+ lc = 1;
+ break;
+ } else if ((NXT(len) == '(')) {
+- /* Note Type or Function */
++ /* Node Type or Function */
+ if (xmlXPathIsNodeType(name)) {
+ #ifdef DEBUG_STEP
+ xmlGenericError(xmlGenericErrorContext,
+ "PathExpr: Type search\n");
+ #endif
+ lc = 1;
++#ifdef LIBXML_XPTR_ENABLED
++ } else if (ctxt->xptr &&
++ xmlStrEqual(name, BAD_CAST "range-to")) {
++ lc = 1;
++#endif
+ } else {
+ #ifdef DEBUG_STEP
+ xmlGenericError(xmlGenericErrorContext,
+diff --git a/xpointer.c b/xpointer.c
+index 676c510..d74174a 100644
+--- a/xpointer.c
++++ b/xpointer.c
+@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) {
+ ret->here = here;
+ ret->origin = origin;
+
+- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to",
+- xmlXPtrRangeToFunction);
+ xmlXPathRegisterFunc(ret, (xmlChar *)"range",
+ xmlXPtrRangeFunction);
+ xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside",
+@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) {
+ * @nargs: the number of args
+ *
+ * Implement the range-to() XPointer function
++ *
++ * Obsolete. range-to is not a real function but a special type of location
++ * step which is handled in xpath.c.
+ */
+ void
+-xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) {
+- xmlXPathObjectPtr range;
+- const xmlChar *cur;
+- xmlXPathObjectPtr res, obj;
+- xmlXPathObjectPtr tmp;
+- xmlLocationSetPtr newset = NULL;
+- xmlNodeSetPtr oldset;
+- int i;
+-
+- if (ctxt == NULL) return;
+- CHECK_ARITY(1);
+- /*
+- * Save the expression pointer since we will have to evaluate
+- * it multiple times. Initialize the new set.
+- */
+- CHECK_TYPE(XPATH_NODESET);
+- obj = valuePop(ctxt);
+- oldset = obj->nodesetval;
+- ctxt->context->node = NULL;
+-
+- cur = ctxt->cur;
+- newset = xmlXPtrLocationSetCreate(NULL);
+-
+- for (i = 0; i < oldset->nodeNr; i++) {
+- ctxt->cur = cur;
+-
+- /*
+- * Run the evaluation with a node list made of a single item
+- * in the nodeset.
+- */
+- ctxt->context->node = oldset->nodeTab[i];
+- tmp = xmlXPathNewNodeSet(ctxt->context->node);
+- valuePush(ctxt, tmp);
+-
+- xmlXPathEvalExpr(ctxt);
+- CHECK_ERROR;
+-
+- /*
+- * The result of the evaluation need to be tested to
+- * decided whether the filter succeeded or not
+- */
+- res = valuePop(ctxt);
+- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res);
+- if (range != NULL) {
+- xmlXPtrLocationSetAdd(newset, range);
+- }
+-
+- /*
+- * Cleanup
+- */
+- if (res != NULL)
+- xmlXPathFreeObject(res);
+- if (ctxt->value == tmp) {
+- res = valuePop(ctxt);
+- xmlXPathFreeObject(res);
+- }
+-
+- ctxt->context->node = NULL;
+- }
+-
+- /*
+- * The result is used as the new evaluation set.
+- */
+- xmlXPathFreeObject(obj);
+- ctxt->context->node = NULL;
+- ctxt->context->contextSize = -1;
+- ctxt->context->proximityPosition = -1;
+- valuePush(ctxt, xmlXPtrWrapLocationSet(newset));
++xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt,
++ int nargs ATTRIBUTE_UNUSED) {
++ XP_ERROR(XPATH_EXPR_ERROR);
+ }
+
+ /**
+--
+2.7.4
+
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 59874be..1fed90b 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -19,6 +19,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
file://run-ptest \
file://python-sitepackages-dir.patch \
file://libxml-m4-use-pkgconfig.patch \
+ file://libxml2-CVE-2016-5131.patch \
"
SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5"
--
2.7.4
^ permalink raw reply related
* [PATCH v2] ltp: 20160126 -> 20160920
From: huangqy @ 2016-11-28 18:09 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Xin
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
1)Upgrade ltp from 20160126 to 20160920.
2)Delete some patches, since they are integrated upstream.
0001-ltp-Don-t-link-against-libfl.patch
0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
0007-replace-SIGCLD-with-SIGCHLD.patch
0009-Guard-error.h-with-__GLIBC__.patch
0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
0013-include-fcntl.h-for-getting-O_-definitions.patch
0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
0017-replace-sigval_t-with-union-sigval.patch
0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
0022-include-sys-types.h.patch
0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
0029-trace_shed-Fix-build-with-musl.patch
0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
0032-regen.sh-Include-asm-unistd.h-explicitly.patch
3)Modify one patch, since the data has been changed.
0011-Rename-sigset-variable-to-sigset1.patch
0035-fix-test_proc_kill-hang.patch
4)Add some new patches.
0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
0002-initialize-recursive-mutex-in-a-portable-way.patch
0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
...-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch | 32 ++
.../ltp/0001-ltp-Don-t-link-against-libfl.patch | 30 --
...tialize-recursive-mutex-in-a-portable-way.patch | 167 +++++++++
...n-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch | 120 +++++++
...move-unused-__BEGIN_DECLS-and-__END_DECLS.patch | 48 +++
...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
.../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 ---------------------
.../ltp/0009-Guard-error.h-with-__GLIBC__.patch | 270 --------------
.../0011-Rename-sigset-variable-to-sigset1.patch | 60 ++--
...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 ------------------
...nclude-fcntl.h-for-getting-O_-definitions.patch | 67 ----
...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64 ----
| 45 ---
.../0017-replace-sigval_t-with-union-sigval.patch | 88 -----
...lace-canonicalize_file_name-with-realpath.patch | 32 --
.../ltp/ltp/0022-include-sys-types.h.patch | 29 --
...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 29 --
.../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 33 --
...age-size-offset-as-per-page-size-alignmen.patch | 33 --
...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
.../ltp/ltp/0035-fix-test_proc_kill-hang.patch | 25 +-
.../ltp/{ltp_20160126.bb => ltp_20160920.bb} | 23 +-
24 files changed, 418 insertions(+), 1671 deletions(-)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
rename meta/recipes-extended/ltp/{ltp_20160126.bb => ltp_20160920.bb} (82%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch b/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
new file mode 100644
index 0000000..b035804
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
@@ -0,0 +1,32 @@
+From f381b5d58ea02e9001a1885db99d577ef3e49da5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 23 Jul 2016 05:25:32 +0000
+Subject: [PATCH 17/17] Define __SIGRTMIN and __SIGRTMAX on musl
+
+These defines are glibc internal symbols
+actually LTP should not have used it at all
+even the header in glibc states that
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 24d1faa..012a76f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -26,6 +26,10 @@ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -I.
+
++ifeq ($(LIBC),musl)
++CFLAGS += -D__SIGRTMIN=32 -D__SIGRTMAX=64
++endif
++
+ FILTER_OUT_LIBSRCS := mount_utils.c
+
+ LIB := libltp.a
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch b/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
deleted file mode 100644
index 585b7cb..0000000
--- a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 14985fccf7428eaa0b45decc22bfd20fd780f621 Mon Sep 17 00:00:00 2001
-From: Chong Lu <Chong.Lu@windriver.com>
-Date: Tue, 11 Mar 2014 14:47:22 +0800
-Subject: [PATCH 01/32] ltp: Don't link against libfl
-
-We have already defined yywrap function in scan.l file. After this, we no longer need to
-link against libfl and so no longer get errors about undefined references to yylex.
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- pan/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pan/Makefile b/pan/Makefile
-index 4cc6466..a4b575b 100644
---- a/pan/Makefile
-+++ b/pan/Makefile
-@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
-
- CPPFLAGS += -I$(abs_srcdir)
-
--LDLIBS += -lm $(LEXLIB)
-+LDLIBS += -lm
-
- LFLAGS += -l
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch b/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
new file mode 100644
index 0000000..3d01c90
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
@@ -0,0 +1,167 @@
+From 9ded0866313d7d59ea1833f318f2b5b42701422d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 21 Jul 2016 05:11:18 +0000
+Subject: [PATCH 11/17] initialize recursive mutex in a portable way
+
+PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not in POSIX
+
+use the portable way instead: pthread_once was designed for such
+cases.
+
+Link with libpthread wherever libltp is asked for
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/mk/testcases.mk | 2 +-
+ lib/ltp.pc.in | 2 +-
+ lib/newlib_tests/Makefile | 2 +-
+ lib/tests/Makefile | 2 +-
+ lib/tst_res.c | 18 +++++++++++++++++-
+ testcases/kernel/containers/netns/Makefile | 2 +-
+ testcases/kernel/containers/share/Makefile | 2 +-
+ 7 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/include/mk/testcases.mk b/include/mk/testcases.mk
+index ea26d4f..eff0eee 100644
+--- a/include/mk/testcases.mk
++++ b/include/mk/testcases.mk
+@@ -49,7 +49,7 @@ CPPFLAGS += -I$(abs_top_builddir)/$(TKI_DIR)
+
+ INSTALL_DIR := testcases/bin
+
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ $(APICMDS_DIR) $(LIBLTP_DIR) $(abs_top_builddir)/$(TKI_DIR): %:
+ mkdir -p "$@"
+diff --git a/lib/ltp.pc.in b/lib/ltp.pc.in
+index 9620129..63cd5f4 100644
+--- a/lib/ltp.pc.in
++++ b/lib/ltp.pc.in
+@@ -6,5 +6,5 @@ libdir=@libdir@
+ Name: LTP
+ Description: Linux Test Project
+ Version: @VERSION@
+-Libs: -L${libdir} -lltp
++Libs: -L${libdir} -lltp -lpthread
+ Cflags: -I${includedir}
+diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile
+index 0e4eeb8..9dd69fd 100644
+--- a/lib/newlib_tests/Makefile
++++ b/lib/newlib_tests/Makefile
+@@ -3,7 +3,7 @@ top_srcdir ?= ../..
+ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -W -Wall
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ test08: CFLAGS+=-pthread
+ test09: CFLAGS+=-pthread
+diff --git a/lib/tests/Makefile b/lib/tests/Makefile
+index 73a0f16..bc4476d 100644
+--- a/lib/tests/Makefile
++++ b/lib/tests/Makefile
+@@ -3,7 +3,7 @@ top_srcdir ?= ../..
+ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -W
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ tst_cleanup_once: CFLAGS += -pthread
+
+diff --git a/lib/tst_res.c b/lib/tst_res.c
+index b388d0d..ab995f8 100644
+--- a/lib/tst_res.c
++++ b/lib/tst_res.c
+@@ -79,7 +79,8 @@ int TEST_ERRNO;
+ assert(strlen(buf) > 0); \
+ } while (0)
+
+-static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++static pthread_once_t tmutex_once = PTHREAD_ONCE_INIT;
++static pthread_mutex_t tmutex;
+
+ static void check_env(void);
+ static void tst_condense(int tnum, int ttype, const char *tmesg);
+@@ -142,9 +143,20 @@ const char *strttype(int ttype)
+ #include "errnos.h"
+ #include "signame.h"
+
++static void init_tmutex(void)
++{
++ pthread_mutexattr_t attr;
++
++ pthread_mutexattr_init(&attr);
++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutex_init(&tmutex, &attr);
++ pthread_mutexattr_destroy(&attr);
++}
++
+ static void tst_res__(const char *file, const int lineno, int ttype,
+ const char *arg_fmt, ...)
+ {
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+@@ -233,6 +245,7 @@ void tst_flush(void)
+ {
+ NO_NEWLIB_ASSERT("Unknown", 0);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ /*
+@@ -369,6 +382,7 @@ void tst_exit(void)
+ {
+ NO_NEWLIB_ASSERT("Unknown", 0);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ tst_flush();
+@@ -441,6 +455,7 @@ static int tst_brk_entered = 0;
+ static void tst_brk__(const char *file, const int lineno, int ttype,
+ void (*func)(void), const char *arg_fmt, ...)
+ {
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+@@ -505,6 +520,7 @@ void tst_resm_hexd_(const char *file, const int lineno, int ttype,
+ {
+ NO_NEWLIB_ASSERT(file, lineno);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+diff --git a/testcases/kernel/containers/netns/Makefile b/testcases/kernel/containers/netns/Makefile
+index 3756a55..b2411cd 100644
+--- a/testcases/kernel/containers/netns/Makefile
++++ b/testcases/kernel/containers/netns/Makefile
+@@ -22,6 +22,6 @@ top_srcdir ?= ../../../..
+ include $(top_srcdir)/include/mk/testcases.mk
+ include $(abs_srcdir)/../Makefile.inc
+
+-LDLIBS := -lclone -lltp
++LDLIBS := -lclone -lltp -lpthread
+
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+diff --git a/testcases/kernel/containers/share/Makefile b/testcases/kernel/containers/share/Makefile
+index 962d688..cd79f99 100644
+--- a/testcases/kernel/containers/share/Makefile
++++ b/testcases/kernel/containers/share/Makefile
+@@ -17,6 +17,6 @@ top_srcdir ?= ../../../..
+ include $(top_srcdir)/include/mk/testcases.mk
+ include $(abs_srcdir)/../Makefile.inc
+
+-LDLIBS := -lltp
++LDLIBS := -lltp -lpthread
+
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch b/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
new file mode 100644
index 0000000..870c598
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
@@ -0,0 +1,120 @@
+From 4665be95ffaae035fffb88a632b6156194e5c52d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jan 2016 07:14:58 +0000
+Subject: [PATCH 04/15] rt_sigaction/rt_sigprocmark: Replace SA_NOMASK with
+ SA_NODEFER
+
+Fixes musl build failure e.g.
+error: 'SA_NOMASK' undeclared here (not in a function)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c | 4 ++--
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c | 5 ++---
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c | 4 ++--
+ testcases/kernel/syscalls/sigaction/sigaction02.c | 2 +-
+ testcases/misc/crash/crash01.c | 4 ++--
+ testcases/misc/crash/crash02.c | 3 +--
+ 6 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+index 5cf89cc..e07b974 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+@@ -57,10 +57,10 @@ static void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static void handler(int sig)
+ {
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+index a1da743..594b260 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+@@ -55,10 +54,10 @@ void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static struct test_case_t {
+ int exp_errno;
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+index 175d220..991c87f 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+@@ -55,10 +55,10 @@ static void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static struct test_case_t {
+ int exp_errno;
+diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c
+index 641a04e..8641bfc 100644
+--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
++++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
+@@ -91,7 +91,7 @@ int set_handler(int sig, int sig_to_mask, int flag)
+
+ if (flag == 0) {
+ sa.sa_sigaction = (void *)handler;
+- sa.sa_flags = SA_NOMASK;
++ sa.sa_flags = SA_NODEFER;
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, sig_to_mask);
+ err = sigaction(sig, &sa, NULL);
+diff --git a/testcases/misc/crash/crash01.c b/testcases/misc/crash/crash01.c
+index 0574521..614b7e8 100644
+--- a/testcases/misc/crash/crash01.c
++++ b/testcases/misc/crash/crash01.c
+@@ -409,7 +409,7 @@ void my_signal(int sig, void (*func) ())
+
+ act.sa_handler = func;
+ memset(&act.sa_mask, 0x00, sizeof(sigset_t));
+- act.sa_flags = SA_NOMASK | SA_RESTART;
++ act.sa_flags = SA_NODEFER | SA_RESTART;
+ sigaction(sig, &act, 0);
+ }
+
+diff --git a/testcases/misc/crash/crash02.c b/testcases/misc/crash/crash02.c
+index 00fee34..1aba3b9 100644
+--- a/testcases/misc/crash/crash02.c
++++ b/testcases/misc/crash/crash02.c
+@@ -49,7 +49,6 @@ TODO:
+ * Does a syscall is supposed to send SIGSEGV?
+ */
+
+-#define _GNU_SOURCE
+ #include <sys/syscall.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -358,7 +357,7 @@ void my_signal(int sig, void (*func) ())
+
+ act.sa_handler = func;
+ memset(&act.sa_mask, 0x00, sizeof(sigset_t));
+- act.sa_flags = SA_NOMASK | SA_RESTART;
++ act.sa_flags = SA_NODEFER | SA_RESTART;
+ sigaction(sig, &act, 0);
+ }
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch b/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
new file mode 100644
index 0000000..92fbf8f
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
@@ -0,0 +1,48 @@
+From fc73b57669c81ea10c00e838be8931a4e58357ba Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 7 Jan 2016 19:48:14 +0000
+Subject: [PATCH 03/17] Remove unused __BEGIN_DECLS and __END_DECLS
+
+Replace __s32 definitions with int32_t
+its not a generally available typedef
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/syscalls/epoll2/include/epoll.h | 5 -----
+ utils/sctp/include/netinet/sctp.h | 10 +++-------
+ 2 files changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/utils/sctp/include/netinet/sctp.h b/utils/sctp/include/netinet/sctp.h
+index 51f5bfb..c302cdb 100644
+--- a/utils/sctp/include/netinet/sctp.h
++++ b/utils/sctp/include/netinet/sctp.h
+@@ -42,7 +42,7 @@
+ extern "C" {
+ #endif
+
+-typedef __s32 sctp_assoc_t;
++typedef int32_t sctp_assoc_t;
+
+ /* Socket option layer for SCTP */
+ #ifndef SOL_SCTP
+@@ -658,7 +656,7 @@ struct sctp_assoc_value {
+ struct sctp_paddrinfo {
+ sctp_assoc_t spinfo_assoc_id;
+ struct sockaddr_storage spinfo_address;
+- __s32 spinfo_state;
++ int32_t spinfo_state;
+ __u32 spinfo_cwnd;
+ __u32 spinfo_srtt;
+ __u32 spinfo_rto;
+@@ -693,7 +691,7 @@ enum sctp_spinfo_state {
+ */
+ struct sctp_status {
+ sctp_assoc_t sstat_assoc_id;
+- __s32 sstat_state;
++ int32_t sstat_state;
+ __u32 sstat_rwnd;
+ __u16 sstat_unackdata;
+ __u16 sstat_penddata;
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch b/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
deleted file mode 100644
index 56a48ab..0000000
--- a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fb8b895385a641d74f2186fe5f20a872209692ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 18:24:20 +0000
-Subject: [PATCH 06/32] sendfile: Use off64_t instead of __off64_t
-
-__off64_t is specific to glibc where as off64_t is widely available
-Add _GNU_SOURCE for off64_t defines from sys/types.h
-Fixes
-<command-line>:0:7: error: unknown type name 'off64_t'
-sendfile02.c:97:18: note: in expansion of macro 'OFF_T'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sendfile/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/sendfile/Makefile b/testcases/kernel/syscalls/sendfile/Makefile
-index df7b63f..1bd1b57 100644
---- a/testcases/kernel/syscalls/sendfile/Makefile
-+++ b/testcases/kernel/syscalls/sendfile/Makefile
-@@ -21,6 +21,6 @@ top_srcdir ?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- include $(abs_srcdir)/../utils/newer_64.mk
-
--%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=__off64_t
-+%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=off64_t -D_GNU_SOURCE
-
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch b/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
deleted file mode 100644
index 4be906e..0000000
--- a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-From 405c03171e4bf0edd698cb602cf7bd7fe1d0401a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:33:53 +0000
-Subject: [PATCH 07/32] replace SIGCLD with SIGCHLD
-
-its defined to use SIGCHLD anyway in
-
-bits/signum.h:#define SIGCLD SIGCHLD /* Same as SIGCHLD
-(System V). */
-
-plus it helps these tests compile with musl which adheres to posix
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_sig.c | 8 ++++----
- testcases/kernel/connectors/pec/pec_listener.c | 1 +
- testcases/kernel/fs/doio/doio.c | 4 ++--
- testcases/kernel/fs/doio/growfiles.c | 2 +-
- testcases/kernel/syscalls/fcntl/fcntl11.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl17.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl19.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl20.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl21.c | 8 ++++----
- testcases/kernel/syscalls/kill/kill02.c | 6 +++---
- testcases/kernel/syscalls/kill/kill12.c | 8 ++++----
- testcases/kernel/syscalls/mkdir/mkdir09.c | 12 ++++++------
- testcases/kernel/syscalls/sighold/sighold02.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong6.c | 2 +-
- 15 files changed, 44 insertions(+), 43 deletions(-)
-
-diff --git a/lib/tst_sig.c b/lib/tst_sig.c
-index 3af5ffd..36565e1 100644
---- a/lib/tst_sig.c
-+++ b/lib/tst_sig.c
-@@ -49,7 +49,7 @@
- fork_flag - set to FORK or NOFORK depending upon whether the
- calling program executes a fork() system call. It
- is normally the case that the calling program treats
-- SIGCLD as an expected signal if fork() is being used.
-+ SIGCHLD as an expected signal if fork() is being used.
-
- handler - a pointer to the unexpected signal handler to
- be executed after an unexpected signal has been
-@@ -82,7 +82,7 @@ static void (*tst_setup_signal(int, void (*)(int))) (int);
-
- /****************************************************************************
- * tst_sig() : set-up to catch unexpected signals. fork_flag is set to NOFORK
-- * if SIGCLD is to be an "unexpected signal", otherwise it is set to
-+ * if SIGCHLD is to be an "unexpected signal", otherwise it is set to
- * FORK. cleanup points to a cleanup routine to be executed before
- * tst_exit is called (cleanup is set to NULL if no cleanup is desired).
- * handler is a pointer to the signal handling routine (if handler is
-@@ -117,7 +117,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- for (sig = 1; sig < NSIG; sig++) {
- /*
- * SIGKILL is never unexpected.
-- * SIGCLD is only unexpected when
-+ * SIGCHLD is only unexpected when
- * no forking is being done.
- * SIGINFO is used for file quotas and should be expected
- */
-@@ -205,7 +205,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- #endif
- break;
-
-- case SIGCLD:
-+ case SIGCHLD:
- if (fork_flag == FORK)
- continue;
-
-diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c
-index a1beb13..002750a 100644
---- a/testcases/kernel/connectors/pec/pec_listener.c
-+++ b/testcases/kernel/connectors/pec/pec_listener.c
-@@ -20,6 +20,7 @@
- /* */
- /******************************************************************************/
-
-+#define _GNU_SOURCE
- #include <sys/socket.h>
- #include <sys/poll.h>
- #include <sys/types.h>
-diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
-index 4b0dec5..5f65ef9 100644
---- a/testcases/kernel/fs/doio/doio.c
-+++ b/testcases/kernel/fs/doio/doio.c
-@@ -573,7 +573,7 @@ int main(int argc, char **argv)
- case SIGTSTP:
- case SIGSTOP:
- case SIGCONT:
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGBUS:
- case SIGSEGV:
- case SIGQUIT:
-@@ -615,7 +615,7 @@ int main(int argc, char **argv)
- }
-
- sigemptyset(&block_mask);
-- sigaddset(&block_mask, SIGCLD);
-+ sigaddset(&block_mask, SIGCHLD);
- sigprocmask(SIG_BLOCK, &block_mask, &omask);
-
- /*
-diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
-index 09e7f35..bbad230 100644
---- a/testcases/kernel/fs/doio/growfiles.c
-+++ b/testcases/kernel/fs/doio/growfiles.c
-@@ -1640,7 +1640,7 @@ int set_sig(void)
- #ifdef SIGRESTART
- case SIGRESTART:
- #endif /* SIGRESTART */
-- case SIGCLD:
-+ case SIGCHLD:
- break;
-
- default:
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c
-index fa6ce53..2de2b6c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl11.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
-@@ -105,10 +105,10 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0)
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0)
- tst_brkm(TBROK | TERRNO, cleanup,
-- "sigaction(SIGCLD, ..) failed");
-+ "sigaction(SIGCHLD, ..) failed");
- }
-
- void do_child(void)
-@@ -227,7 +227,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c
-index 5b03e39..6598b20 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl17.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
-@@ -150,9 +150,9 @@ int setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- return 1;
- }
- return 0;
-@@ -381,7 +381,7 @@ void stop_children(void)
- {
- int arg;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- arg = STOP;
- child_free(child_pipe1[1], arg);
- child_free(child_pipe2[1], arg);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c
-index a542cfc..88c91d6 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl19.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
-@@ -112,9 +112,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -265,7 +265,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c
-index aa06bab..99fd783 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl20.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
-@@ -109,9 +109,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) == -1)
-- tst_brkm(TFAIL | TERRNO, cleanup, "SIGCLD signal setup failed");
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) == -1)
-+ tst_brkm(TFAIL | TERRNO, cleanup, "SIGCHLD signal setup failed");
- }
-
- void cleanup(void)
-@@ -264,7 +264,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c
-index 5307021..8f1a67c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl21.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
-@@ -110,9 +110,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -272,7 +272,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/kill/kill02.c b/testcases/kernel/syscalls/kill/kill02.c
-index 9d6cc68..08360dd 100644
---- a/testcases/kernel/syscalls/kill/kill02.c
-+++ b/testcases/kernel/syscalls/kill/kill02.c
-@@ -701,7 +701,7 @@ void setup(void)
-
- /*
- * Set to catch unexpected signals.
-- * SIGCLD is set to be ignored because we do not wait for termination status.
-+ * SIGCHLD is set to be ignored because we do not wait for termination status.
- * SIGUSR1 is set to be ignored because this is the signal we are using for
- * the test and we are not concerned with the parent getting it.
- */
-@@ -713,9 +713,9 @@ void setup(void)
- "signal(SIGUSR1, SIG_IGN) failed");
- }
-
-- if (signal(SIGCLD, SIG_IGN) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
- tst_brkm(TBROK | TERRNO, NULL,
-- "signal(SIGCLD, SIG_IGN) failed");
-+ "signal(SIGCHLD, SIG_IGN) failed");
- }
-
- TEST_PAUSE;
-diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c
-index 7a47a4a..d7c4147 100644
---- a/testcases/kernel/syscalls/kill/kill12.c
-+++ b/testcases/kernel/syscalls/kill/kill12.c
-@@ -98,7 +98,7 @@ int main(int argc, char **argv)
-
- exno = 1;
-
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
-@@ -128,7 +128,7 @@ int main(int argc, char **argv)
- sleep(1);
-
- kill(pid, sig); /* child should ignroe this sig */
-- kill(pid, SIGCLD); /* child should exit */
-+ kill(pid, SIGCHLD); /* child should exit */
-
- #ifdef BCS
- while ((npid = wait(&status)) != pid
-@@ -222,14 +222,14 @@ void do_child(void)
- int exno = 1;
-
- #ifdef UCLINUX
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
- #endif
-
- sigset(sig, SIG_IGN); /* set to ignore signal */
-- kill(getppid(), SIGCLD); /* tell parent we are ready */
-+ kill(getppid(), SIGCHLD); /* tell parent we are ready */
- while (!chflag)
- sleep(1); /* wait for parent */
-
-diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c
-index 41c20e9..07b4fb8 100644
---- a/testcases/kernel/syscalls/mkdir/mkdir09.c
-+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
-@@ -122,10 +122,10 @@ int main(int argc, char *argv[])
-
- }
-
-- /* Set up to catch SIGCLD signal */
-- if (signal(SIGCLD, chld) == SIG_ERR) {
-+ /* Set up to catch SIGCHLD signal */
-+ if (signal(SIGCHLD, chld) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error setting up SIGCLD signal, ERRNO = %d", errno);
-+ "Error setting up SIGCHLD signal, ERRNO = %d", errno);
-
- }
-
-@@ -236,9 +236,9 @@ int runtest(void)
- tst_brkm(TFAIL, cleanup,
- "Error resetting SIGTERM signal, ERRNO = %d", errno);
- }
-- if (signal(SIGCLD, SIG_DFL) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_DFL) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error resetting SIGCLD signal, ERRNO = %d", errno);
-+ "Error resetting SIGCHLD signal, ERRNO = %d", errno);
- }
-
- if (test_time) {
-@@ -372,7 +372,7 @@ void term(int sig)
-
- void chld(int sig)
- {
-- /* Routine to handle SIGCLD signal. */
-+ /* Routine to handle SIGCHLD signal. */
-
- sigchld++;
- if (jump) {
-diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c
-index e3076fb..be01874 100644
---- a/testcases/kernel/syscalls/sighold/sighold02.c
-+++ b/testcases/kernel/syscalls/sighold/sighold02.c
-@@ -77,7 +77,7 @@ static int sigs_map[NUMSIGS];
- static int skip_sig(int sig)
- {
- switch (sig) {
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGKILL:
- case SIGALRM:
- case SIGSTOP:
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong.c b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-index 1196312..5b06798 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- tst_resm(TINFO, "Create a child process to continue to send packets");
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong6.c b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-index 9747f58..0a0fb1d 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-@@ -153,7 +153,7 @@ char *argv[];
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- printf("Create a child process to continue to send packets \n");
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
deleted file mode 100644
index e58e5a9..0000000
--- a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 4ba19d64e95a874995d0b554b891b5ec35bd9495 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:45:35 +0000
-Subject: [PATCH 09/32] Guard error.h with __GLIBC__
-
-error API is specific to glibc so use the guard to make it conditional
-on glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/faccessat/faccessat01.c | 2 ++
- testcases/kernel/syscalls/fallocate/fallocate01.c | 2 ++
- testcases/kernel/syscalls/fchmodat/fchmodat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat02.c | 2 ++
- testcases/kernel/syscalls/fstatat/fstatat01.c | 2 ++
- testcases/kernel/syscalls/futimesat/futimesat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat02.c | 2 ++
- testcases/kernel/syscalls/mkdirat/mkdirat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat02.c | 2 ++
- testcases/kernel/syscalls/openat/openat01.c | 2 ++
- testcases/kernel/syscalls/readlinkat/readlinkat01.c | 2 ++
- testcases/kernel/syscalls/renameat/renameat01.c | 2 ++
- testcases/kernel/syscalls/symlinkat/symlinkat01.c | 2 ++
- testcases/kernel/syscalls/unlinkat/unlinkat01.c | 2 ++
- 17 files changed, 34 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
-index 7f0e87a..c72dcf0 100644
---- a/testcases/kernel/syscalls/faccessat/faccessat01.c
-+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
-index e72b123..643c0e2 100644
---- a/testcases/kernel/syscalls/fallocate/fallocate01.c
-+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
-@@ -96,7 +96,9 @@
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <inttypes.h>
- #include <sys/utsname.h>
-
-diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-index 19e9ad5..ae6d807 100644
---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
-index b361253..a5218af 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat01.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
-@@ -28,7 +28,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c
-index 6b0304c..8d2863f 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat02.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
-@@ -26,7 +26,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c
-index 61531c6..e99fbd2 100644
---- a/testcases/kernel/syscalls/fstatat/fstatat01.c
-+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
-@@ -48,7 +48,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
-index ae8d4fe..316dd78 100644
---- a/testcases/kernel/syscalls/futimesat/futimesat01.c
-+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
-index fc0687b..83cbfe7 100644
---- a/testcases/kernel/syscalls/linkat/linkat01.c
-+++ b/testcases/kernel/syscalls/linkat/linkat01.c
-@@ -49,7 +49,9 @@
- #include <sys/time.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c
-index e9a752a..8d7e431 100644
---- a/testcases/kernel/syscalls/linkat/linkat02.c
-+++ b/testcases/kernel/syscalls/linkat/linkat02.c
-@@ -23,7 +23,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-index 7e15947..1dbc038 100644
---- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
-index 26e5538..f034f05 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat01.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c
-index f6368fa..7d0f7c0 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat02.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
-index 85f9a91..4ee0117 100644
---- a/testcases/kernel/syscalls/openat/openat01.c
-+++ b/testcases/kernel/syscalls/openat/openat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-index 97a49e8..b162853 100644
---- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-@@ -29,7 +29,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
-index f4cd51b..105a05b 100644
---- a/testcases/kernel/syscalls/renameat/renameat01.c
-+++ b/testcases/kernel/syscalls/renameat/renameat01.c
-@@ -42,7 +42,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-index 5c238d8..cb7a7e8 100644
---- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-index 31fe4e7..26f6d9a 100644
---- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
index 945280c..6eace63 100644
--- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
+++ b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
@@ -20,8 +20,8 @@ index 7203e9e..fce87d6 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
#define SIZE 16*1024
@@ -29,12 +29,12 @@ index 7203e9e..fce87d6 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -42,8 +42,8 @@ index 7203e9e..fce87d6 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
/*--------------------------------------------------------*/
@@ -55,8 +55,8 @@ index a3c9ca3..77b0fc9 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
int child();
static int rm_shm(int);
@@ -64,12 +64,12 @@ index a3c9ca3..77b0fc9 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -77,8 +77,8 @@ index a3c9ca3..77b0fc9 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
if ((shmid = shmget(key, SIZE, 0)) < 0) {
@@ -90,8 +90,8 @@ index 20fca52..6fb1d57 100644
int sig_catch = 0; /* variable to blocked/unblocked signals */
struct sigaction sa_new; /* struct to hold signal info */
--sigset_t sigset; /* signal set to hold signal lists */
-+sigset_t sigset1; /* signal set to hold signal lists */
+-sigset_t set; /* signal set to hold signal lists */
++sigset_t set1; /* signal set to hold signal lists */
sigset_t sigset2;
int main(int ac, char **av)
@@ -99,8 +99,8 @@ index 20fca52..6fb1d57 100644
* so that, signal will not be delivered to
* the test process.
*/
-- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));
-+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));
+- TEST(sigprocmask(SIG_BLOCK, &set, 0));
++ TEST(sigprocmask(SIG_BLOCK, &set1, 0));
/* Get the process id of test process */
my_pid = getpid();
@@ -108,8 +108,8 @@ index 20fca52..6fb1d57 100644
*/
errno = 0;
if (sigprocmask(SIG_UNBLOCK,
-- &sigset, 0) == -1) {
-+ &sigset1, 0) == -1) {
+- &set, 0) == -1) {
++ &set1, 0) == -1) {
tst_brkm(TFAIL, cleanup,
"sigprocmask() failed "
"to unblock signal, "
@@ -117,8 +117,8 @@ index 20fca52..6fb1d57 100644
* Initialise the signal sets with the list that
* excludes/includes all system-defined signals.
*/
-- if (sigemptyset(&sigset) == -1) {
-+ if (sigemptyset(&sigset1) == -1) {
+- if (sigemptyset(&set) == -1) {
++ if (sigemptyset(&set1) == -1) {
tst_brkm(TFAIL, cleanup,
"sigemptyset() failed, errno=%d : %s",
errno, strerror(errno));
@@ -126,8 +126,8 @@ index 20fca52..6fb1d57 100644
* Add specified signal (SIGINT) to the signal set
* which excludes system-defined signals.
*/
-- if (sigaddset(&sigset, SIGINT) == -1) {
-+ if (sigaddset(&sigset1, SIGINT) == -1) {
+- if (sigaddset(&set, SIGINT) == -1) {
++ if (sigaddset(&set1, SIGINT) == -1) {
tst_brkm(TFAIL, cleanup,
"sigaddset() failed, errno=%d : %s",
errno, strerror(errno));
diff --git a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch b/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
deleted file mode 100644
index e1532c1..0000000
--- a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-From 54e098a366a1d773c4d7d4124f2f5aab976681c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:58:08 +0000
-Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t
-
-int64_t is defined in ISO C99
-include limits.h to get defintions of PATH_MAX
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/fs/fsstress/fsstress.c | 31 +++++++++---------
- testcases/network/nfs/nfs_fsstress/fsstress.c | 47 ++++++++++++++-------------
- 2 files changed, 40 insertions(+), 38 deletions(-)
-
-diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
-index 2f89903..89f0b19 100644
---- a/testcases/kernel/fs/fsstress/fsstress.c
-+++ b/testcases/kernel/fs/fsstress/fsstress.c
-@@ -36,6 +36,7 @@
- #ifdef HAVE_SYS_PRCTL_H
- # include <sys/prctl.h>
- #endif
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)
- __u64 last;
- __s32 nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1764,14 +1765,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
-diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
-index ac91262..a34c416 100644
---- a/testcases/network/nfs/nfs_fsstress/fsstress.c
-+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
-@@ -31,6 +31,7 @@
- */
-
- #include "global.h"
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)
- __uint64_t last;
- int nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1708,14 +1709,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch b/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
deleted file mode 100644
index 4266e4f..0000000
--- a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1ef8c32317064438ec3b37a114f5d82957f4e0c6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:05:54 +0000
-Subject: [PATCH 13/32] include fcntl.h for getting O_* definitions
-
-musl exposes this issue, with glibc fcntl.h is included via some other
-header and this problem remained latent
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_03.c | 1 +
- testcases/kernel/syscalls/mq_notify/mq_notify01.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_c.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_s.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-index c1b11fd..8be156f 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-@@ -72,6 +72,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <sys/ipc.h>
- #include <sys/mman.h>
-diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-index 4728c70..5c7846c 100644
---- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-@@ -41,6 +41,7 @@
- #include <mqueue.h>
- #include <signal.h>
- #include <stdlib.h>
-+#include <fcntl.h>
-
- #include "../utils/include_j_h.h"
-
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_c.c b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-index 449784f..38d3274 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_c.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-@@ -9,6 +9,7 @@
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_s.c b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-index 17e98ad..bce8dd1 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_s.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-@@ -6,6 +6,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <errno.h>
- #include <sys/signal.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch b/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
deleted file mode 100644
index 84d81e9..0000000
--- a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d63fefa86dac437c47b9ebbea0a82a1240aaba2c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:09:56 +0000
-Subject: [PATCH 14/32] hyperthreading: Include sys/types.h for pid_t
- definition
-
-If sys/types.h is not included then it will not define pid_t_needed
-and therefore typedef wont be included and we get errors about pid_t
-being not known
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-index 1ec9794..9084aa7 100644
---- a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-index 1ec9794..c03a124 100644
---- a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-@@ -2,6 +2,7 @@
- #ifndef _HTUTILS_H_
- #define _HTUTILS_H_
-
-+#include <sys/types.h>
- #include <stdlib.h>
-
- int is_cmdline_para(const char *para);
-diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-index 2977ad0..6b484e1 100644
---- a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch b/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
deleted file mode 100644
index 963536f..0000000
--- a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f091839532f3afe0a58e8ba0b45615c899a43a47 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:12:09 +0000
-Subject: [PATCH 15/32] mincore01: Rename PAGESIZE to pagesize
-
-PAGESIZE conflicts with system headers on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/mincore/mincore01.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/mincore/mincore01.c b/testcases/kernel/syscalls/mincore/mincore01.c
-index 97a3d95..fa426d1 100644
---- a/testcases/kernel/syscalls/mincore/mincore01.c
-+++ b/testcases/kernel/syscalls/mincore/mincore01.c
-@@ -45,7 +45,7 @@
- #include "test.h"
- #include "safe_macros.h"
-
--static int PAGESIZE;
-+static int pagesize;
- static rlim_t STACK_LIMIT = 10485760;
-
- static void cleanup(void);
-@@ -146,7 +146,7 @@ static void setup4(struct test_case_t *tc)
- }
-
- tc->addr = global_pointer;
-- tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + PAGESIZE;
-+ tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + pagesize;
- tc->vector = global_vec;
-
- /*
-@@ -161,7 +161,7 @@ static void setup(void)
- char *buf;
- int fd;
-
-- PAGESIZE = getpagesize();
-+ pagesize = getpagesize();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-@@ -170,7 +170,7 @@ static void setup(void)
- TEST_PAUSE;
-
- /* global_pointer will point to a mmapped area of global_len bytes */
-- global_len = PAGESIZE * 2;
-+ global_len = pagesize * 2;
-
- buf = SAFE_MALLOC(cleanup, global_len);
- memset(buf, 42, global_len);
-@@ -186,7 +186,7 @@ static void setup(void)
- PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
- global_vec = SAFE_MALLOC(cleanup,
-- (global_len + PAGESIZE - 1) / PAGESIZE);
-+ (global_len + pagesize - 1) / pagesize);
-
- SAFE_CLOSE(cleanup, fd);
- }
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch b/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
deleted file mode 100644
index 1b5b93a..0000000
--- a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b9be924bbad8a1f84ae553fdd1aa8391aa8d2f4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:15:07 +0000
-Subject: [PATCH 16/32] ustat: Change header from ustat.h to sys/ustat.h
-
-makes it portable for musl, on glibc ustat.h is just including
-sys/ustat.h too
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/ustat/ustat01.c | 2 +-
- testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
-index 01b7688..494647b 100644
---- a/testcases/kernel/syscalls/ustat/ustat01.c
-+++ b/testcases/kernel/syscalls/ustat/ustat01.c
-@@ -20,8 +20,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "test.h"
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index 4e66236..edada31 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -21,8 +21,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include "test.h"
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch b/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
deleted file mode 100644
index ed25802..0000000
--- a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c882bcd18820b44a685f0d5edd7aaff77a88c912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:17:55 +0000
-Subject: [PATCH 17/32] replace sigval_t with union sigval
-
-This makes it compatible across musl and glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c | 2 +-
- testcases/kernel/syscalls/timer_gettime/timer_gettime01.c | 2 +-
- testcases/kernel/timers/timer_create/timer_create02.c | 4 ++--
- testcases/kernel/timers/timer_create/timer_create03.c | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-index d186c1f..bc03544 100644
---- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-@@ -54,7 +54,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-index b583aee..9371a6a 100644
---- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-@@ -55,7 +55,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c
-index 7f528ed..1127400 100644
---- a/testcases/kernel/timers/timer_create/timer_create02.c
-+++ b/testcases/kernel/timers/timer_create/timer_create02.c
-@@ -142,7 +142,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -151,7 +151,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
-diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c
-index 291fcfa..8b01bf7 100644
---- a/testcases/kernel/timers/timer_create/timer_create03.c
-+++ b/testcases/kernel/timers/timer_create/timer_create03.c
-@@ -129,7 +129,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -138,7 +138,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch b/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
deleted file mode 100644
index 0a4c5f0..0000000
--- a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 721e94985b9cff3e2724af7ea5be7d005bc12dec Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 06:55:27 +0000
-Subject: [PATCH 19/32] tomoyo: Replace canonicalize_file_name() with
- realpath()
-
-canonicalize_file_name() API is specific to glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-index da4af0f..5c1a3ca 100644
---- a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-+++ b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
- /* Test mount(). */
- {
- static char buf[4096];
-- char *dev_ram_path = canonicalize_file_name("/dev/ram0");
-+ char *dev_ram_path = realpath("/dev/ram0", NULL);
- if (!dev_ram_path)
-- dev_ram_path = canonicalize_file_name("/dev/ram");
-+ dev_ram_path = realpath("/dev/ram", NULL);
- if (!dev_ram_path) {
- dev_ram_path = "/dev/ram0";
- mknod(dev_ram_path, S_IFBLK, MKDEV(1, 0));
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch b/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
deleted file mode 100644
index 413b44a..0000000
--- a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7ac6fd51991ac61d1d7594f601d87842060ee284 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:06:11 +0000
-Subject: [PATCH 22/32] include sys/types.h
-
-Fixes
-
-error: unknown type name 'uint'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_04.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-index 72c2e60..e7e5f61 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-@@ -65,6 +65,7 @@
- #include <signal.h>
- #include <stdint.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
-
- #ifdef _LINUX_
- typedef unsigned long ulong_t;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch b/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
deleted file mode 100644
index b47d097..0000000
--- a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a74b275acc8158850f2500928a1467c3482c986 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:23:11 +0000
-Subject: [PATCH 27/32] sysconf01: Use _SC_2_C_VERSION conditionally
-
-_SC_2_C_VERSION is not available on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c b/testcases/kernel/syscalls/sysconf/sysconf01.c
-index 8542e77..e806943 100644
---- a/testcases/kernel/syscalls/sysconf/sysconf01.c
-+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c
-@@ -102,7 +102,9 @@ int main(void)
- test_sysconf(_SC_ATEXIT_MAX);
- test_sysconf(_SC_2_C_BIND);
- test_sysconf(_SC_2_C_DEV);
-+#ifdef __GLIBC__
- test_sysconf(_SC_2_C_VERSION);
-+#endif
- /* 21 - 25 */
- test_sysconf(_SC_2_CHAR_TERM);
- test_sysconf(_SC_2_FORT_DEV);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch b/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
deleted file mode 100644
index f7ece9e..0000000
--- a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2f8a57f66a94210d34dd0361659a8297cf3d813f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:29:24 +0000
-Subject: [PATCH 29/32] trace_shed: Fix build with musl
-
-Errors on musl are
-
-trace_sched.c:425:16: error: invalid operands to binary & (have
-'thread_sched_t * {aka struct <anonymous> *}' and 'int')
- thrd_ndx, WEXITSTATUS(status));
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/tool/trace_sched.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/sched/tool/trace_sched.c b/testcases/kernel/sched/tool/trace_sched.c
-index 7815686..30dca5f 100644
---- a/testcases/kernel/sched/tool/trace_sched.c
-+++ b/testcases/kernel/sched/tool/trace_sched.c
-@@ -422,7 +422,7 @@ int main(int argc, /* number of input parameters. */
- if (status == (thread_sched_t *) - 1) {
- fprintf(stderr,
- "thread [%d] - process exited with errors %d\n",
-- thrd_ndx, WEXITSTATUS(status));
-+ thrd_ndx, WEXITSTATUS((int)status));
- exit(-1);
- } else {
- exp_prio[thrd_ndx] = status->exp_prio;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
deleted file mode 100644
index d2d6d76..0000000
--- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 77c95dacffe90382a1f131c801ac569120d95949 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:32:24 +0000
-Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc
-
-e.g. musl does not implement the _NP mutex types
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_res.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/tst_res.c b/lib/tst_res.c
-index 5c1c58c..3244b5e 100644
---- a/lib/tst_res.c
-+++ b/lib/tst_res.c
-@@ -104,8 +104,11 @@ int TEST_ERRNO;
- assert(strlen(buf) > 0); \
- } while (0)
-
-+#ifdef __GLIBC__
- static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
--
-+#else
-+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };
-+#endif
- /*
- * Define local function prototypes.
- */
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch b/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
deleted file mode 100644
index 473ca4c..0000000
--- a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 293ff1da06748ed4c69be6ece262d42e562e7298 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:36:19 +0000
-Subject: [PATCH 31/32] vma03: fix page size offset as per page size alignment
-
-the offset the param of mmap2() doesn't align the page size, but,
-this param allow must be a multiple of the page size as returned
-by sysconf(_SC_PAGE_SIZE).meanwhile offset * 4096 must be a
-multiple of the system page size, so modify the input param of offset
-pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
-
-Signed-off-by: Chuang Dong <Chuang.Dong@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/mem/vma/vma03.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c
-index ad8a7b4..a539233 100644
---- a/testcases/kernel/mem/vma/vma03.c
-+++ b/testcases/kernel/mem/vma/vma03.c
-@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
- if (fd == -1)
- tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);
-
-- pgoff = ULONG_MAX - 1;
-+ pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
- map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
- fd, pgoff);
- if (map == MAP_FAILED)
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch b/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
deleted file mode 100644
index 5c6bf91..0000000
--- a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4f1905ff09c730091674818bd1b48ee221347101 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 08:30:29 +0000
-Subject: [PATCH 32/32] regen.sh: Include asm/unistd.h explicitly
-
-on musl this is not included indirectly and it results in errors like
-testcases/kernel/include/linux_syscall_numbers.h:1035:25: error:
-'__NR_SYSCALL_BASE' undeclared (first use in this function)
-| # define __NR_readdir (__NR_SYSCALL_BASE+ 89)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/include/regen.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/include/regen.sh b/testcases/kernel/include/regen.sh
-index f93f49b..ee790af 100755
---- a/testcases/kernel/include/regen.sh
-+++ b/testcases/kernel/include/regen.sh
-@@ -32,6 +32,7 @@ cat << EOF > "${output_pid}"
-
- #include <errno.h>
- #include <sys/syscall.h>
-+#include <asm/unistd.h>
- #include "cleanup.c"
-
- #define ltp_syscall(NR, ...) ({ \\
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
index 32ae8aa..5d0a887 100644
--- a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
+++ b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
@@ -1,23 +1,30 @@
-Fix test_proc_kill hanging
+From c6eaf473379e0ee56d94e5168a7f4f47e9c0b482 Mon Sep 17 00:00:00 2001
+From: George Nita <george.nita@enea.com>
+Date: Wed, 20 Jul 2016 20:04:59 -0700
+Subject: [PATCH 10/17] Fix test_proc_kill hanging
Sometimes the signal is delivered to memcg_process before the framework took
into consideration its pid entered in the tasks. Fixed by delaying the signal
send command.
Signed-off-by: George Nita <george.nita@enea.com>
-Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-index ffbe006..e81bf74 100755
+index b785fe3..2918cc5 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-@@ -220,8 +220,8 @@ test_proc_kill()
-
- $TEST_PATH/memcg_process $2 -s $3 &
+@@ -283,6 +283,7 @@ test_proc_kill()
pid=$!
-- sleep 1
+ TST_CHECKPOINT_WAIT 0
echo $pid > tasks
+ sleep 1
- kill -s USR1 $pid 2> /dev/null
- sleep 1
+ signal_memcg_process $pid $3
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160920.bb
similarity index 82%
rename from meta/recipes-extended/ltp/ltp_20160126.bb
rename to meta/recipes-extended/ltp/ltp_20160920.bb
index 7ee84e3..e087d87 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160920.bb
@@ -24,45 +24,32 @@ DEPENDS_append_libc-musl = " fts "
EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "fce797676b14f50406718e7ef640b50da66c9b36"
+SRCREV = "52f4cf73fc1304e1339136729cfc03960d2d7c85"
SRC_URI = "git://github.com/linux-test-project/ltp.git \
- file://0001-ltp-Don-t-link-against-libfl.patch \
file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \
file://0003-Add-knob-to-control-tirpc-support.patch \
file://0004-build-Add-option-to-select-libc-implementation.patch \
file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \
- file://0006-sendfile-Use-off64_t-instead-of-__off64_t.patch \
- file://0007-replace-SIGCLD-with-SIGCHLD.patch \
file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
- file://0009-Guard-error.h-with-__GLIBC__.patch \
file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \
file://0011-Rename-sigset-variable-to-sigset1.patch \
- file://0012-fsstress.c-Replace-__int64_t-with-int64_t.patch \
- file://0013-include-fcntl.h-for-getting-O_-definitions.patch \
- file://0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch \
- file://0015-mincore01-Rename-PAGESIZE-to-pagesize.patch \
- file://0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch \
- file://0017-replace-sigval_t-with-union-sigval.patch \
file://0018-guard-mallocopt-with-__GLIBC__.patch \
- file://0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch \
file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \
file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \
- file://0022-include-sys-types.h.patch \
file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \
file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \
file://0025-mc_gethost-include-sys-types.h.patch \
file://0026-crash01-Define-_GNU_SOURCE.patch \
- file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \
file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \
- file://0029-trace_shed-Fix-build-with-musl.patch \
- file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \
- file://0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch \
- file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch \
file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
file://0034-periodic_output.patch \
file://0035-fix-test_proc_kill-hang.patch \
file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch \
+ file://0002-initialize-recursive-mutex-in-a-portable-way.patch \
+ file://0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch \
+ file://0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch \
"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related
* Re: npm.bbclass support for deep native modules?
From: Paul Eggleton @ 2016-11-28 10:11 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: openembedded-core
In-Reply-To: <b3516f43-75eb-2fa5-31c6-ad5e3a57d032@pabigot.com>
Hi Peter,
On Sat, 26 Nov 2016 18:17:48 Peter A. Bigot wrote:
> I'm using the current head of morty and trying to get a handle on the
> new nodejs support in OE.
>
> I'm failing to build a recipe for statsd. Starting with this:
>
> devtool add 'npm://registry.npmjs.org;name=statsd;version=0.8.0'
> bitbake statsd
>
> produces an error related to the modern-syslog dependency:
>
> DEBUG: Executing shell function do_compile
>
> | npm ERR! Linux 4.4.0-47-generic
> | npm ERR! argv
>
> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin/
> node"
> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin
> /npm" "--arch=arm" "--target_arch=arm" "--production" "--no-registry"
> "install"
> | npm ERR! node v4.6.1
> | npm ERR! npm v2.15.9
>
> | npm ERR! Registry not defined and registry files not found:
> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-linu
> x-gnueabi/statsd/0.8.0-r0/npm_cache/noregistry/modern-syslog/.cache.json",
> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-lin
> ux-gnueabi/statsd/0.8.0-r0/npm_cache/modern-syslog/.cache.json".
>
> modern-syslog 1.1.2 needs node-gyp to build a native component and
> https://wiki.yoctoproject.org/wiki/TipsAndTricks/NPM notes that devtool
> can't detect such things. Doing this works fine to build that package:
>
> devtool add 'npm://registry.npmjs.org;name=modern-syslog;version=1.1.2'
> bitbake modern-syslog
>
> but I'm having no luck getting "bitbake statsd" to find the result.
> I've added:
>
> DEPENDS = "modern-syslog"
>
> to statsd_0.8.0.bb but that isn't helping. It looks like I need some
> way to have the recipe install the prepared modern-syslog into the cache
> (or globally?) before baking statsd, but since the cache gets cleared in
> npm_do_compile() it's not clear how to make that happen.
>
> I'm very rusty with OE (two years away), so am I missing something or is
> this just beyond what the bitbake infrastructure can currently handle?
> If so, can somebody suggest a way to hand-patch the recipe, or outline
> how npm.bbclass might be extended to support this?
Disclaimer - I'm the one who has been doing most of the recent work with npm
support (aside from the node.js recipe and the original npm fetcher plugin,
which were the work of others) however my knowledge of node.js is pretty
limited - most of it has been picked up along the way. So unfortunately I
can't immediately see why this isn't working. The thing that puzzles me in
particular about the error you're seeing though is that we're explicitly
telling npm not to look for a registry, so why is it complaining about the
lack of a registry?
Henry / Brendan - any suggestions?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: [PATCH V3 2/2] systemd: Upgrade to 232
From: Burton, Ross @ 2016-11-28 10:12 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
In-Reply-To: <20161123092807.28693-2-raj.khem@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 75479 bytes --]
This still breaks systemd-boot.
NOTE: Applying patch
'0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch'
(../meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch)
ERROR: Command Error: 'quilt --quiltrc
TOPDIR/tmp/sysroots/x86_64-linux/etc/quiltrc push' exited with 0 Output:
Applying patch
0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
patching file Makefile.am
Hunk #1 FAILED at 247.
Hunk #2 succeeded at 320 (offset -1 lines).
Hunk #3 FAILED at 2906.
2 out of 3 hunks FAILED -- rejects in file Makefile.am
patching file configure.ac
Patch 0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch does
not apply (enforce with -f)
Ross
On 23 November 2016 at 09:28, Khem Raj <raj.khem@gmail.com> wrote:
> * Drop support for rcS.d SysV init scripts.
> These are prone to cause dependency loops, and almost all packages with
> rcS scripts now ship a native systemd service.
>
> * Drop mount propagation patch, it only happens with libseccomp, OE doesnt
> enable it
>
> * kdbus option has disappeared from configure
>
> * Ignore dev-so for PN now since systemd introduced private .so see
> https://github.com/systemd/systemd/issues/3810
>
> * Add libnss* to PACKAGES_DYNAMIC for libnss-resolve to work correctly
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-core/systemd/systemd.inc | 4 +-
> ....c-Change-the-default-device-timeout-to-2.patch | 8 +-
> ...r-getty-to-agetty-in-console-setup-system.patch | 10 +-
> .../systemd/0003-define-exp10-if-missing.patch | 12 +-
> ...nv-when-secure-versions-are-not-available.patch | 21 ++--
> ...t-install-dependency-links-at-install-tim.patch | 10 +-
> ...heck-for-additional-features-that-uclibc-.patch | 10 +-
> ...pper-instead-of-looking-for-relative-opti.patch | 38 ++----
> ...wn-Use-execvpe-only-when-libc-supports-it.patch | 16 +--
> ...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 27 +++--
> ...0010-implment-systemd-sysv-install-for-OE.patch | 6 +-
> ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 12 +-
> .../systemd/0012-rules-whitelist-hd-devices.patch | 21 ++--
> ...-Make-root-s-home-directory-configurable.patch} | 90 +++++---------
> ...tor-add-support-for-executing-scripts-und.patch | 133
> ---------------------
> ...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
> ...remove-userspace-firmware-loading-suppor.patch} | 58 +++++----
> ...0015-systemd-user-avoid-using-system-auth.patch | 35 ------
> ...patch => 0016-make-test-dir-configurable.patch} | 21 ++--
> ...=> 0017-remove-duplicate-include-uchar.h.patch} | 10 +-
> ...h => 0018-check-for-uchar.h-in-configure.patch} | 16 ++-
> ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} | 20 ++--
> ...sing.h-for-getting-secure_getenv-definiti.patch | 27 -----
> .../systemd/systemd/CVE-2016-7795.patch | 69 -----------
> ...dev-re-enable-mount-propagation-for-udevd.patch | 31 -----
> .../systemd/{systemd_230.bb => systemd_232.bb} | 24 ++--
> 26 files changed, 196 insertions(+), 539 deletions(-)
> rename meta/recipes-core/systemd/systemd/{0014-Make-root-s-
> home-directory-configurable.patch => 0013-Make-root-s-home-directory-configurable.patch}
> (66%)
> delete mode 100644 meta/recipes-core/systemd/systemd/0013-sysv-generator-
> add-support-for-executing-scripts-und.patch
> rename meta/recipes-core/systemd/systemd/{0016-Revert-rules-
> remove-firmware-loading-rules.patch => 0014-Revert-rules-remove-firmware-loading-rules.patch}
> (84%)
> rename meta/recipes-core/systemd/systemd/{0017-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch => 0015-Revert-udev-remove-
> userspace-firmware-loading-suppor.patch} (89%)
> delete mode 100644 meta/recipes-core/systemd/systemd/0015-systemd-user-
> avoid-using-system-auth.patch
> rename meta/recipes-core/systemd/systemd/{0018-make-test-dir-configurable.patch
> => 0016-make-test-dir-configurable.patch} (77%)
> rename meta/recipes-core/systemd/systemd/{0019-remove-
> duplicate-include-uchar.h.patch => 0017-remove-duplicate-include-uchar.h.patch}
> (81%)
> rename meta/recipes-core/systemd/systemd/{0020-check-for-uchar.h-in-configure.patch
> => 0018-check-for-uchar.h-in-configure.patch} (76%)
> rename meta/recipes-core/systemd/systemd/{0022-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch => 0019-socket-util-don-t-fail-
> if-libc-doesn-t-support-IDN.patch} (69%)
> delete mode 100644 meta/recipes-core/systemd/
> systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
> delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
> delete mode 100644 meta/recipes-core/systemd/
> systemd/udev-re-enable-mount-propagation-for-udevd.patch
> rename meta/recipes-core/systemd/{systemd_230.bb => systemd_232.bb} (96%)
>
> diff --git a/meta/recipes-core/systemd/systemd.inc
> b/meta/recipes-core/systemd/systemd.inc
> index f800f42..29e0be6 100644
> --- a/meta/recipes-core/systemd/systemd.inc
> +++ b/meta/recipes-core/systemd/systemd.inc
> @@ -14,12 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
> LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=
> 751419260aa954499f7abaabaa882bbe \
> file://LICENSE.LGPL2.1;md5=
> 4fbd65380cdd255951079008b364516c"
>
> -SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba"
> +SRCREV = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c"
>
> SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
>
> -PV = "230+git${SRCPV}"
> -
> S = "${WORKDIR}/git"
>
> LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
> diff --git a/meta/recipes-core/systemd/systemd/0001-core-device.c-
> Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/
> systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
> index f7ef7a3..ee2cd6c 100644
> --- a/meta/recipes-core/systemd/systemd/0001-core-device.c-
> Change-the-default-device-timeout-to-2.patch
> +++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-
> Change-the-default-device-timeout-to-2.patch
> @@ -1,7 +1,7 @@
> -From 3bc4552117879f57522b5972b724729ca993f1ea Mon Sep 17 00:00:00 2001
> +From a544d6d15f5c418084f322349aafe341128d5fca Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 14 Dec 2015 04:09:19 +0000
> -Subject: [PATCH 01/36] core/device.c: Change the default device timeout
> to 240
> +Subject: [PATCH 01/19] core/device.c: Change the default device timeout
> to 240
> sec.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/core/device.c b/src/core/device.c
> -index d201dc5..340d62a 100644
> +index c572a67..f90774e 100644
> --- a/src/core/device.c
> +++ b/src/core/device.c
> @@ -112,7 +112,7 @@ static void device_init(Unit *u) {
> @@ -29,5 +29,5 @@ index d201dc5..340d62a 100644
> u->ignore_on_isolate = true;
> }
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0002-units-Prefer-
> getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/
> systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> index 28939eb..951a28d 100644
> --- a/meta/recipes-core/systemd/systemd/0002-units-Prefer-
> getty-to-agetty-in-console-setup-system.patch
> +++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-
> getty-to-agetty-in-console-setup-system.patch
> @@ -1,7 +1,7 @@
> -From e5f405aba347d216e7f2b73d7dd681b13be442e3 Mon Sep 17 00:00:00 2001
> +From 8736d9b9bb492f60e8f3a1a7fb5a05ba3201d86b Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:29:15 +0000
> -Subject: [PATCH 02/36] units: Prefer getty to agetty in console setup
> systemd
> +Subject: [PATCH 02/19] units: Prefer getty to agetty in console setup
> systemd
> units
>
> Upstream-Status: Inappropriate [configuration specific]
> @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
> -index 46164ab..bdf6ec8 100644
> +index 5b82c13..e729469 100644
> --- a/units/getty@.service.m4
> +++ b/units/getty@.service.m4
> -@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0
> +@@ -33,7 +33,7 @@ ConditionPathExists=/dev/tty0
>
> [Service]
> # the VT is cleared by TTYVTDisallocate
> @@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
> Restart=always
> UtmpIdentifier=%I
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
> b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
> index e62d580..37c6ac5 100644
> --- a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
> +++ b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
> @@ -1,4 +1,7 @@
> -Subject: [PATCH 03/36] define exp10 if missing
> +From b383c286f58184575216b2bf6f185ba2ad648956 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 19:25:45 -0800
> +Subject: [PATCH 03/19] define exp10 if missing
>
> Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-
> fix-build-on-uClibc-exp10.patch
>
> @@ -8,16 +11,15 @@ Upstream-Status: Pending
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ---
> src/basic/missing.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/src/basic/missing.h b/src/basic/missing.h
> -index 651e414..fafa233 100644
> +index 4c013be..4a3fd9c 100644
> --- a/src/basic/missing.h
> +++ b/src/basic/missing.h
> -@@ -1013,4 +1013,9 @@ typedef int32_t key_serial_t;
> +@@ -1078,4 +1078,9 @@ typedef int32_t key_serial_t;
>
> #endif
>
> @@ -28,5 +30,5 @@ index 651e414..fafa233 100644
> +
> #include "missing_syscall.h"
> --
> -2.8.3
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-
> secure-versions-are-not-available.patch b/meta/recipes-core/systemd/
> systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
> index 989a1fa..ab2cbe0 100644
> --- a/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-
> secure-versions-are-not-available.patch
> +++ b/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-
> secure-versions-are-not-available.patch
> @@ -1,7 +1,7 @@
> -From bb8d8148b16572ae17d3c308552cf73915386b05 Mon Sep 17 00:00:00 2001
> +From 5765cda4f7243e240b1e8723dc536fb20503d544 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 12 Sep 2015 19:10:04 +0000
> -Subject: [PATCH 04/36] Use getenv when secure versions are not available
> +Date: Wed, 9 Nov 2016 19:28:32 -0800
> +Subject: [PATCH 04/19] Use getenv when secure versions are not available
>
> musl doesnt implement secure version, so we default
> to it if configure does not detect a secure imeplementation
> @@ -9,19 +9,14 @@ to it if configure does not detect a secure
> imeplementation
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Upstream-Status: Denied
> ---
> - src/basic/missing.h | 3 +--
> - 1 file changed, 1 insertion(+), 2 deletions(-)
> + src/basic/missing.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/basic/missing.h b/src/basic/missing.h
> -index ee7e7ea..3170429 100644
> +index 4a3fd9c..4936873 100644
> --- a/src/basic/missing.h
> +++ b/src/basic/missing.h
> -@@ -585,12 +585,11 @@ static inline int name_to_handle_at(int fd, const
> char *name, struct file_handle
> - return syscall(__NR_name_to_handle_at, fd, name, handle,
> mnt_id, flags);
> - }
> - #endif
> --
> - #ifndef HAVE_SECURE_GETENV
> +@@ -529,7 +529,7 @@ struct btrfs_ioctl_quota_ctl_args {
> # ifdef HAVE___SECURE_GETENV
> # define secure_getenv __secure_getenv
> # else
> @@ -31,5 +26,5 @@ index ee7e7ea..3170429 100644
> #endif
>
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-
> install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/
> systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> index f69e26e..7016e98 100644
> --- a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-
> install-dependency-links-at-install-tim.patch
> +++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-
> install-dependency-links-at-install-tim.patch
> @@ -1,7 +1,7 @@
> -From 3436b12d40bf4f4ab7e3e16600e5f6c35a470da4 Mon Sep 17 00:00:00 2001
> +From 74450f0dbad2f8478c26eeaa46d4e4a987858f45 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:03:44 +0000
> -Subject: [PATCH 05/36] binfmt: Don't install dependency links at install
> time
> +Subject: [PATCH 05/19] binfmt: Don't install dependency links at install
> time
> for the binfmt services
>
> use [Install] blocks so that they get created when the service is enabled
> @@ -24,10 +24,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> -index 03341fc..629740f 100644
> +index 50da458..29ed1dd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -4387,10 +4387,6 @@ INSTALL_DIRS += \
> +@@ -4635,10 +4635,6 @@ INSTALL_DIRS += \
> $(prefix)/lib/binfmt.d \
> $(sysconfdir)/binfmt.d
>
> @@ -70,5 +70,5 @@ index d53073e..8c57ee0 100644
> +[Install]
> +WantedBy=sysinit.target
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0006-configure-Check-
> for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/
> systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
> index 0d63755..43a0d3f 100644
> --- a/meta/recipes-core/systemd/systemd/0006-configure-Check-
> for-additional-features-that-uclibc-.patch
> +++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-
> for-additional-features-that-uclibc-.patch
> @@ -1,7 +1,7 @@
> -From bb6f1d8a000b337280541afde7cccdcfe03cdeb1 Mon Sep 17 00:00:00 2001
> +From 82d837b76618a773485b96e38b7b91083a7437e8 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:05:45 +0000
> -Subject: [PATCH 06/36] configure: Check for additional features that
> uclibc
> +Subject: [PATCH 06/19] configure: Check for additional features that
> uclibc
> doesnt support
>
> This helps in supporting uclibc which does not have all features that
> @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 18 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> -index f51533c..0239fd0 100644
> +index 7f6b3b9..7c4b5a2 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -112,6 +112,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount],
> [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
> +@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount],
> [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
>
> AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln
> doesn't support --relative ***])])
>
> @@ -44,5 +44,5 @@ index f51533c..0239fd0 100644
>
> AC_CHECK_TOOL(OBJCOPY, objcopy)
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-
> instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/
> systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
> index 12f6ace..fad69a5 100644
> --- a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-
> instead-of-looking-for-relative-opti.patch
> +++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-
> instead-of-looking-for-relative-opti.patch
> @@ -1,31 +1,22 @@
> -From fa5e137fbd2fb081ae897575377d718ee8cb6349 Mon Sep 17 00:00:00 2001
> +From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 20 Dec 2015 04:20:28 +0000
> -Subject: [PATCH 07/36] use lnr wrapper instead of looking for --relative
> +Date: Wed, 9 Nov 2016 19:32:14 -0800
> +Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
> option for ln
>
> Upstream-Status: Inappropriate [OE-Specific]
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> - Makefile.am | 6 +++---
> + Makefile.am | 2 +-
> configure.ac | 2 --
> - 2 files changed, 3 insertions(+), 5 deletions(-)
> + 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> -index 629740f..82b6553 100644
> +index 29ed1dd..02f4017 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -243,7 +243,7 @@ define move-to-rootlibdir
> - $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
> - so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
> - rm -f $(DESTDIR)$(libdir)/$$libname && \
> -- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name
> $(DESTDIR)$(libdir)/$$libname && \
> -+ lnr $(DESTDIR)$(rootlibdir)/$$so_img_name
> $(DESTDIR)$(libdir)/$$libname && \
> - mv $(DESTDIR)$(libdir)/$$libname.*
> $(DESTDIR)$(rootlibdir); \
> - fi
> - endef
> -@@ -317,7 +317,7 @@ define install-relative-aliases
> +@@ -320,7 +320,7 @@ define install-relative-aliases
> while [ -n "$$1" ]; do \
> $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
> rm -f $(DESTDIR)$$dir/$$2 && \
> @@ -34,20 +25,11 @@ index 629740f..82b6553 100644
> shift 2 || exit $$?; \
> done
> endef
> -@@ -2781,7 +2781,7 @@ systemd_dbus1_generator_LDADD = \
> - dbus1-generator-install-hook:
> - $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
> - $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/
> systemd-dbus1-generator
> -- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(
> systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/
> systemd-dbus1-generator
> -+ $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator
> $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
> -
> - dbus1-generator-uninstall-hook:
> - rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
> diff --git a/configure.ac b/configure.ac
> -index 0239fd0..c5ab9d0 100644
> +index 7c4b5a2..b10c952 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin],
> [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
> +@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin],
> [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
> AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount],
> [$PATH:/usr/sbin:/sbin])
> AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount],
> [$PATH:/usr/sbin:/sbin])
>
> @@ -57,5 +39,5 @@ index 0239fd0..c5ab9d0 100644
>
> AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-
> execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/
> systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> index 6e6f199..586b5aa 100644
> --- a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-
> execvpe-only-when-libc-supports-it.patch
> +++ b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-
> execvpe-only-when-libc-supports-it.patch
> @@ -1,7 +1,7 @@
> -From ae999ff50efb9cc82537adef7696c6f732afcfc8 Mon Sep 17 00:00:00 2001
> +From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:10:37 +0000
> -Subject: [PATCH 08/36] nspawn: Use execvpe only when libc supports it
> +Date: Wed, 9 Nov 2016 19:33:49 -0800
> +Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it
>
> Upstream-Status: Denied [no desire for uclibc support]
>
> @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 7 insertions(+)
>
> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> -index 5a68fec..65e65ec 100644
> +index 9b9ae90..19b47cd 100644
> --- a/src/nspawn/nspawn.c
> +++ b/src/nspawn/nspawn.c
> -@@ -111,6 +111,8 @@ typedef enum LinkJournal {
> +@@ -123,6 +123,8 @@ typedef enum LinkJournal {
> LINK_GUEST
> } LinkJournal;
>
> @@ -23,7 +23,7 @@ index 5a68fec..65e65ec 100644
> static char *arg_directory = NULL;
> static char *arg_template = NULL;
> static char *arg_chdir = NULL;
> -@@ -2637,7 +2639,12 @@ static int inner_child(
> +@@ -2871,7 +2873,12 @@ static int inner_child(
> a[0] = (char*) "/sbin/init";
> execve(a[0], a, env_use);
> } else if (!strv_isempty(arg_parameters))
> @@ -35,7 +35,7 @@ index 5a68fec..65e65ec 100644
> +#endif /* HAVE_EXECVPE */
> else {
> if (!arg_chdir)
> - chdir(home ?: "/root");
> + /* If we cannot change the directory, we'll end
> up in /, that is expected. */
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0009-util-bypass-
> unimplemented-_SC_PHYS_PAGES-system-conf.patch
> b/meta/recipes-core/systemd/systemd/0009-util-bypass-
> unimplemented-_SC_PHYS_PAGES-system-conf.patch
> index 116f3d4..f150bb0 100644
> --- a/meta/recipes-core/systemd/systemd/0009-util-bypass-
> unimplemented-_SC_PHYS_PAGES-system-conf.patch
> +++ b/meta/recipes-core/systemd/systemd/0009-util-bypass-
> unimplemented-_SC_PHYS_PAGES-system-conf.patch
> @@ -1,7 +1,7 @@
> -From 3498f488b27f90398d7c8d1d06aac5ab684370e8 Mon Sep 17 00:00:00 2001
> +From 085c8b6f253726ad547e7be84ff3f2b99701488b Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Mon, 14 Dec 2015 00:47:53 +0000
> -Subject: [PATCH 09/36] util: bypass unimplemented _SC_PHYS_PAGES system
> +Date: Wed, 9 Nov 2016 19:38:07 -0800
> +Subject: [PATCH 09/19] util: bypass unimplemented _SC_PHYS_PAGES system
> configuration API on uclibc
>
> Upstream-Status: Inappropriate [uclibc-specific]
> @@ -12,12 +12,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 15 insertions(+)
>
> diff --git a/src/basic/util.c b/src/basic/util.c
> -index ea1bed7..fdaf340 100644
> +index c1b5ca1..4c62d43 100644
> --- a/src/basic/util.c
> +++ b/src/basic/util.c
> -@@ -767,10 +767,25 @@ uint64_t physical_memory(void) {
> - /* We return this as uint64_t in case we are running as 32bit
> - * process on a 64bit kernel with huge amounts of memory */
> +@@ -742,6 +742,20 @@ uint64_t physical_memory(void) {
> + * In order to support containers nicely that have a configured
> memory limit we'll take the minimum of the
> + * physically reported amount of memory and the limit configured
> for the root cgroup, if there is any. */
>
> +#ifdef __UCLIBC__
> + char line[128];
> @@ -33,14 +33,17 @@ index ea1bed7..fdaf340 100644
> + fclose(f);
> + return (uint64_t) mem;
> +#else
> - mem = sysconf(_SC_PHYS_PAGES);
> - assert(mem > 0);
> + sc = sysconf(_SC_PHYS_PAGES);
> + assert(sc > 0);
>
> - return (uint64_t) mem * (uint64_t) page_size();
> +@@ -762,6 +776,7 @@ uint64_t physical_memory(void) {
> + lim *= ps;
> +
> + return MIN(mem, lim);
> +#endif
> }
>
> - int update_reboot_param_file(const char *param) {
> + uint64_t physical_memory_scale(uint64_t v, uint64_t max) {
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
> b/meta/recipes-core/systemd/systemd/0010-implment-systemd-
> sysv-install-for-OE.patch
> index 75fa3a5..8828d6e 100644
> --- a/meta/recipes-core/systemd/systemd/0010-implment-systemd-
> sysv-install-for-OE.patch
> +++ b/meta/recipes-core/systemd/systemd/0010-implment-systemd-
> sysv-install-for-OE.patch
> @@ -1,7 +1,7 @@
> -From 5f94f5ad46c1ded54c3797979d384e4c1eb77bb0 Mon Sep 17 00:00:00 2001
> +From 52726be92e2b841f744a96c378cc872ae0033a2b Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Sat, 5 Sep 2015 06:31:47 +0000
> -Subject: [PATCH 10/36] implment systemd-sysv-install for OE
> +Subject: [PATCH 10/19] implment systemd-sysv-install for OE
>
> Use update-rc.d for enabling/disabling and status command
> to check the status of the sysv service
> @@ -39,5 +39,5 @@ index a53a3e6..5d877b0 100755
> *)
> usage ;;
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0011-nss-mymachines-
> Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/
> systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
> index 34ae645..b01ae97 100644
> --- a/meta/recipes-core/systemd/systemd/0011-nss-mymachines-
> Build-conditionally-when-HAVE_MYHOSTN.patch
> +++ b/meta/recipes-core/systemd/systemd/0011-nss-mymachines-
> Build-conditionally-when-HAVE_MYHOSTN.patch
> @@ -1,7 +1,7 @@
> -From 2b2450f6b7197bff4637c0283e8784500471d083 Mon Sep 17 00:00:00 2001
> +From 3f6f45578b828e414f50c6822375073e7174236a Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 14 Dec 2015 00:50:01 +0000
> -Subject: [PATCH 11/36] nss-mymachines: Build conditionally when
> +Subject: [PATCH 11/19] nss-mymachines: Build conditionally when
> HAVE_MYHOSTNAME is set
>
> Fixes build failures when building with --disable-myhostname
> @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 2 insertions(+)
>
> diff --git a/Makefile.am b/Makefile.am
> -index 82b6553..b3f3343 100644
> +index 02f4017..420e0e0 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -4876,6 +4876,7 @@ SYSTEM_UNIT_ALIASES += \
> +@@ -5146,6 +5146,7 @@ SYSTEM_UNIT_ALIASES += \
> BUSNAMES_TARGET_WANTS += \
> org.freedesktop.machine1.busname
>
> @@ -25,7 +25,7 @@ index 82b6553..b3f3343 100644
> libnss_mymachines_la_SOURCES = \
> src/nss-mymachines/nss-mymachines.sym \
> src/nss-mymachines/nss-mymachines.c
> -@@ -4896,6 +4897,7 @@ lib_LTLIBRARIES += \
> +@@ -5167,6 +5168,7 @@ rootlib_LTLIBRARIES += \
> libnss_mymachines.la
>
> endif
> @@ -34,5 +34,5 @@ index 82b6553..b3f3343 100644
> polkitpolicy_in_files += \
> src/machine/org.freedesktop.machine1.policy.in
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
> b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
> index 6143088..8666bdc 100644
> --- a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-
> hd-devices.patch
> +++ b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-
> hd-devices.patch
> @@ -1,7 +1,7 @@
> -From 5ebc0d87565a73710dea602c00b1586d5a1364e5 Mon Sep 17 00:00:00 2001
> -From: Patrick Ohly <patrick.ohly@intel.com>
> -Date: Wed, 16 Sep 2015 13:55:58 +0200
> -Subject: [PATCH 12/36] rules: whitelist hd* devices
> +From 8cc1ae11f54dcc38ee2168b0f99703b835dd3942 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 19:41:13 -0800
> +Subject: [PATCH 12/19] rules: whitelist hd* devices
>
> qemu by default emulates IDE and the linux-yocto kernel(s) use
> CONFIG_IDE instead of the more modern libsata, so disks appear as
> @@ -10,23 +10,24 @@ CONFIG_IDE instead of the more modern libsata, so
> disks appear as
> Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]
>
> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> rules/60-persistent-storage.rules | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/60-persistent-storage.rules
> b/rules/60-persistent-storage.rules
> -index 0b14bb4..1c4d97a 100644
> +index c13d05c..b14fbed 100644
> --- a/rules/60-persistent-storage.rules
> +++ b/rules/60-persistent-storage.rules
> -@@ -6,7 +6,7 @@
> - ACTION=="remove", GOTO="persistent_storage_end"
> +@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
> + ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1",
> GOTO="persistent_storage_end"
>
> SUBSYSTEM!="block", GOTO="persistent_storage_end"
> --KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*
> |sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*",
> GOTO="persistent_storage_end"
> -+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*
> |hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*",
> GOTO="persistent_storage_end"
> +-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*
> |sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*",
> GOTO="persistent_storage_end"
> ++KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*
> |hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*",
> GOTO="persistent_storage_end"
>
> # ignore partitions that span the entire disk
> TEST=="whole_disk", GOTO="persistent_storage_end"
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
> b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-
> directory-configurable.patch
> similarity index 66%
> rename from meta/recipes-core/systemd/systemd/0014-Make-root-s-home-
> directory-configurable.patch
> rename to meta/recipes-core/systemd/systemd/0013-Make-root-s-home-
> directory-configurable.patch
> index 2eea0ff..2b33337 100644
> --- a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-
> directory-configurable.patch
> +++ b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-
> directory-configurable.patch
> @@ -1,4 +1,7 @@
> -Subject: [PATCH 14/36] Make root's home directory configurable
> +From 79e64a07840e0d97d66e46111f1c086bf83981b7 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 20:35:30 -0800
> +Subject: [PATCH 13/19] Make root's home directory configurable
>
> OpenEmbedded has a configurable home directory for root. Allow
> systemd to be built using its idea of what root's home directory
> @@ -11,23 +14,20 @@ https://github.com/systemd/systemd/issues/541
>
> Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ---
> - Makefile.am | 2 ++
> - configure.ac | 7 +++++++
> - src/basic/user-util.c | 4 ++--
> - src/core/namespace.c | 2 +-
> - src/nspawn/nspawn.c | 4 ++--
> - units/console-shell.service.m4.in | 4 ++--
> - units/emergency.service.in | 4 ++--
> - units/rescue.service.in | 4 ++--
> - 8 files changed, 20 insertions(+), 11 deletions(-)
> + Makefile.am | 2 ++
> + configure.ac | 7 +++++++
> + src/basic/user-util.c | 4 ++--
> + src/nspawn/nspawn.c | 4 ++--
> + units/emergency.service.in | 4 ++--
> + units/rescue.service.in | 4 ++--
> + 6 files changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> -index 305099a..88c1250 100644
> +index 420e0e0..3010b01 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -206,6 +206,7 @@ AM_CPPFLAGS = \
> +@@ -213,6 +213,7 @@ AM_CPPFLAGS = \
> -DLIBDIR=\"$(libdir)\" \
> -DROOTLIBDIR=\"$(rootlibdir)\" \
> -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
> @@ -35,8 +35,8 @@ index 305099a..88c1250 100644
> -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
> -I $(top_srcdir)/src \
> -I $(top_builddir)/src/basic \
> -@@ -5863,6 +5864,7 @@ EXTRA_DIST += \
> - substitutions = \
> +@@ -6057,6 +6058,7 @@ substitutions = \
> + '|rootlibdir=$(rootlibdir)|' \
> '|rootlibexecdir=$(rootlibexecdir)|' \
> '|rootbindir=$(rootbindir)|' \
> + '|roothomedir=$(roothomedir)|' \
> @@ -44,10 +44,10 @@ index 305099a..88c1250 100644
> '|SYSTEMCTL=$(rootbindir)/systemctl|' \
> '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
> diff --git a/configure.ac b/configure.ac
> -index 329861a..01764f5 100644
> +index b10c952..dfc0bd3 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -1478,6 +1478,11 @@ AC_ARG_WITH([rootlibdir],
> +@@ -1513,6 +1513,11 @@ AC_ARG_WITH([rootlibdir],
> [with_rootlibdir=${libdir}])
> AX_NORMALIZE_PATH([with_rootlibdir])
>
> @@ -59,7 +59,7 @@ index 329861a..01764f5 100644
> AC_ARG_WITH([pamlibdir],
> AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM
> modules]),
> [],
> -@@ -1562,6 +1567,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
> +@@ -1598,6 +1603,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
> AC_SUBST([pamconfdir], [$with_pamconfdir])
> AC_SUBST([rootprefix], [$with_rootprefix])
> AC_SUBST([rootlibdir], [$with_rootlibdir])
> @@ -67,7 +67,7 @@ index 329861a..01764f5 100644
>
> AC_CONFIG_FILES([
> Makefile
> -@@ -1653,6 +1659,7 @@ AC_MSG_RESULT([
> +@@ -1688,6 +1694,7 @@ AC_MSG_RESULT([
> includedir: ${includedir}
> lib dir: ${libdir}
> rootlib dir: ${with_rootlibdir}
> @@ -76,10 +76,10 @@ index 329861a..01764f5 100644
> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
> Build Python: ${PYTHON}
> diff --git a/src/basic/user-util.c b/src/basic/user-util.c
> -index f65ca3e..da1101a 100644
> +index 938533d..3f9fdc4 100644
> --- a/src/basic/user-util.c
> +++ b/src/basic/user-util.c
> -@@ -123,7 +123,7 @@ int get_user_creds(
> +@@ -127,7 +127,7 @@ int get_user_creds(
> *gid = 0;
>
> if (home)
> @@ -88,7 +88,7 @@ index f65ca3e..da1101a 100644
>
> if (shell)
> *shell = "/bin/sh";
> -@@ -354,7 +354,7 @@ int get_home_dir(char **_h) {
> +@@ -387,7 +387,7 @@ int get_home_dir(char **_h) {
> /* Hardcode home directory for root to avoid NSS */
> u = getuid();
> if (u == 0) {
> @@ -97,24 +97,11 @@ index f65ca3e..da1101a 100644
> if (!h)
> return -ENOMEM;
>
> -diff --git a/src/core/namespace.c b/src/core/namespace.c
> -index 203d122..45c0d11 100644
> ---- a/src/core/namespace.c
> -+++ b/src/core/namespace.c
> -@@ -415,7 +415,7 @@ int setup_namespace(
> - home_dir = strjoina("-", home_dir);
> - run_user_dir = prefix_roota(root_directory,
> "/run/user");
> - run_user_dir = strjoina("-", run_user_dir);
> -- root_dir = prefix_roota(root_directory, "/root");
> -+ root_dir = prefix_roota(root_directory,
> ROOTHOMEDIR);
> - root_dir = strjoina("-", root_dir);
> -
> - r = append_mounts(&m, STRV_MAKE(home_dir,
> run_user_dir, root_dir),
> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> -index 8ec0584..51df00b 100644
> +index 19b47cd..e42bf19 100644
> --- a/src/nspawn/nspawn.c
> +++ b/src/nspawn/nspawn.c
> -@@ -2739,7 +2739,7 @@ static int inner_child(
> +@@ -2798,7 +2798,7 @@ static int inner_child(
> if (envp[n_env])
> n_env++;
>
> @@ -123,7 +110,7 @@ index 8ec0584..51df00b 100644
> (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ?
> arg_user : "root") < 0) ||
> (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ?
> arg_user : "root") < 0))
> return log_oom();
> -@@ -2816,7 +2816,7 @@ static int inner_child(
> +@@ -2882,7 +2882,7 @@ static int inner_child(
> else {
> if (!arg_chdir)
> /* If we cannot change the directory, we'll end
> up in /, that is expected. */
> @@ -132,23 +119,8 @@ index 8ec0584..51df00b 100644
>
> execle("/bin/bash", "-bash", NULL, env_use);
> execle("/bin/sh", "-sh", NULL, env_use);
> -diff --git a/units/console-shell.service.m4.in b/units/
> console-shell.service.m4.in
> -index a345ec2..3caae7d 100644
> ---- a/units/console-shell.service.m4.in
> -+++ b/units/console-shell.service.m4.in
> -@@ -15,8 +15,8 @@ After=rc-local.service
> - Before=getty.target
> -
> - [Service]
> --Environment=HOME=/root
> --WorkingDirectory=-/root
> -+Environment=HOME=@roothomedir@
> -+WorkingDirectory=-@roothomedir@
> - ExecStart=-@SULOGIN@
> - ExecStopPost=-@SYSTEMCTL@ poweroff
> - Type=idle
> diff --git a/units/emergency.service.in b/units/emergency.service.in
> -index 0de16f2..4826062 100644
> +index da68eb8..e25f879 100644
> --- a/units/emergency.service.in
> +++ b/units/emergency.service.in
> @@ -15,8 +15,8 @@ Conflicts=syslog.socket
> @@ -160,10 +132,10 @@ index 0de16f2..4826062 100644
> +Environment=HOME=@roothomedir@
> +WorkingDirectory=-@roothomedir@
> ExecStartPre=-/bin/plymouth --wait quit
> - ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in,
> type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
> "systemctl default" or ^D to\\ntry again to boot into default mode.'
> + ExecStartPre=-/bin/echo -e 'You are in emergency mode. After logging in,
> type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
> "systemctl default" or ^D to\\ntry again to boot into default mode.'
> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail
> --no-block default"
> diff --git a/units/rescue.service.in b/units/rescue.service.in
> -index 92553f6..590ae17 100644
> +index 5feff69..a83439e 100644
> --- a/units/rescue.service.in
> +++ b/units/rescue.service.in
> @@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
> @@ -174,9 +146,9 @@ index 92553f6..590ae17 100644
> -WorkingDirectory=-/root
> +Environment=HOME=@roothomedir@
> +WorkingDirectory=-@roothomedir@
> - ExecStartPre=-/bin/plymouth quit
> - ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! After logging in,
> type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
> "systemctl default" or ^D to\\nboot into default mode.'
> + ExecStartPre=-/bin/plymouth --wait quit
> + ExecStartPre=-/bin/echo -e 'You are in rescue mode. After logging in,
> type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
> "systemctl default" or ^D to\\nboot into default mode.'
> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail
> --no-block default"
> --
> -2.8.3
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0013-sysv-generator-
> add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/
> systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
> deleted file mode 100644
> index ac67f65..0000000
> --- a/meta/recipes-core/systemd/systemd/0013-sysv-generator-
> add-support-for-executing-scripts-und.patch
> +++ /dev/null
> @@ -1,133 +0,0 @@
> -From 6736de4a3caf9a0b3c888c6cc05103ab1b86907d Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Mon, 14 Dec 2015 05:09:53 +0000
> -Subject: [PATCH 13/36] sysv-generator: add support for executing scripts
> under
> - /etc/rcS.d/
> -
> -To be compatible, all services translated from scripts under /etc/rcS.d
> would
> -run before services translated from scripts under /etc/rcN.d.
> -
> -Upstream-Status: Inappropriate [OE specific]
> -
> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/sysv-generator/sysv-generator.c | 47 ++++++++++++++++++++++++++++--
> -------
> - 1 file changed, 36 insertions(+), 11 deletions(-)
> -
> -diff --git a/src/sysv-generator/sysv-generator.c
> b/src/sysv-generator/sysv-generator.c
> -index b5925a4..ea06d6a 100644
> ---- a/src/sysv-generator/sysv-generator.c
> -+++ b/src/sysv-generator/sysv-generator.c
> -@@ -44,7 +44,8 @@
> -
> - typedef enum RunlevelType {
> - RUNLEVEL_UP,
> -- RUNLEVEL_DOWN
> -+ RUNLEVEL_DOWN,
> -+ RUNLEVEL_SYSINIT
> - } RunlevelType;
> -
> - static const struct {
> -@@ -59,6 +60,9 @@ static const struct {
> - { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
> - { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
> -
> -+ /* Debian style rcS.d, also adopted by OE */
> -+ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT},
> -+
> - /* Standard SysV runlevels for shutdown */
> - { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
> - { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
> -@@ -67,7 +71,7 @@ static const struct {
> - directories in this order, and we want to make sure that
> - sysv_start_priority is known when we first load the
> - unit. And that value we only know from S links. Hence
> -- UP must be read before DOWN */
> -+ UP/SYSINIT must be read before DOWN */
> - };
> -
> - static const char *arg_dest = "/tmp";
> -@@ -86,6 +90,8 @@ typedef struct SysvStub {
> - bool has_lsb;
> - bool reload;
> - bool loaded;
> -+ bool default_dependencies;
> -+ bool from_rcsd;
> - } SysvStub;
> -
> - static void free_sysvstub(SysvStub *s) {
> -@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap
> *all_services) {
> - if (s->has_lsb && other->has_lsb)
> - continue;
> -
> -- if (other->sysv_start_priority < s->sysv_start_priority)
> {
> -- r = strv_extend(&s->after, other->name);
> -+ /* All scripts under /etc/rcS.d should execute before
> scripts under
> -+ * /etc/rcN.d */
> -+ if (!other->from_rcsd && s->from_rcsd) {
> -+ r = strv_extend(&s->before, other->name);
> - if (r < 0)
> - return log_oom();
> -
> -- } else if (other->sysv_start_priority >
> s->sysv_start_priority) {
> -- r = strv_extend(&s->before, other->name);
> -+ } else if (other->from_rcsd && !s->from_rcsd) {
> -+ r = strv_extend(&s->after, other->name);
> - if (r < 0)
> - return log_oom();
> -- } else
> -- continue;
> -+ } else {
> -+ if (other->sysv_start_priority <
> s->sysv_start_priority) {
> -+ r = strv_extend(&s->after, other->name);
> -+ if (r < 0)
> -+ return log_oom();
> -+ }
> -+ else if (other->sysv_start_priority >
> s->sysv_start_priority) {
> -+ r = strv_extend(&s->before, other->name);
> -+ if (r < 0)
> -+ return log_oom();
> -+ }
> -+ else
> -+ continue;
> -+ }
> -
> - /* FIXME: Maybe we should compare the name here
> lexicographically? */
> - }
> -@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp,
> Hashmap *all_services) {
> - return log_oom();
> -
> - service->sysv_start_priority = -1;
> -+ service->default_dependencies = true;
> -+ service->from_rcsd = false;
> - service->name = name;
> - service->path = fpath;
> - name = fpath = NULL;
> -@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const
> LookupPaths *lp, Hashmap *all_servic
> -
> - if (de->d_name[0] == 'S') {
> -
> -- if (rcnd_table[i].type ==
> RUNLEVEL_UP)
> -+ if (rcnd_table[i].type ==
> RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
> -
> service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
> --
> -+
> service->default_dependencies = (rcnd_table[i].type ==
> RUNLEVEL_SYSINIT)?false:true;
> -+ service->from_rcsd =
> (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false;
> -+ }
> - r = set_ensure_allocated(&runlevel_services[i],
> NULL);
> - if (r < 0) {
> - log_oom();
> -@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const
> LookupPaths *lp, Hashmap *all_servic
> - }
> -
> - } else if (de->d_name[0] == 'K' &&
> -- (rcnd_table[i].type ==
> RUNLEVEL_DOWN)) {
> -+ (rcnd_table[i].type ==
> RUNLEVEL_DOWN ||
> -+ rcnd_table[i].type ==
> RUNLEVEL_SYSINIT)) {
> -
> - r = set_ensure_allocated(&shutdown_services,
> NULL);
> - if (r < 0) {
> ---
> -1.8.3.1
> -
> diff --git a/meta/recipes-core/systemd/systemd/0016-Revert-rules-
> remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/
> systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
> similarity index 84%
> rename from meta/recipes-core/systemd/systemd/0016-Revert-rules-
> remove-firmware-loading-rules.patch
> rename to meta/recipes-core/systemd/systemd/0014-Revert-rules-
> remove-firmware-loading-rules.patch
> index 66905b5..ed7c68f 100644
> --- a/meta/recipes-core/systemd/systemd/0016-Revert-rules-
> remove-firmware-loading-rules.patch
> +++ b/meta/recipes-core/systemd/systemd/0014-Revert-rules-
> remove-firmware-loading-rules.patch
> @@ -1,7 +1,7 @@
> -From 7311ecc745c17d6ed9fd9cf43039648483a87605 Mon Sep 17 00:00:00 2001
> +From 0f47cfcb16e8e40a90a9221f9995f8cd8a915c22 Mon Sep 17 00:00:00 2001
> From: Jonathan Liu <net147@gmail.com>
> Date: Thu, 19 Mar 2015 15:01:29 +1100
> -Subject: [PATCH 16/36] Revert "rules: remove firmware loading rules"
> +Subject: [PATCH 14/19] Revert "rules: remove firmware loading rules"
>
> This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
> Userspace firmware loading support is needed for Linux < 3.7.
> @@ -24,5 +24,5 @@ index 0000000..f0ae684
> +
> +SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0017-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> b/meta/recipes-core/systemd/systemd/0015-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> similarity index 89%
> rename from meta/recipes-core/systemd/systemd/0017-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> rename to meta/recipes-core/systemd/systemd/0015-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> index 642625f..f31d211 100644
> --- a/meta/recipes-core/systemd/systemd/0017-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> +++ b/meta/recipes-core/systemd/systemd/0015-Revert-udev-
> remove-userspace-firmware-loading-suppor.patch
> @@ -1,4 +1,7 @@
> -Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading
> +From 4d28d9a7d8d69fb429955d770e53e7a81640da24 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 20:45:23 -0800
> +Subject: [PATCH 15/19] Revert "udev: remove userspace firmware loading
> support"
>
> This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
> @@ -10,21 +13,21 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> Makefile.am | 12 +++
> - README | 4 +-
> + README | 6 +-
> TODO | 1 +
> - configure.ac | 22 ++++++
> + configure.ac | 18 +++++
> src/udev/udev-builtin-firmware.c | 154 ++++++++++++++++++++++++++++++
> +++++++++
> src/udev/udev-builtin.c | 3 +
> src/udev/udev.h | 6 ++
> src/udev/udevd.c | 13 ++++
> - 8 files changed, 213 insertions(+), 2 deletions(-)
> + 8 files changed, 210 insertions(+), 3 deletions(-)
> create mode 100644 src/udev/udev-builtin-firmware.c
>
> diff --git a/Makefile.am b/Makefile.am
> -index 305099a..e774976 100644
> +index 3010b01..229492a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -3706,6 +3706,18 @@ libudev_core_la_LIBADD = \
> +@@ -3791,6 +3791,18 @@ libudev_core_la_LIBADD = \
> $(BLKID_LIBS) \
> $(KMOD_LIBS)
>
> @@ -44,10 +47,17 @@ index 305099a..e774976 100644
> libudev_core_la_SOURCES += \
> src/udev/udev-builtin-kmod.c
> diff --git a/README b/README
> -index ca8993c..87f3297 100644
> +index 9f5bc93..f60ae11 100644
> --- a/README
> +++ b/README
> -@@ -56,8 +56,8 @@ REQUIREMENTS:
> +@@ -50,14 +50,14 @@ REQUIREMENTS:
> + CONFIG_PROC_FS
> + CONFIG_FHANDLE (libudev, mount and bind mount handling)
> +
> +- udev will fail to work with the legacy sysfs layout:
> ++ Udev will fail to work with the legacy sysfs layout:
> + CONFIG_SYSFS_DEPRECATED=n
> +
> Legacy hotplug slows down the system and confuses udev:
> CONFIG_UEVENT_HELPER_PATH=""
>
> @@ -59,10 +69,10 @@ index ca8993c..87f3297 100644
>
> Some udev rules and virtualization detection relies on it:
> diff --git a/TODO b/TODO
> -index fac9ccf..2645582 100644
> +index baaac94..1ab1691 100644
> --- a/TODO
> +++ b/TODO
> -@@ -642,6 +642,7 @@ Features:
> +@@ -658,6 +658,7 @@ Features:
> * initialize the hostname from the fs label of /, if /etc/hostname does
> not exist?
>
> * udev:
> @@ -71,13 +81,13 @@ index fac9ccf..2645582 100644
> - kill scsi_id
> - add trigger --subsystem-match=usb/usb_device device
> diff --git a/configure.ac b/configure.ac
> -index 329861a..af85405 100644
> +index dfc0bd3..1de0066 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -1361,6 +1361,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb],
> [disable hardware database
> +@@ -1394,6 +1394,23 @@ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test
> "$have_myhostname" = "yes"])
> + AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware
> database support])],
> + enable_hwdb=$enableval, enable_hwdb=yes)
> AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
> -
> - # ------------------------------------------------------------
> ------------------
> +AC_ARG_WITH(firmware-path,
> + AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
> + [Firmware search path (default="")]),
> @@ -93,19 +103,15 @@ index 329861a..af85405 100644
> +done
> +IFS=$OLD_IFS
> +AC_SUBST(FIRMWARE_PATH)
> -+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1,
> [Define if FIRMWARE is availabe]) ])
> ++AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1,
> [Define if FIRMWARE is available]) ])
> +AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
> -+
> -+# ------------------------------------------------------------
> ------------------
> +
> + # ------------------------------------------------------------
> ------------------
> have_manpages=no
> - AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable
> manpages]))
> - AC_PATH_PROG([XSLTPROC], [xsltproc])
> -@@ -1656,6 +1675,9 @@ AC_MSG_RESULT([
> +@@ -1698,6 +1715,7 @@ AC_MSG_RESULT([
> SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
> Build Python: ${PYTHON}
> -+ Installation Python: ${PYTHON_BINARY}
> -+ sphinx binary: ${SPHINX_BUILD}
> + firmware path: ${FIRMWARE_PATH}
> PAM modules dir: ${with_pamlibdir}
> PAM configuration dir: ${with_pamconfdir}
> @@ -309,7 +315,7 @@ index 8433e8d..d32366d 100644
> extern const struct udev_builtin udev_builtin_input_id;
> extern const struct udev_builtin udev_builtin_keyboard;
> diff --git a/src/udev/udevd.c b/src/udev/udevd.c
> -index e9dd2f4..0abc28e 100644
> +index d336ee0..81e5dc5 100644
> --- a/src/udev/udevd.c
> +++ b/src/udev/udevd.c
> @@ -125,6 +125,9 @@ struct event {
> @@ -322,7 +328,7 @@ index e9dd2f4..0abc28e 100644
> };
>
> static inline struct event *node_to_event(struct udev_list_node *node) {
> -@@ -614,6 +617,10 @@ static int event_queue_insert(Manager *manager,
> struct udev_device *dev) {
> +@@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager,
> struct udev_device *dev) {
> event->devnum = udev_device_get_devnum(dev);
> event->is_block = streq("block", udev_device_get_subsystem(dev)
> );
> event->ifindex = udev_device_get_ifindex(dev);
> @@ -333,7 +339,7 @@ index e9dd2f4..0abc28e 100644
>
> log_debug("seq %llu queued, '%s' '%s'",
> udev_device_get_seqnum(dev),
> udev_device_get_action(dev), udev_device_get_subsystem(dev)
> );
> -@@ -699,6 +706,12 @@ static bool is_devpath_busy(Manager *manager, struct
> event *event) {
> +@@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct
> event *event) {
> return true;
> }
>
> @@ -347,5 +353,5 @@ index e9dd2f4..0abc28e 100644
> if (event->devpath[common] == '/') {
> event->delaying_seqnum = loop_event->seqnum;
> --
> -2.8.3
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
> b/meta/recipes-core/systemd/systemd/0015-systemd-user-
> avoid-using-system-auth.patch
> deleted file mode 100644
> index 6e6f344..0000000
> --- a/meta/recipes-core/systemd/systemd/0015-systemd-user-
> avoid-using-system-auth.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -Subject: [PATCH 15/36] systemd-user: avoid using system-auth
> -
> -In OE, we don't provide system-auth, instead, we use common-* files.
> -So modify systemd-user file to use common-* files.
> -
> -Upstream-Status: Inappropriate [oe specific]
> -
> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ----
> - src/login/systemd-user.m4 | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
> -index f188a8e..862d8d7 100644
> ---- a/src/login/systemd-user.m4
> -+++ b/src/login/systemd-user.m4
> -@@ -2,11 +2,11 @@
> - #
> - # Used by systemd --user instances.
> -
> --account include system-auth
> -+account include common-account
> -
> - m4_ifdef(`HAVE_SELINUX',
> - session required pam_selinux.so close
> - session required pam_selinux.so nottys open
> - )m4_dnl
> - session required pam_loginuid.so
> --session include system-auth
> -+session include common-session
> ---
> -2.8.3
> -
> diff --git a/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
> b/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch
> similarity index 77%
> rename from meta/recipes-core/systemd/systemd/0018-make-test-dir-
> configurable.patch
> rename to meta/recipes-core/systemd/systemd/0016-make-test-dir-
> configurable.patch
> index 5d13e4a..10d1df5 100644
> --- a/meta/recipes-core/systemd/systemd/0018-make-test-dir-
> configurable.patch
> +++ b/meta/recipes-core/systemd/systemd/0016-make-test-dir-
> configurable.patch
> @@ -1,4 +1,7 @@
> -Subject: [PATCH 18/36] make test dir configurable
> +From 218bbc555a37f9373fbb7f03c744eb65109d3470 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 20:47:37 -0800
> +Subject: [PATCH 16/19] make test dir configurable
>
> Upstream-Status: Pending
>
> @@ -6,17 +9,17 @@ test maybe be run on target in cross-compile
> environment, and test dir
> is not the compilation dir, so make it configurable
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> -
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> Makefile.am | 2 +-
> configure.ac | 7 +++++++
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> -index a94636a..dbd3386 100644
> +index 229492a..e997d82 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> -@@ -207,7 +207,7 @@ AM_CPPFLAGS = \
> +@@ -214,7 +214,7 @@ AM_CPPFLAGS = \
> -DROOTLIBDIR=\"$(rootlibdir)\" \
> -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
> -DROOTHOMEDIR=\"$(roothomedir)\" \
> @@ -26,10 +29,10 @@ index a94636a..dbd3386 100644
> -I $(top_builddir)/src/basic \
> -I $(top_srcdir)/src/basic \
> diff --git a/configure.ac b/configure.ac
> -index 45aae8a..c53fae2 100644
> +index 1de0066..b12e320 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -1518,6 +1518,11 @@ AC_ARG_WITH([roothomedir],
> +@@ -1535,6 +1535,11 @@ AC_ARG_WITH([roothomedir],
> [],
> [with_roothomedir=/root])
>
> @@ -41,7 +44,7 @@ index 45aae8a..c53fae2 100644
> AC_ARG_WITH([pamlibdir],
> AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM
> modules]),
> [],
> -@@ -1603,6 +1608,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
> +@@ -1621,6 +1626,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
> AC_SUBST([rootprefix], [$with_rootprefix])
> AC_SUBST([rootlibdir], [$with_rootlibdir])
> AC_SUBST([roothomedir], [$with_roothomedir])
> @@ -49,7 +52,7 @@ index 45aae8a..c53fae2 100644
>
> AC_CONFIG_FILES([
> Makefile
> -@@ -1695,6 +1701,7 @@ AC_MSG_RESULT([
> +@@ -1712,6 +1718,7 @@ AC_MSG_RESULT([
> lib dir: ${libdir}
> rootlib dir: ${with_rootlibdir}
> root home dir: ${with_roothomedir}
> @@ -58,5 +61,5 @@ index 45aae8a..c53fae2 100644
> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
> Build Python: ${PYTHON}
> --
> -2.8.3
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch
> b/meta/recipes-core/systemd/systemd/0017-remove-duplicate-
> include-uchar.h.patch
> similarity index 81%
> rename from meta/recipes-core/systemd/systemd/0019-remove-duplicate-
> include-uchar.h.patch
> rename to meta/recipes-core/systemd/systemd/0017-remove-duplicate-
> include-uchar.h.patch
> index 17592f8..77dbd6e 100644
> --- a/meta/recipes-core/systemd/systemd/0019-remove-duplicate-
> include-uchar.h.patch
> +++ b/meta/recipes-core/systemd/systemd/0017-remove-duplicate-
> include-uchar.h.patch
> @@ -1,14 +1,12 @@
> -From 3ca534935460647fed66e31aaa90b364e29eab5c Mon Sep 17 00:00:00 2001
> +From e78af874fc9f3d3af49498b8207109993d93a596 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 22 Feb 2016 05:59:01 +0000
> -Subject: [PATCH 1/2] remove duplicate include uchar.h
> +Subject: [PATCH 17/19] remove duplicate include uchar.h
>
> missing.h already includes it
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> -Upstream-Status: Pending
> -
> src/basic/escape.h | 1 -
> src/basic/utf8.h | 1 -
> 2 files changed, 2 deletions(-)
> @@ -26,7 +24,7 @@ index deaa4de..36d437c 100644
> #include "string-util.h"
> #include "missing.h"
> diff --git a/src/basic/utf8.h b/src/basic/utf8.h
> -index 12c272d..bea93a6 100644
> +index f9b9c94..6ac9a3c 100644
> --- a/src/basic/utf8.h
> +++ b/src/basic/utf8.h
> @@ -22,7 +22,6 @@
> @@ -38,5 +36,5 @@ index 12c272d..bea93a6 100644
> #include "macro.h"
> #include "missing.h"
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch
> b/meta/recipes-core/systemd/systemd/0018-check-for-uchar.
> h-in-configure.patch
> similarity index 76%
> rename from meta/recipes-core/systemd/systemd/0020-check-for-uchar.
> h-in-configure.patch
> rename to meta/recipes-core/systemd/systemd/0018-check-for-uchar.
> h-in-configure.patch
> index a027fad..5824033 100644
> --- a/meta/recipes-core/systemd/systemd/0020-check-for-uchar.
> h-in-configure.patch
> +++ b/meta/recipes-core/systemd/systemd/0018-check-for-uchar.
> h-in-configure.patch
> @@ -1,23 +1,21 @@
> -From e06eec89a22719c38e257fe07afff18e359114cb Mon Sep 17 00:00:00 2001
> +From 7cc0b19d244023c7b3e557765b03b7971e047f29 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 22 Feb 2016 06:02:38 +0000
> -Subject: [PATCH 2/2] check for uchar.h in configure
> +Subject: [PATCH 18/19] check for uchar.h in configure
>
> Use ifdef to include uchar.h
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> -Upstream-Status: Pending
> -
> configure.ac | 1 +
> src/basic/missing.h | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> -index ecc3e6b..62f934e 100644
> +index b12e320..4e6dfdf 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -297,6 +297,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" =
> "xyes"])
> +@@ -298,6 +298,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" =
> "xyes"])
>
> # ------------------------------------------------------------
> ------------------
>
> @@ -26,10 +24,10 @@ index ecc3e6b..62f934e 100644
> AC_CHECK_HEADERS([linux/btrfs.h], [], [])
> AC_CHECK_HEADERS([linux/memfd.h], [], [])
> diff --git a/src/basic/missing.h b/src/basic/missing.h
> -index f704422..a1baa95 100644
> +index 4936873..ce79404 100644
> --- a/src/basic/missing.h
> +++ b/src/basic/missing.h
> -@@ -34,7 +34,9 @@
> +@@ -35,7 +35,9 @@
> #include <stdlib.h>
> #include <sys/resource.h>
> #include <sys/syscall.h>
> @@ -40,5 +38,5 @@ index f704422..a1baa95 100644
>
> #ifdef HAVE_AUDIT
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0022-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch b/meta/recipes-core/systemd/
> systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
> similarity index 69%
> rename from meta/recipes-core/systemd/systemd/0022-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch
> rename to meta/recipes-core/systemd/systemd/0019-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch
> index 96fc3d8..66aa4ca 100644
> --- a/meta/recipes-core/systemd/systemd/0022-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch
> +++ b/meta/recipes-core/systemd/systemd/0019-socket-util-don-
> t-fail-if-libc-doesn-t-support-IDN.patch
> @@ -1,23 +1,23 @@
> -From 71e710a6c8a3879af7d50c4cb995e0615deba5c3 Mon Sep 17 00:00:00 2001
> -From: Emil Renner Berthing <systemd@esmil.dk>
> -Date: Sat, 12 Sep 2015 19:56:52 +0000
> -Subject: [PATCH 29/38] socket-util: don't fail if libc doesn't support IDN
> +From 289554d87e4fd96cae08c0fb449bf41d5641cd24 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 9 Nov 2016 20:49:53 -0800
> +Subject: [PATCH 19/19] socket-util: don't fail if libc doesn't support IDN
> +
> +Upstream-Status: Pending
>
> Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> -Upstream-Status: Pending
> -
> src/basic/socket-util.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
> -index 5851268..aefaca5 100644
> +index 4ebf106..53b9a12 100644
> --- a/src/basic/socket-util.c
> +++ b/src/basic/socket-util.c
> -@@ -44,6 +44,15 @@
> - #include "string-util.h"
> +@@ -47,6 +47,15 @@
> #include "user-util.h"
> + #include "utf8.h"
> #include "util.h"
> +/* Don't fail if the standard library
> + * doesn't support IDN */
> @@ -32,5 +32,5 @@ index 5851268..aefaca5 100644
> int socket_address_parse(SocketAddress *a, const char *s) {
> char *e, *n;
> --
> -1.8.3.1
> +2.10.2
>
> diff --git a/meta/recipes-core/systemd/systemd/0021-include-missing.
> h-for-getting-secure_getenv-definiti.patch b/meta/recipes-core/systemd/
> systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
> deleted file mode 100644
> index 5797a29..0000000
> --- a/meta/recipes-core/systemd/systemd/0021-include-missing.
> h-for-getting-secure_getenv-definiti.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 6cedbaee7964f6a6c61b9f2c8f0b87cef9370424 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Tue, 15 Dec 2015 22:51:55 +0000
> -Subject: [PATCH 26/38] include missing.h for getting secure_getenv
> definition
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Pending
> -
> - src/basic/user-util.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/src/basic/user-util.c b/src/basic/user-util.c
> -index 55672b3..22c4a23 100644
> ---- a/src/basic/user-util.c
> -+++ b/src/basic/user-util.c
> -@@ -38,6 +38,7 @@
> - #include "path-util.h"
> - #include "string-util.h"
> - #include "user-util.h"
> -+#include "missing.h"
> -
> - bool uid_is_valid(uid_t uid) {
> -
> ---
> -1.8.3.1
> -
> diff --git a/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
> b/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
> deleted file mode 100644
> index 5ecb9c3..0000000
> --- a/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -Subject: Fix CVE-2016-7795
> -
> -This undoes 531ac2b. I acked that patch without looking at the code
> -carefully enough. There are two problems:
> -- we want to process the fds anyway
> -- in principle empty notification messages are valid, and we should
> - process them as usual, including logging using log_unit_debug().
> -
> -Upstream-Status: Backport
> -CVE: CVE-2016-7795
> -
> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ----
> - src/core/manager.c | 11 ++++++-----
> - 1 file changed, 6 insertions(+), 5 deletions(-)
> -
> -diff --git a/src/core/manager.c b/src/core/manager.c
> -index 7838f56..f165d08e 100644
> ---- a/src/core/manager.c
> -+++ b/src/core/manager.c
> -@@ -1589,13 +1589,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source
> *source, int fd, ui
> - return 0;
> - }
> -
> --static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t
> pid, const char *buf, size_t n, FDSet *fds) {
> -+static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t
> pid, const char *buf, FDSet *fds) {
> - _cleanup_strv_free_ char **tags = NULL;
> -
> - assert(m);
> - assert(u);
> - assert(buf);
> -- assert(n > 0);
> -
> - tags = strv_split(buf, "\n\r");
> - if (!tags) {
> -@@ -1688,25 +1687,27 @@ static int manager_dispatch_notify_fd(sd_event_source
> *source, int fd, uint32_t
> - return 0;
> - }
> -
> -+ /* The message should be a string. Here we make sure it's
> NUL-terminated,
> -+ * but only the part until first NUL will be used anyway. */
> - buf[n] = 0;
> -
> - /* Notify every unit that might be interested, but try
> - * to avoid notifying the same one multiple times. */
> - u1 = manager_get_unit_by_pid_cgroup(m, ucred->pid);
> - if (u1) {
> -- manager_invoke_notify_message(m, u1, ucred->pid, buf,
> n, fds);
> -+ manager_invoke_notify_message(m, u1, ucred->pid, buf,
> fds);
> - found = true;
> - }
> -
> - u2 = hashmap_get(m->watch_pids1, PID_TO_PTR(ucred->pid));
> - if (u2 && u2 != u1) {
> -- manager_invoke_notify_message(m, u2, ucred->pid, buf,
> n, fds);
> -+ manager_invoke_notify_message(m, u2, ucred->pid, buf,
> fds);
> - found = true;
> - }
> -
> - u3 = hashmap_get(m->watch_pids2, PID_TO_PTR(ucred->pid));
> - if (u3 && u3 != u2 && u3 != u1) {
> -- manager_invoke_notify_message(m, u3, ucred->pid, buf,
> n, fds);
> -+ manager_invoke_notify_message(m, u3, ucred->pid, buf,
> fds);
> - found = true;
> - }
> -
> ---
> -2.8.3
> -
> diff --git a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
> b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-
> propagation-for-udevd.patch
> deleted file mode 100644
> index 23e22d4..0000000
> --- a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-
> propagation-for-udevd.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From: Michael Biebl <biebl@debian.org>
> -Date: Sat, 27 Sep 2014 04:19:24 +0200
> -Subject: udev: re-enable mount propagation for udevd
> -
> -Upstream-Status: Backport [http://http.debian.net/
> debian/pool/main/s/systemd/systemd_215-17+deb8u4.debian.tar.xz]
> -
> -laptop-mode-tools remounts file systems from within a udev rule to apply
> -certain mount options. With MountFlags=slave, those mounts then become
> private
> -to the systemd-udevd namespace and are no longer accessible from outside
> the
> -namespace.
> -While the root cause is the broken behaviour of laptop-mode-tools, with
> mount
> -propagation turned off, this can result in a read-only root file system.
> -Therefore revert the relevant parts from commit
> -c2c13f2df42e0691aecabe3979ea81cd7faa35c7 to re-enable mount propagation
> for
> -udevd.
> -
> -Once affected packages have been fixed, this patch should be dropped
> -again.
> -
> -Closes: #762018
> -diff --git a/units/systemd-udevd.service.in b/units/
> systemd-udevd.service.in
> -index e7216d6..1e9a600 100644
> ---- a/units/systemd-udevd.service.in
> -+++ b/units/systemd-udevd.service.in
> -@@ -21,6 +21,5 @@ Sockets=systemd-udevd-control.socket
> systemd-udevd-kernel.socket
> - Restart=always
> - RestartSec=0
> - ExecStart=@rootlibexecdir@/systemd-udevd
> --MountFlags=slave
> - KillMode=mixed
> - WatchdogSec=1min
> diff --git a/meta/recipes-core/systemd/systemd_230.bb
> b/meta/recipes-core/systemd/systemd_232.bb
> similarity index 96%
> rename from meta/recipes-core/systemd/systemd_230.bb
> rename to meta/recipes-core/systemd/systemd_232.bb
> index f60dd60..def6e05 100644
> --- a/meta/recipes-core/systemd/systemd_230.bb
> +++ b/meta/recipes-core/systemd/systemd_232.bb
> @@ -25,18 +25,13 @@ SRC_URI += " \
> file://0010-implment-systemd-sysv-install-for-OE.patch \
> file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
> \
> file://0012-rules-whitelist-hd-devices.patch \
> - file://0013-sysv-generator-add-support-for-executing-scripts-und.patch
> \
> - file://0014-Make-root-s-home-directory-configurable.patch \
> - file://0015-systemd-user-avoid-using-system-auth.patch \
> - file://0016-Revert-rules-remove-firmware-loading-rules.patch \
> - file://0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> \
> - file://0018-make-test-dir-configurable.patch \
> - file://0019-remove-duplicate-include-uchar.h.patch \
> - file://0020-check-for-uchar.h-in-configure.patch \
> - file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch
> \
> - file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
> \
> - file://udev-re-enable-mount-propagation-for-udevd.patch \
> - file://CVE-2016-7795.patch \
> + file://0013-Make-root-s-home-directory-configurable.patch \
> + file://0014-Revert-rules-remove-firmware-loading-rules.patch \
> + file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> \
> + file://0016-make-test-dir-configurable.patch \
> + file://0017-remove-duplicate-include-uchar.h.patch \
> + file://0018-check-for-uchar.h-in-configure.patch \
> + file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
> \
> "
> SRC_URI_append_libc-uclibc = "\
> file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> \
> @@ -61,7 +56,6 @@ PACKAGECONFIG ??= "xz \
> timedated \
> timesyncd \
> localed \
> - kdbus \
> ima \
> smack \
> logind \
> @@ -96,7 +90,6 @@ PACKAGECONFIG[timedated] = "--enable-timedated,--disable-
> timedated"
> PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd"
> PACKAGECONFIG[localed] = "--enable-localed,--disable-localed"
> PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"
> -PACKAGECONFIG[kdbus] = "--enable-kdbus,--disable-kdbus"
> PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"
> PACKAGECONFIG[smack] = "--enable-smack,--disable-smack"
> # libseccomp is found in meta-security
> @@ -282,7 +275,7 @@ python populate_packages_prepend (){
> systemdlibdir = d.getVar("rootlibdir", True)
> do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s',
> 'Systemd %s library', extra_depends='', allow_links=True)
> }
> -PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
> +PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
>
> PACKAGES =+ "\
> ${PN}-gui \
> @@ -491,6 +484,7 @@ RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG',
> 'serial-getty-genera
> os-release \
> "
>
> +INSANE_SKIP_${PN} += "dev-so"
> INSANE_SKIP_${PN}-doc += " libdir"
>
> PACKAGES =+ "udev udev-hwdb"
> --
> 2.10.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 94001 bytes --]
^ permalink raw reply
* Re: npm.bbclass support for deep native modules?
From: Peter A. Bigot @ 2016-11-28 10:35 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
In-Reply-To: <5308703.KLEPbEOQKq@peggleto-mobl.ger.corp.intel.com>
On 11/28/2016 04:11 AM, Paul Eggleton wrote:
> Hi Peter,
>
> On Sat, 26 Nov 2016 18:17:48 Peter A. Bigot wrote:
>> I'm using the current head of morty and trying to get a handle on the
>> new nodejs support in OE.
>>
>> I'm failing to build a recipe for statsd. Starting with this:
>>
>> devtool add 'npm://registry.npmjs.org;name=statsd;version=0.8.0'
>> bitbake statsd
>>
>> produces an error related to the modern-syslog dependency:
>>
>> DEBUG: Executing shell function do_compile
>>
>> | npm ERR! Linux 4.4.0-47-generic
>> | npm ERR! argv
>>
>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin/
>> node"
>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin
>> /npm" "--arch=arm" "--target_arch=arm" "--production" "--no-registry"
>> "install"
>> | npm ERR! node v4.6.1
>> | npm ERR! npm v2.15.9
>>
>> | npm ERR! Registry not defined and registry files not found:
>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-linu
>> x-gnueabi/statsd/0.8.0-r0/npm_cache/noregistry/modern-syslog/.cache.json",
>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-lin
>> ux-gnueabi/statsd/0.8.0-r0/npm_cache/modern-syslog/.cache.json".
>>
>> modern-syslog 1.1.2 needs node-gyp to build a native component and
>> https://wiki.yoctoproject.org/wiki/TipsAndTricks/NPM notes that devtool
>> can't detect such things. Doing this works fine to build that package:
>>
>> devtool add 'npm://registry.npmjs.org;name=modern-syslog;version=1.1.2'
>> bitbake modern-syslog
>>
>> but I'm having no luck getting "bitbake statsd" to find the result.
>> I've added:
>>
>> DEPENDS = "modern-syslog"
>>
>> to statsd_0.8.0.bb but that isn't helping. It looks like I need some
>> way to have the recipe install the prepared modern-syslog into the cache
>> (or globally?) before baking statsd, but since the cache gets cleared in
>> npm_do_compile() it's not clear how to make that happen.
>>
>> I'm very rusty with OE (two years away), so am I missing something or is
>> this just beyond what the bitbake infrastructure can currently handle?
>> If so, can somebody suggest a way to hand-patch the recipe, or outline
>> how npm.bbclass might be extended to support this?
> Disclaimer - I'm the one who has been doing most of the recent work with npm
> support (aside from the node.js recipe and the original npm fetcher plugin,
> which were the work of others) however my knowledge of node.js is pretty
> limited - most of it has been picked up along the way. So unfortunately I
> can't immediately see why this isn't working. The thing that puzzles me in
> particular about the error you're seeing though is that we're explicitly
> telling npm not to look for a registry, so why is it complaining about the
> lack of a registry?
Sorry, that wasn't clear. statsd depends on modern-syslog but the
lockdown and shrinkwrap files generated by devtool don't include it.
From the Wiki:
"Devtool cannot detect native libraries in module dependencies, you
you'll need to manually add packages to recipe"
The Wiki doesn't go into detail of how that's supposed to be done. Is
the existing infrastructure supposed to be able to find
globally-installed modules?
I'm wondering whether https://yarnpkg.com/ or one of the other nodejs
dependency managers might be an alternative, as I believe npm's approach
to dependencies is not suited to level of lockdown needed by Yocto and
many other production systems.
Peter
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Ed Bartosh @ 2016-11-28 10:46 UTC (permalink / raw)
To: Kristian Amlie; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <c74d1583-9f57-65d7-1631-36b29fb17165@mender.io>
On Mon, Nov 28, 2016 at 08:07:05AM +0100, Kristian Amlie wrote:
> On 25/11/16 17:33, Ed Bartosh wrote:
> > On Fri, Nov 25, 2016 at 01:35:53PM +0100, Kristian Amlie wrote:
> >> On 25/11/16 13:28, Maciej Borzęcki wrote:
> >>> On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
> >>>> + # Disallow '..', because doing so could be quite disastrous
> >>>> + # (we will delete the directory).
> >>>> + remaining = path
> >>>> + while True:
> >>>> + (head, tail) = os.path.split(remaining)
> >>>> + if tail == '..':
> >>>> + msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
> >>>> + elif head == "":
> >>>> + break
> >>>> + remaining = head
> >>>
> >>> Why not do this instead?
> >>>
> >>> if '..' in path:
> >>> msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
> >>>
> > would "'/..' in path" or something similar work?
>
> '/..my-file' is a valid file name, so no, it wouldn't work. I realize
> that this would be uncommon, and it makes the check more complex, so I'm
> ok with making it simpler if you want me to, but we have to trade
> simplicity for correctness in that case.
>
OK, makes sense.
Would something like this work for you?
> mkdir -p /tmp/rootfs/bla/bla/bla/bla
> python -c "import os;print os.path.realpath('/tmp/rootfs/bla/../bla/../bla/../bla/../').startswith('/tmp/rootfs/')"
False
> python -c "import os;print os.path.realpath('/tmp/rootfs/bla/../bla/../bla/bla/../').startswith('/tmp/rootfs/')"
True
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Ed Bartosh @ 2016-11-28 10:52 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
In-Reply-To: <e29489aa-8303-d8ac-be67-93d650d09f6d@mender.io>
On Mon, Nov 28, 2016 at 08:15:26AM +0100, Kristian Amlie wrote:
> >
> > What's the reason of insisting that path must be absolute?
> > May be it's just me, but I find it a bit scaring to use absolute path in .wks
> > The patch is relative to the rootfs directory from my point of view.
> >
> > It also looks quite strange in the code to insist on absolute path
> > + if not os.path.isabs(path):
> > + msger.error("Must be absolute: --exclude-path=%s" %
> >
> > and then immediately making it relative:
> > +
> > + while os.path.isabs(path):
> > + path = path[1:]
>
> Not really any strong reason. I just thought it was a logical thing to
> do from a user perspective: When you're making an image you're thinking
> about paths in the final image, and the path after "part" is absolute,
> so I thought this one should be too.
>
> The fact that it's made relative in the code is just an implementation
> detail to make join() work correctly.
>
> I'm fine either way, so just let me know which you prefer.
>
I'd prefer relative path as I think about --exclude-path as a path in
the source rootfs directory that we want to exclude from copying to
the target partition. However, I agree that that it can be also treated
as a path to the target directory.
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH v3] rootfs: Modify RPM installation
From: David Vincent @ 2016-11-28 10:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <ea567625-caf4-487d-449f-31c2d1b36427@windriver.com>
On vendredi 25 novembre 2016 13:09:30 CET Mark Hatle wrote:
> On 11/25/16 12:17 PM, Burton, Ross wrote:
> > On 24 November 2016 at 10:49, David Vincent <freesilicon@gmail.com
> >
> > <mailto:freesilicon@gmail.com>> wrote:
> > - self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm',
> > '/var/lib/smart']) + self._setup_dbg_rootfs(['/etc/rpm',
> > rpm_libdir, '/var/lib/smart'])>
> > Can we extend the un-hardcoding so this uses ${localstatedir}/lib/smart,
> > and rpmlibdir also uses ${localstatedir}?
>
> The value for the rpm directory is hard coded into the configuration file.
> Anything we do outside of that MUST match. Inspect the rpm macros file for
> the matching value. (This is why /var/lib/rpm was hard coded in the past.)
And that was the root cause of the problem when rpmlibdir is modified from its
default value. Maybe the rpmlibdir variable should be documented in the ref-
manual for those who wants to tinker with it.
>
> As for smart, I don't remember the rules offhand, so someone will need to
> figure out if it's variable (compile time) or hard coded.
>
> --Mark
>
> > Also current master lets you not bother passing True to d.getVar() as that
> > is the default now.
So should I send a v4 ?
> >
> > Ross
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-28 11:00 UTC (permalink / raw)
To: ed.bartosh; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161128104624.GA15660@linux.intel.com>
On 28/11/16 11:46, Ed Bartosh wrote:
> On Mon, Nov 28, 2016 at 08:07:05AM +0100, Kristian Amlie wrote:
>> On 25/11/16 17:33, Ed Bartosh wrote:
>>> On Fri, Nov 25, 2016 at 01:35:53PM +0100, Kristian Amlie wrote:
>>>> On 25/11/16 13:28, Maciej Borzęcki wrote:
>>>>> On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
>>>>>> + # Disallow '..', because doing so could be quite disastrous
>>>>>> + # (we will delete the directory).
>>>>>> + remaining = path
>>>>>> + while True:
>>>>>> + (head, tail) = os.path.split(remaining)
>>>>>> + if tail == '..':
>>>>>> + msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
>>>>>> + elif head == "":
>>>>>> + break
>>>>>> + remaining = head
>>>>>
>>>>> Why not do this instead?
>>>>>
>>>>> if '..' in path:
>>>>> msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
>>>>>
>>> would "'/..' in path" or something similar work?
>>
>> '/..my-file' is a valid file name, so no, it wouldn't work. I realize
>> that this would be uncommon, and it makes the check more complex, so I'm
>> ok with making it simpler if you want me to, but we have to trade
>> simplicity for correctness in that case.
>>
> OK, makes sense.
>
> Would something like this work for you?
>
>> mkdir -p /tmp/rootfs/bla/bla/bla/bla
>> python -c "import os;print os.path.realpath('/tmp/rootfs/bla/../bla/../bla/../bla/../').startswith('/tmp/rootfs/')"
> False
>> python -c "import os;print os.path.realpath('/tmp/rootfs/bla/../bla/../bla/bla/../').startswith('/tmp/rootfs/')"
> True
Ah, that's a good idea, makes it much simpler, and is still correct. I
will change to that.
--
Kristian
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-28 11:01 UTC (permalink / raw)
To: ed.bartosh; +Cc: openembedded-core
In-Reply-To: <20161128105236.GB15660@linux.intel.com>
On 28/11/16 11:52, Ed Bartosh wrote:
> On Mon, Nov 28, 2016 at 08:15:26AM +0100, Kristian Amlie wrote:
>>>
>>> What's the reason of insisting that path must be absolute?
>>> May be it's just me, but I find it a bit scaring to use absolute path in .wks
>>> The patch is relative to the rootfs directory from my point of view.
>>>
>>> It also looks quite strange in the code to insist on absolute path
>>> + if not os.path.isabs(path):
>>> + msger.error("Must be absolute: --exclude-path=%s" %
>>>
>>> and then immediately making it relative:
>>> +
>>> + while os.path.isabs(path):
>>> + path = path[1:]
>>
>> Not really any strong reason. I just thought it was a logical thing to
>> do from a user perspective: When you're making an image you're thinking
>> about paths in the final image, and the path after "part" is absolute,
>> so I thought this one should be too.
>>
>> The fact that it's made relative in the code is just an implementation
>> detail to make join() work correctly.
>>
>> I'm fine either way, so just let me know which you prefer.
>>
> I'd prefer relative path as I think about --exclude-path as a path in
> the source rootfs directory that we want to exclude from copying to
> the target partition. However, I agree that that it can be also treated
> as a path to the target directory.
Ok!
I will get a new patchset up soon.
--
Kristian
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Ed Bartosh @ 2016-11-28 11:18 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
In-Reply-To: <ae35149f-dc2d-fea5-e59e-a65dd3dce0ec@mender.io>
On Mon, Nov 28, 2016 at 12:01:09PM +0100, Kristian Amlie wrote:
> On 28/11/16 11:52, Ed Bartosh wrote:
> > On Mon, Nov 28, 2016 at 08:15:26AM +0100, Kristian Amlie wrote:
> >>>
> >>> What's the reason of insisting that path must be absolute?
> >>> May be it's just me, but I find it a bit scaring to use absolute path in .wks
> >>> The patch is relative to the rootfs directory from my point of view.
> >>>
> >>> It also looks quite strange in the code to insist on absolute path
> >>> + if not os.path.isabs(path):
> >>> + msger.error("Must be absolute: --exclude-path=%s" %
> >>>
> >>> and then immediately making it relative:
> >>> +
> >>> + while os.path.isabs(path):
> >>> + path = path[1:]
> >>
> >> Not really any strong reason. I just thought it was a logical thing to
> >> do from a user perspective: When you're making an image you're thinking
> >> about paths in the final image, and the path after "part" is absolute,
> >> so I thought this one should be too.
> >>
> >> The fact that it's made relative in the code is just an implementation
> >> detail to make join() work correctly.
> >>
> >> I'm fine either way, so just let me know which you prefer.
> >>
> > I'd prefer relative path as I think about --exclude-path as a path in
> > the source rootfs directory that we want to exclude from copying to
> > the target partition. However, I agree that that it can be also treated
> > as a path to the target directory.
>
> Ok!
>
> I will get a new patchset up soon.
>
Great!
I'd appreciate if you also do the following before sending v2:
- check that your code doesn't regress pylint checks
- add test case for your code to meta/lib/oeqa/selftest/wic.py
- check that your code doesn't break oe-selftest --coverage -r wic and
doesn't regress test coverage
--
Regards,
Ed
^ permalink raw reply
* ASSUME_PROVIDED versus SANITY_REQUIRED_UTILITIES versus "The Build Host Packages"
From: Robert P. J. Day @ 2016-11-28 11:20 UTC (permalink / raw)
To: OE Core mailing list
a bit confused by what i'm seeing in a recent
qemuppc/core-image-minimal build on my fedora system regarding which
native packages are built, despite what's in bitbake.conf (using
current poky layer checkout).
first, here's a snippet from bitbake.conf:
ASSUME_PROVIDED = "\
bzip2-native \ <---
chrpath-native \
file-native \ <---
findutils-native \
git-native \
grep-native \
diffstat-native \
... snip ...
suggesting that (among other things) bzip2-native and file-native
shouldn't be built -- it's the developer's responsibility to install
them, yes? but if i peek under tmp/work/x86_64-linux, i can see:
...
byacc-native/
bzip2-native/ <---
createrepo-native/
cross-localedef-native/
cryptodev-linux-native/
db-native/
dtc-native/
e2fsprogs-native/
elfutils-native/
expat-native/
file-native/ <---
flex-native/
...
so that's ... confusing.
add to that this bit in the YP Quick Start Guide at
http://www.yoctoproject.org/docs/2.1/yocto-project-qs/yocto-project-qs.html:
"Build Host Packages
...
Fedora
$ sudo dnf install gawk make wget tar bzip2 gzip python unzip perl patch \
diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \
ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \
findutils which SDL-devel xterm
my understanding was that that list represented what the developer was
required to install on his build host *manually* before going any
further, so you can see "bzip2" in that list, but you don't see
"file". given that the "file" command comes in its own package, should
that list of allegedly mandatory Build Host Packages not include
*everything* listed in ASSUME_PROVIDED?
finally, in sanity.bbclass, one reads:
SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \
gzip gawk chrpath wget cpio perl file"
which oddly *does* list the "file" command, but says nothing about
"sed", which *is* mentioned in ASSUME_PROVIDED, but is also not
mentioned in the "Build Host Packages" in the YP Quick Start Guide.
is it just me, or does some of this seem out of sync?
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* Re: npm.bbclass support for deep native modules?
From: Jack Mitchell @ 2016-11-28 11:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <f1da4624-99b2-46ec-a49d-892e2a491a8f@pabigot.com>
On 28/11/16 10:35, Peter A. Bigot wrote:
> On 11/28/2016 04:11 AM, Paul Eggleton wrote:
>> Hi Peter,
>>
>> On Sat, 26 Nov 2016 18:17:48 Peter A. Bigot wrote:
>>> I'm using the current head of morty and trying to get a handle on the
>>> new nodejs support in OE.
>>>
>>> I'm failing to build a recipe for statsd. Starting with this:
>>>
>>> devtool add 'npm://registry.npmjs.org;name=statsd;version=0.8.0'
>>> bitbake statsd
>>>
>>> produces an error related to the modern-syslog dependency:
>>>
>>> DEBUG: Executing shell function do_compile
>>>
>>> | npm ERR! Linux 4.4.0-47-generic
>>> | npm ERR! argv
>>>
>>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin/
>>>
>>> node"
>>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/sysroots/x86_64-linux/usr/bin
>>>
>>> /npm" "--arch=arm" "--target_arch=arm" "--production" "--no-registry"
>>> "install"
>>> | npm ERR! node v4.6.1
>>> | npm ERR! npm v2.15.9
>>>
>>> | npm ERR! Registry not defined and registry files not found:
>>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-linu
>>>
>>> x-gnueabi/statsd/0.8.0-r0/npm_cache/noregistry/modern-syslog/.cache.json",
>>>
>>> "/mnt/devel/oe/omap/build-bb-morty-master/tmp/work/cortexa8hf-neon-poky-lin
>>>
>>> ux-gnueabi/statsd/0.8.0-r0/npm_cache/modern-syslog/.cache.json".
>>>
>>> modern-syslog 1.1.2 needs node-gyp to build a native component and
>>> https://wiki.yoctoproject.org/wiki/TipsAndTricks/NPM notes that devtool
>>> can't detect such things. Doing this works fine to build that package:
>>>
>>> devtool add
>>> 'npm://registry.npmjs.org;name=modern-syslog;version=1.1.2'
>>> bitbake modern-syslog
>>>
>>> but I'm having no luck getting "bitbake statsd" to find the result.
>>> I've added:
>>>
>>> DEPENDS = "modern-syslog"
>>>
>>> to statsd_0.8.0.bb but that isn't helping. It looks like I need some
>>> way to have the recipe install the prepared modern-syslog into the cache
>>> (or globally?) before baking statsd, but since the cache gets cleared in
>>> npm_do_compile() it's not clear how to make that happen.
>>>
>>> I'm very rusty with OE (two years away), so am I missing something or is
>>> this just beyond what the bitbake infrastructure can currently handle?
>>> If so, can somebody suggest a way to hand-patch the recipe, or outline
>>> how npm.bbclass might be extended to support this?
>> Disclaimer - I'm the one who has been doing most of the recent work
>> with npm
>> support (aside from the node.js recipe and the original npm fetcher
>> plugin,
>> which were the work of others) however my knowledge of node.js is pretty
>> limited - most of it has been picked up along the way. So unfortunately I
>> can't immediately see why this isn't working. The thing that puzzles
>> me in
>> particular about the error you're seeing though is that we're explicitly
>> telling npm not to look for a registry, so why is it complaining about
>> the
>> lack of a registry?
>
> Sorry, that wasn't clear. statsd depends on modern-syslog but the
> lockdown and shrinkwrap files generated by devtool don't include it.
> From the Wiki:
>
> "Devtool cannot detect native libraries in module dependencies, you
> you'll need to manually add packages to recipe"
>
> The Wiki doesn't go into detail of how that's supposed to be done. Is
> the existing infrastructure supposed to be able to find
> globally-installed modules?
>
> I'm wondering whether https://yarnpkg.com/ or one of the other nodejs
> dependency managers might be an alternative, as I believe npm's approach
> to dependencies is not suited to level of lockdown needed by Yocto and
> many other production systems.
>
> Peter
Hi Peter,
I'm in a similar boat packaging a custom project with a very large
dependency tree. After looking at the available options and our current
struggles with npm, yarn was our next point of call. We haven't done
anything with it yet, but probably plan to in the near future.
Not very helpful, but just a heads up that you're not the only one
fighting npm ;)
Cheers,
Jack.
^ permalink raw reply
* Re: ASSUME_PROVIDED versus SANITY_REQUIRED_UTILITIES versus "The Build Host Packages"
From: Richard Purdie @ 2016-11-28 12:04 UTC (permalink / raw)
To: Robert P. J. Day, OE Core mailing list
In-Reply-To: <alpine.LFD.2.20.1611280544090.16875@localhost.localdomain>
On Mon, 2016-11-28 at 06:20 -0500, Robert P. J. Day wrote:
> a bit confused by what i'm seeing in a recent
> qemuppc/core-image-minimal build on my fedora system regarding which
> native packages are built, despite what's in bitbake.conf (using
> current poky layer checkout).
>
> first, here's a snippet from bitbake.conf:
>
> ASSUME_PROVIDED = "\
> bzip2-native \ <---
> chrpath-native \
> file-native \ <---
> findutils-native \
> git-native \
> grep-native \
> diffstat-native \
> ... snip ...
>
> suggesting that (among other things) bzip2-native and file-native
> shouldn't be built -- it's the developer's responsibility to install
> them, yes? but if i peek under tmp/work/x86_64-linux, i can see:
There are two ways "file-native" can be used in a build. It can be used
as the host provided "file" command and it is also needed by the file
recipe to build file for the target. We need to build file-native in
order for the build for the target file command to build/work. This is
why it gets built.
With bzip2, we need libbz2 (native) during the build process and we
don't ASSUME_PROVIDED libbz2-devel, hence it builds bzip2-native only
for that piece. Confusing perhaps but necessary unfortunately.
Cheers,
Richard
^ permalink raw reply
* Re: ASSUME_PROVIDED versus SANITY_REQUIRED_UTILITIES versus "The Build Host Packages"
From: Patrick Ohly @ 2016-11-28 13:17 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
In-Reply-To: <1480334664.28508.167.camel@linuxfoundation.org>
On Mon, 2016-11-28 at 12:04 +0000, Richard Purdie wrote:
> On Mon, 2016-11-28 at 06:20 -0500, Robert P. J. Day wrote:
> > a bit confused by what i'm seeing in a recent
> > qemuppc/core-image-minimal build on my fedora system regarding which
> > native packages are built, despite what's in bitbake.conf (using
> > current poky layer checkout).
> >
> > first, here's a snippet from bitbake.conf:
> >
> > ASSUME_PROVIDED = "\
> > bzip2-native \ <---
> > chrpath-native \
> > file-native \ <---
> > findutils-native \
> > git-native \
> > grep-native \
> > diffstat-native \
> > ... snip ...
> >
> > suggesting that (among other things) bzip2-native and file-native
> > shouldn't be built -- it's the developer's responsibility to install
> > them, yes? but if i peek under tmp/work/x86_64-linux, i can see:
>
> There are two ways "file-native" can be used in a build. It can be used
> as the host provided "file" command and it is also needed by the file
> recipe to build file for the target.
I recently ran into a third usage of "file-native": swupd-server links
against libmagic from file and therefore has a DEPENDS = "file". But
building swupd-server-native didn't actually build file because of
ASSUME_PROVIDED and because I hadn't installed libmagic-dev on my build
host, the build was failing.
Is there a way to declare that ASSUME_PROVIDED does not apply to this
case? It sounds like there is a way (based on your comments about
building file-native when building file and the libbz2-devel example),
but it did not become clear to me how that works in practice.
Or is it just a case of educating the developer that libmagic-dev needs
to be installed on the build host in addition to the file command?
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* [PATCH 00/18] Recipe version updates
From: Alexander Kanavin @ 2016-11-28 13:34 UTC (permalink / raw)
To: openembedded-core
Various stuff that has piled up over the past few weeks.
Epiphany update requires also webkitgtk update,
so that patch is included, just in case.
The following changes since commit 12a0ee049e453b6d0d2ce2f3fa981d1b6e02bd78:
dev-manual: Added note about RPM not dealing with post-install (2016-11-23 11:10:35 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (17):
icu: update to 58.1
sysprof: update to 3.22.2
btrfs-tools: update to 4.8.4
ca-certificates: upgrade to 20161102
lighttpd: upgrade to 1.4.43
cmake: update to 3.7.0
gnome-desktop3: update to 3.22.2
upstream-version-is-even.bbclass: ensure that the full version is
matched.
gnutls: update to 3.5.6
gobject-introspection: update to 1.50.0
iso-codes: update to 3.71
msmtp: update to 1.6.6
npth: update to 1.3
vala: update to 0.34.3
rng-tools: use SOURCEFORGE_MIRROR in SRC_URI
epiphany: update to 3.22.3
ffmpeg: update to 3.2.1
Carlos Alberto Lopez Perez (1):
webkitgtk: update to 2.14.2
meta/classes/upstream-version-is-even.bbclass | 2 +-
.../{btrfs-tools_4.8.2.bb => btrfs-tools_4.8.4.bb} | 2 +-
...cmake-native_3.6.2.bb => cmake-native_3.7.0.bb} | 1 +
meta/recipes-devtools/cmake/cmake.inc | 8 ++---
.../cmake/{cmake_3.6.2.bb => cmake_3.7.0.bb} | 1 +
.../vala/{vala_0.34.2.bb => vala_0.34.3.bb} | 4 +--
.../{lighttpd_1.4.42.bb => lighttpd_1.4.43.bb} | 4 +--
.../msmtp/{msmtp_1.6.5.bb => msmtp_1.6.6.bb} | 4 +--
.../{epiphany_3.22.1.bb => epiphany_3.22.3.bb} | 4 +--
...desktop3_3.22.1.bb => gnome-desktop3_3.22.2.bb} | 4 +--
...n_1.48.0.bb => gobject-introspection_1.50.0.bb} | 6 ++--
...ward-port-mips-arm-memory-barrier-patches.patch | 38 ----------------------
.../files/0001-callgraph-Use-U64_TO_POINTER.patch | 29 -----------------
.../sysprof/{sysprof_git.bb => sysprof_3.22.2.bb} | 12 ++-----
.../ffmpeg/{ffmpeg_3.2.bb => ffmpeg_3.2.1.bb} | 4 +--
.../{webkitgtk_2.14.1.bb => webkitgtk_2.14.2.bb} | 4 +--
...tes_20160104.bb => ca-certificates_20161102.bb} | 2 +-
.../gnutls/{gnutls_3.5.5.bb => gnutls_3.5.6.bb} | 4 +--
meta/recipes-support/icu/icu.inc | 12 +++++--
.../icu/{icu_57.1.bb => icu_58.1.bb} | 6 ++--
.../{iso-codes_3.70.bb => iso-codes_3.71.bb} | 4 +--
.../npth/{npth_1.2.bb => npth_1.3.bb} | 4 +--
meta/recipes-support/rng-tools/rng-tools_5.bb | 2 +-
23 files changed, 48 insertions(+), 113 deletions(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.8.2.bb => btrfs-tools_4.8.4.bb} (95%)
rename meta/recipes-devtools/cmake/{cmake-native_3.6.2.bb => cmake-native_3.7.0.bb} (95%)
rename meta/recipes-devtools/cmake/{cmake_3.6.2.bb => cmake_3.7.0.bb} (97%)
rename meta/recipes-devtools/vala/{vala_0.34.2.bb => vala_0.34.3.bb} (56%)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.42.bb => lighttpd_1.4.43.bb} (94%)
rename meta/recipes-extended/msmtp/{msmtp_1.6.5.bb => msmtp_1.6.6.bb} (86%)
rename meta/recipes-gnome/epiphany/{epiphany_3.22.1.bb => epiphany_3.22.3.bb} (82%)
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.22.1.bb => gnome-desktop3_3.22.2.bb} (83%)
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.48.0.bb => gobject-introspection_1.50.0.bb} (97%)
delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
rename meta/recipes-kernel/sysprof/{sysprof_git.bb => sysprof_3.22.2.bb} (71%)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.2.bb => ffmpeg_3.2.1.bb} (97%)
rename meta/recipes-sato/webkit/{webkitgtk_2.14.1.bb => webkitgtk_2.14.2.bb} (97%)
rename meta/recipes-support/ca-certificates/{ca-certificates_20160104.bb => ca-certificates_20161102.bb} (98%)
rename meta/recipes-support/gnutls/{gnutls_3.5.5.bb => gnutls_3.5.6.bb} (60%)
rename meta/recipes-support/icu/{icu_57.1.bb => icu_58.1.bb} (77%)
rename meta/recipes-support/iso-codes/{iso-codes_3.70.bb => iso-codes_3.71.bb} (76%)
rename meta/recipes-support/npth/{npth_1.2.bb => npth_1.3.bb} (81%)
--
2.10.2
^ permalink raw reply
* [PATCH 01/18] icu: update to 58.1
From: Alexander Kanavin @ 2016-11-28 13:34 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480333940.git.alexander.kanavin@linux.intel.com>
The copyright for the software has been transferred to Unicode Inc from IBM,
but the terms are same.
libiculx and libicule are no longer produced as they depend on an external
package icu-le-hb (previous versions had an option of using an internal
implementation which now has been dropped). I have verified that icu
dependencies in oe-core and meta-oe still build.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/icu/icu.inc | 12 +++++++++---
meta/recipes-support/icu/{icu_57.1.bb => icu_58.1.bb} | 6 +++---
2 files changed, 12 insertions(+), 6 deletions(-)
rename meta/recipes-support/icu/{icu_57.1.bb => icu_58.1.bb} (77%)
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index cc6f222..f3dc1e0 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -26,6 +26,14 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
EXTRA_OECONF_class-native = ""
EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
+
+# strtod_l() is not supported by musl; also xlocale.h is missing
+# It is not possible to disable its use via configure switches or env vars
+# so monkey patching is needed.
+do_configure_prepend_libc-musl () {
+ sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac
+}
+
PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}"
do_install_append_class-native() {
mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
@@ -36,15 +44,13 @@ do_install_append_class-native() {
cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
}
-PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
+PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio"
FILES_${PN}-dev += "${libdir}/${BPN}/"
FILES_libicudata = "${libdir}/libicudata.so.*"
FILES_libicuuc = "${libdir}/libicuuc.so.*"
FILES_libicui18n = "${libdir}/libicui18n.so.*"
-FILES_libicule = "${libdir}/libicule.so.*"
-FILES_libiculx = "${libdir}/libiculx.so.*"
FILES_libicutu = "${libdir}/libicutu.so.*"
FILES_libicuio = "${libdir}/libicuio.so.*"
diff --git a/meta/recipes-support/icu/icu_57.1.bb b/meta/recipes-support/icu/icu_58.1.bb
similarity index 77%
rename from meta/recipes-support/icu/icu_57.1.bb
rename to meta/recipes-support/icu/icu_58.1.bb
index 90c2b82..cc7c947 100644
--- a/meta/recipes-support/icu/icu_57.1.bb
+++ b/meta/recipes-support/icu/icu_58.1.bb
@@ -1,6 +1,6 @@
require icu.inc
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9"
def icu_download_version(d):
pvsplit = d.getVar('PV', True).split('.')
@@ -21,8 +21,8 @@ SRC_URI = "${BASE_SRC_URI} \
SRC_URI_append_class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9"
-SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"
+SRC_URI[md5sum] = "1901302aaff1c1633ef81862663d2917"
+SRC_URI[sha256sum] = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
--
2.10.2
^ permalink raw reply related
* [PATCH 02/18] sysprof: update to 3.22.2
From: Alexander Kanavin @ 2016-11-28 13:34 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480333940.git.alexander.kanavin@linux.intel.com>
Drop 0001-Forward-port-mips-arm-memory-barrier-patches.patch; upstream
is using standard C11 facilities for this now.
Drop 0001-callgraph-Use-U64_TO_POINTER.patch; it has been merged upstream.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...ward-port-mips-arm-memory-barrier-patches.patch | 38 ----------------------
.../files/0001-callgraph-Use-U64_TO_POINTER.patch | 29 -----------------
.../sysprof/{sysprof_git.bb => sysprof_3.22.2.bb} | 12 ++-----
3 files changed, 3 insertions(+), 76 deletions(-)
delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
rename meta/recipes-kernel/sysprof/{sysprof_git.bb => sysprof_3.22.2.bb} (71%)
diff --git a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
deleted file mode 100644
index 92e804f..0000000
--- a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Sat, 11 Jun 2016 22:45:37 +0300
-Subject: [PATCH] Forward port mips & arm memory barrier patches
-
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- lib/util/util.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/lib/util/util.h b/lib/util/util.h
-index 591722d..0768056 100644
---- a/lib/util/util.h
-+++ b/lib/util/util.h
-@@ -29,4 +29,19 @@
- #define read_barrier() asm volatile("" ::: "memory")
- #endif
-
-+#ifdef __arm__
-+/*
-+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
-+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
-+ */
-+#define read_barrier() ((void(*)(void))0xffff0fa0)()
-+#endif
-+
-+#ifdef __mips__
-+#define read_barrier() asm volatile(".set mips2\n\t" \
-+ "sync\n\t" \
-+ ".set mips0" ::: "memory")
-+#endif
-+
-+
- #endif /* SP_UTIL_H */
---
-2.1.4
-
diff --git a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
deleted file mode 100644
index ac1384c..0000000
--- a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Fri, 10 Jun 2016 14:01:54 +0300
-Subject: [PATCH] callgraph: Use U64_TO_POINTER
-
-This fixes a "cast to pointer from integer of different size" on i586.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Pending
----
- lib/sp-callgraph-view.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c
-index 02cc17b..58315b0 100644
---- a/lib/sp-callgraph-view.c
-+++ b/lib/sp-callgraph-view.c
-@@ -135,7 +135,7 @@ build_functions_store (StackNode *node,
-
- gtk_list_store_append (state->store, &iter);
- gtk_list_store_set (state->store, &iter,
-- COLUMN_NAME, (const gchar *)node->data,
-+ COLUMN_NAME, U64_TO_POINTER(node->data),
- COLUMN_SELF, 100.0 * size / state->profile_size,
- COLUMN_TOTAL, 100.0 * total / state->profile_size,
- COLUMN_POINTER, node,
---
-2.1.4
-
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_3.22.2.bb
similarity index 71%
rename from meta/recipes-kernel/sysprof/sysprof_git.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.22.2.bb
index 8d8b626..a1ed7c8 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.22.2.bb
@@ -7,20 +7,14 @@ inherit gnomebase gettext systemd
DEPENDS = "glib-2.0"
-S = "${WORKDIR}/git"
-SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068"
-PV = "3.20.0+git${SRCPV}"
-
-SRC_URI = "git://git.gnome.org/sysprof \
+SRC_URI += " \
file://define-NT_GNU_BUILD_ID.patch \
file://0001-configure-Add-option-to-enable-disable-polkit.patch \
file://0001-Disable-check-for-polkit-for-UI.patch \
file://0001-Avoid-building-docs.patch \
- file://0001-callgraph-Use-U64_TO_POINTER.patch \
- file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \
"
-SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9"
-SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5"
+SRC_URI[archive.md5sum] = "2634bf35f5592e5e4520ccaba87e909e"
+SRC_URI[archive.sha256sum] = "d57fb19a3e5d4ad37d5fb554dc93d9a03f332779c3bffd9c2aa8f176e85269d7"
AUTOTOOLS_AUXDIR = "${S}/build-aux"
--
2.10.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox