Skip to content

Commit

Permalink
libhybris: refresh patch
Browse files Browse the repository at this point in the history
* fixes:
WARNING: libhybris-1_0.1.0+gitrAUTOINC+3cda04985d-r1 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-hooks.c-Fix-build-with-glibc-2.26.patch
patching file hybris/common/hooks.c
Hunk #1 succeeded at 65 (offset 1 line).
Hunk #2 succeeded at 2460 with fuzz 1 (offset 34 lines).

Now at patch 0001-hooks.c-Fix-build-with-glibc-2.26.patch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  • Loading branch information
shr-project committed Apr 8, 2018
1 parent c18274e commit 272a12b
Showing 1 changed file with 6 additions and 8 deletions.
@@ -1,4 +1,4 @@
From 283b4bf1621542d2fe14e8492b7578bf9c083418 Mon Sep 17 00:00:00 2001
From 5ebc16fefe5917f2f29cf46d028866b8e4500df3 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 25 Aug 2017 13:06:50 +0200
Subject: [PATCH] hooks.c: Fix build with glibc-2.26
Expand All @@ -17,31 +17,29 @@ Subject: [PATCH] hooks.c: Fix build with glibc-2.26
^

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

---
hybris/common/hooks.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index 8a9cb2a..8c0f4d2 100644
index 3b21d74..8d08be9 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -64,6 +64,7 @@
@@ -65,6 +65,7 @@
#include <sys/syscall.h>
#include <sys/auxv.h>
#include <sys/prctl.h>
+#include <sys/uio.h>

#include <sys/mman.h>
#include <libgen.h>
@@ -2425,7 +2426,7 @@ static struct _hook hooks_common[] = {
HOOK_DIRECT(malloc),
@@ -2459,7 +2460,7 @@ static struct _hook hooks_common[] = {
HOOK_INDIRECT(malloc),
HOOK_DIRECT_NO_DEBUG(free),
HOOK_DIRECT_NO_DEBUG(calloc),
- HOOK_DIRECT_NO_DEBUG(cfree),
+ HOOK_DIRECT_NO_DEBUG(free),
HOOK_DIRECT_NO_DEBUG(realloc),
HOOK_DIRECT_NO_DEBUG(memalign),
HOOK_DIRECT_NO_DEBUG(valloc),
--
2.14.1

0 comments on commit 272a12b

Please sign in to comment.