[oe] [meta-browser][PATCH] chromium: Remove duplicate patch

Davis, Michael michael.davis at essvote.com
Fri Apr 14 19:14:10 UTC 2017


unset-madv-free.patch and Do-not-depend-on-Linux-4.5.patch apply the
same fix.

Signed-off-by: Michael Davis <michael.davis at essvote.com>
---
 .../chromium/chromium/chromium/unset-madv-free.patch      | 15 ---------------
 recipes-browser/chromium/chromium_54.0.2810.2.bb          |  1 -
 2 files changed, 16 deletions(-)
 delete mode 100644 recipes-browser/chromium/chromium/chromium/unset-madv-free.patch

diff --git a/recipes-browser/chromium/chromium/chromium/unset-madv-free.patch b/recipes-browser/chromium/chromium/chromium/unset-madv-free.patch
deleted file mode 100644
index 15d4982..0000000
--- a/recipes-browser/chromium/chromium/chromium/unset-madv-free.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur chromium-52.0.2743.76/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp chromium-52.0.2743.76b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
---- chromium-52.0.2743.76/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-07-15 17:02:49.000000000 -0500
-+++ chromium-52.0.2743.76b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-11-18 09:13:01.109731385 -0600
-@@ -41,6 +41,11 @@
- #include <errno.h>
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but it breaks the sandbox.
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
diff --git a/recipes-browser/chromium/chromium_54.0.2810.2.bb b/recipes-browser/chromium/chromium_54.0.2810.2.bb
index 2af662c..94ce59b 100644
--- a/recipes-browser/chromium/chromium_54.0.2810.2.bb
+++ b/recipes-browser/chromium/chromium_54.0.2810.2.bb
@@ -11,7 +11,6 @@ SRC_URI += "\
         file://0005-Override-root-filesystem-access-restriction.patch \
         file://chromium/0011-Replace-readdir_r-with-readdir.patch \
         file://chromium/remove-Werror.patch \
-        file://chromium/unset-madv-free.patch \
         file://chromium/Do-not-depend-on-Linux-4.5.patch \
         ${@bb.utils.contains('PACKAGECONFIG', 'component-build', 'file://component-build.gypi', '', d)} \
         ${@bb.utils.contains('PACKAGECONFIG', 'ignore-lost-context', 'file://chromium/0001-Remove-accelerated-Canvas-support-from-blacklist.patch', '', d)} \
-- 
2.9.3



More information about the Openembedded-devel mailing list