dbus: remove upstreamed patch
PATCH 1/29 dbus: remove upstreamed patch
--- ...1-configure.ac-explicitely-check-stdint.h.patch | 38 ---------------------- meta/recipes-core/dbus/dbus_1.12.2.bb | 1 - 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch
meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 1bfde222926be624a30a6e4b2cdc2c5064a36298 Mon Sep 17 00:00:00 2001 -From: Ioan-Adrian Ratiu <[email protected]> -Date: Fri, 29 Jul 2016 01:19:37 +0300 -Subject: [PATCH] configure.ac: explicitely check stdint.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise HAVE_STDINT_H will not be defined or the var will not be -picked up from cache so builds could fail with errors like: -| ../../dbus-1.10.8/dbus/dbus-internals.h:239:8: error: ‘uintptr_t’ undeclared (first use in this function) - -Signed-off-by: Ioan-Adrian Ratiu <[email protected]> -[smcv: fix Autoconf underquoting] -Reviewed-by: Simon McVittie <[email protected]> - -Upstream-Status: Backport [from dbus-1.10] - ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index cf5c5b9..a228d63 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -699,6 +699,8 @@ AC_CHECK_HEADERS(byteswap.h) - - AC_CHECK_HEADERS(unistd.h) - -+AC_CHECK_HEADERS([stdint.h]) -+ - AC_CHECK_HEADERS(ws2tcpip.h) - - AC_CHECK_HEADERS(alloca.h) --- -2.9.2 -
meta/recipes-core/dbus/dbus_1.12.2.bb +0 -1
@@ -16,7 +16,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch \ file://dbus-1.init \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ - file://0001-configure.ac-explicitely-check-stdint.h.patch \ " SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254"
Signature · 1 line
2.11.0
PATCH 2/29 dbus-glib: refresh patch
--- meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/dbus/dbus-glib/no-examples.patch +6 -4
@@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Kevin Tian <[email protected]> Signed-off-by: Scott Garman <[email protected]> ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +Index: dbus-glib-0.108/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.108.orig/dbus/Makefile.am ++++ dbus-glib-0.108/dbus/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . examples +SUBDIRS = . - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - + AM_CPPFLAGS = \ + -I$(top_srcdir) \
Signature · 1 line
2.11.0
Re: [PATCH 02/29] dbus-glib: refresh patch
Quoted 1 line · Ross Burton
Signed-off-by Ross Burton <[email protected]>
Why do this patches need to be refreshed?
- armin
Quoted 26 lines
--- meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)meta/recipes-core/dbus/dbus-glib/no-examples.patch +6
-4@@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Kevin Tian <[email protected]> Signed-off-by: Scott Garman <[email protected]> ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +Index: dbus-glib-0.108/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.108.orig/dbus/Makefile.am ++++ dbus-glib-0.108/dbus/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . examples +SUBDIRS = . - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - + AM_CPPFLAGS = \ + -I$(top_srcdir) \
Re: [PATCH 02/29] dbus-glib: refresh patch
I was about to write a long email explaining all this but my dinner is almost ready.
Short version: patch fuzz is dangerous, we've had patches apply using fuzz which actually break the code, or doing something else stupid like repeat a statement.
We'd like to eventually have do_patch rejecting any fuzz on these grounds, so I wrote a nasty script to rebase all the patches and am reviewing them bit by bit. Note that two of these patches are deleting patches that we've been applying although upstream have already applied the same fix...
Ross
Quoted 41 lines · On 5 March 2018 at 17:24, akuster808 <[email protected]> wrote:
Quoted 1 line · Ross Burton
Signed-off-by Ross Burton <[email protected]>Why do this patches need to be refreshed?
- armin
Review
Quoted 5 lines
--- meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/meta/recipes-core/dbus/dbus-glib/no-examples.patchmeta/recipes-core/dbus/dbus-glib/no-examples.patch Upstream-Status: Inappropriate [disable feature] · line 8
Quoted 8 lines
index
fbb49678282..32e76117188100644meta/recipes-core/dbus/dbus-glib/no-examples.patch +0
-1@@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Kevin Tian <[email protected]> Signed-off-by: Scott Garman <[email protected]> ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-2316:04:43.000000000 +0200
meta/recipes-core/dbus/dbus-glib/no-examples.patch Upstream-Status: Inappropriate [disable feature] · line 9
Quoted 1 line
meta/recipes-core/dbus/dbus-glib/no-examples.patch +0
-1-+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000+0200
meta/recipes-core/dbus/dbus-glib/no-examples.patch Upstream-Status: Inappropriate [disable feature]
Quoted 9 lines
meta/recipes-core/dbus/dbus-glib/no-examples.patch +4
-1+Index: dbus-glib-0.108/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.108.orig/dbus/Makefile.am ++++ dbus-glib-0.108/dbus/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . examples +SUBDIRS = . - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)$(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@ DATADIRNAME@/locale\"
Quoted 3 lines
meta/recipes-core/dbus/dbus-glib/no-examples.patch +2
-1- + AM_CPPFLAGS = \ + -I$(top_srcdir) \
Re: [PATCH 02/29] dbus-glib: refresh patch
Quoted 2 lines · Ross
I was about to write a long email explaining all this but my dinner is almost ready.
Enjoy your dinner.
Quoted 10 lines
Short version: patch fuzz is dangerous, we've had patches apply using fuzz which actually break the code, or doing something else stupid like repeat a statement.
We'd like to eventually have
do_patchrejecting any fuzz on these grounds, so I wrote a nasty script to rebase all the patches and am reviewing them bit by bit. Note that two of these patches are deleting patches that we've been applying although upstream have already applied the same fix...
Can you share your script?
- Armin
Quoted 50 lines
Ross
On 5 March 2018 at 17:24, akuster808 <[email protected] <mailto:[email protected]>> wrote:
On 03/05/2018 09:20 AM, Ross Burton wrote: > Signed-off-by: Ross Burton <[email protected] <mailto:[email protected]>> Why do this patches need to be refreshed? - armin > --- > meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch > index fbb49678282..32e76117188 100644 > --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch > +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch > @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature] > Signed-off-by: Kevin Tian <[email protected] <mailto:[email protected]>> > Signed-off-by: Scott Garman <[email protected] <mailto:[email protected]>> > > ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 > -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 > +Index: dbus-glib-0.108/dbus/Makefile.am > +=================================================================== > +--- dbus-glib-0.108.orig/dbus/Makefile.am > ++++ dbus-glib-0.108/dbus/Makefile.am > @@ -1,4 +1,4 @@ > -SUBDIRS = . examples > +SUBDIRS = . > > - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" > - > + AM_CPPFLAGS = \ > + -I$(top_srcdir) \
Re: [PATCH 02/29] dbus-glib: refresh patch
Quoted 2 lines · On 5 March 2018 at 18:03, akuster808 <[email protected]> wrote:
Can you share your script?
I honestly wish I could because I need to run it again against master. It was basically the refresh hack in ross/patchmaggeddon to force bitbake to refresh the patches, then a bit of shell to commit per-directory, then I'm using VSCode to review the changes.
Some can be submitted as they update the context correctly. Some can be dropped as the refresh just changed the hunk filenames. Some can be dropped and replaced with a patch removal as the refresh is showing that the patch can be removed now.
Generating a massive branch is trivial, the review is boring. I've still got ~50 patches outstanding and that's not even all of oe-core.
Ross
Re: [PATCH 02/29] dbus-glib: refresh patch
In reply to Burton, RossQuoted 11 lines · Ross
I was about to write a long email explaining all this but my dinner is almost ready.
Short version: patch fuzz is dangerous, we've had patches apply using fuzz which actually break the code, or doing something else stupid like repeat a statement.
We'd like to eventually have
do_patchrejecting any fuzz on these grounds, so I wrote a nasty script to rebase all the patches and am reviewing them bit by bit. Note that two of these patches are deleting patches that we've been applying although upstream have already applied the same fix...
So, for the purposes of being able to know this looking back in the git history can you please put this in the commit message? Fine if every single one is a copy-paste, but it shouldn't be blank particularly if someone's asking now.
Thanks,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [PATCH 02/29] dbus-glib: refresh patch
In reply to akuster808Quoted 1 line · On 03/05/2018 07:24 PM, akuster808 wrote:
Why do this patches need to be refreshed?
Long story:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Short story:
we'll soon start warning users if patches are applied with fuzz (e.g. context lines in a patch are ignored in order to apply the patch somehow, somewhere). This patch series fixes up oe-core patches, so that none of oe-core produces these warnings. This is the commit that will follow the fixup patches and introduces the warning:
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143760.html
Alex
Re: [PATCH 02/29] dbus-glib: refresh patch
Quoted 11 lines · Alexander Kanavin
Quoted 1 line · On 03/05/2018 07:24 PM, akuster808 wrote:
Why do this patches need to be refreshed?
Long story:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450Short story:
we'll soon start warning users if patches are applied with fuzz (e.g. context lines in a patch are ignored in order to apply the patch somehow, somewhere). This patch series fixes up oe-core patches, so that none of oe-core produces these warnings. This is the commit that will follow the fixup patches and introduces the warning:
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143760.html
Oh, and once most layers catch up, fuzz will be rejected outright:
Alex
PATCH 3/29 gobject-introspection: refresh patches
In reply to Ross Burton--- ...c-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 41 ++++++++++------------ 1 file changed, 19 insertions(+), 22 deletions(-)
meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch +19 -22
@@ -32,10 +32,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> tests/Makefile.am | 5 ++++- 4 files changed, 87 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index b080a89..ce8d29b 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: gobject-introspection-1.52.1/Makefile.am +=================================================================== +--- gobject-introspection-1.52.1.orig/Makefile.am ++++ gobject-introspection-1.52.1/Makefile.am @@ -21,7 +21,9 @@ include Makefile-cmph.am include Makefile-girepository.am include Makefile-giscanner.am
@@ -46,10 +46,10 @@ index b080a89..ce8d29b 100644 include Makefile-tools.am include Makefile-msvcproj.am -diff --git a/common.mk b/common.mk -index e26c637..9f3a65f 100644 ---- a/common.mk -+++ b/common.mk +Index: gobject-introspection-1.52.1/common.mk +=================================================================== +--- gobject-introspection-1.52.1.orig/common.mk ++++ gobject-introspection-1.52.1/common.mk @@ -6,6 +6,15 @@ # module itself. #
@@ -130,13 +130,13 @@ index e26c637..9f3a65f 100644 INTROSPECTION_DOCTOOL_ARGS = \ --add-include-path=$(srcdir) \ -diff --git a/configure.ac b/configure.ac -index 6c91fa5..21340a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -360,6 +360,48 @@ fi - - AC_SUBST(EXTRA_LINK_FLAGS) +Index: gobject-introspection-1.52.1/configure.ac +=================================================================== +--- gobject-introspection-1.52.1.orig/configure.ac ++++ gobject-introspection-1.52.1/configure.ac +@@ -366,6 +366,48 @@ dnl + AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) + AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) +AC_ARG_ENABLE([host-gi], +[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
@@ -183,10 +183,10 @@ index 6c91fa5..21340a5 100644 AC_CONFIG_FILES([ Makefile tests/Makefile -diff --git a/tests/Makefile.am b/tests/Makefile.am -index bdd0fa7..75dd3c9 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am +Index: gobject-introspection-1.52.1/tests/Makefile.am +=================================================================== +--- gobject-introspection-1.52.1.orig/tests/Makefile.am ++++ gobject-introspection-1.52.1/tests/Makefile.am @@ -1,6 +1,9 @@ include $(top_srcdir)/common.mk
@@ -198,6 +198,3 @@ index bdd0fa7..75dd3c9 100644 EXTRA_DIST= BUILT_SOURCES= --- -2.7.0 -
Signature · 1 line
2.11.0
PATCH 4/29 gtk+: refresh patches
In reply to Ross Burton--- meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +8 -7
@@ -3,19 +3,20 @@ Upstream-Status: Inappropriate [embedded specific] Updated to apply to gtk+-2.24.15 Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac ---- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 -+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 -@@ -415,7 +415,7 @@ +Index: gtk+-2.24.31/configure.ac +=================================================================== +--- gtk+-2.24.31.orig/configure.ac ++++ gtk+-2.24.31/configure.ac +@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend case $enable_explicit_deps in auto) export SED - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes + enable_explicit_deps=yes else -@@ -774,7 +774,7 @@ +@@ -772,7 +772,7 @@ else dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then
@@ -24,7 +25,7 @@ diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac module_deplibs_check=`$module_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1574,7 +1574,7 @@ +@@ -1579,7 +1579,7 @@ fi # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. export SED
Signature · 1 line
2.11.0
Re: [PATCH 04/29] gtk+: refresh patches
You did not mention the reason why this refresh needed
Quoted 53 lines · Ross Burton
Signed-off-by Ross Burton <[email protected]>--- meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +8
-8@@ -3,19 +3,20 @@ Upstream-Status: Inappropriate [embedded specific] Updated to apply to gtk+-2.24.15 Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac ---- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 -+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 -@@ -415,7 +415,7 @@ +Index: gtk+-2.24.31/configure.ac +=================================================================== +--- gtk+-2.24.31.orig/configure.ac ++++ gtk+-2.24.31/configure.ac +@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend case $enable_explicit_deps in auto) export SED - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes + enable_explicit_deps=yes else -@@ -774,7 +774,7 @@ +@@ -772,7 +772,7 @@ else dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then@@ -24,7 +25,7 @@ diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac module_deplibs_check=`$module_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1574,7 +1574,7 @@ +@@ -1579,7 +1579,7 @@ fi # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. export SED --2.11.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 5/29 ovmf: refresh patches
In reply to Ross Burton--- meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch +1 -1
@@ -17,4 +17,4 @@ Index: git/BaseTools/Conf/tools_def.template +DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -fno-PIE -no-pie DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables - DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 + DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 -no-pie
Signature · 1 line
2.11.0
PATCH 6/29 libxml: refresh patches
In reply to Ross Burton--- ...run-the-python-tests-if-python-is-enabled.patch | 43 ++++++++++------------ 1 file changed, 20 insertions(+), 23 deletions(-)
meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch +20 -23
@@ -15,12 +15,12 @@ Signed-off-by: Peter Kjellerstedt <[email protected]> python/tests/tstLastError.py | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index e181ee0..7960e7d 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: libxml2-2.9.7/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/Makefile.am ++++ libxml2-2.9.7/Makefile.am @@ -207,9 +207,9 @@ install-ptest: - install $(noinst_PROGRAMS) $(DESTDIR)) + install $(check_PROGRAMS) $(DESTDIR)) cp -r $(srcdir)/test $(DESTDIR) cp -r $(srcdir)/result $(DESTDIR) - cp -r $(srcdir)/python $(DESTDIR)
@@ -28,13 +28,13 @@ index e181ee0..7960e7d 100644 sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile + $(MAKE) -C python install-ptest - runtests: - [ -d test ] || $(LN_S) $(srcdir)/test . -diff --git a/python/Makefile.am b/python/Makefile.am -index 34aed96..ba3ec6a 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES) + runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ + testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) +Index: libxml2-2.9.7/python/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/python/Makefile.am ++++ libxml2-2.9.7/python/Makefile.am +@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class $(GENERATED): $(srcdir)/generator.py $(API_DESC) $(PYTHON) $(srcdir)/generator.py $(srcdir)
@@ -51,10 +51,10 @@ index 34aed96..ba3ec6a 100644 +.PHONY: tests test tests test: all cd tests && $(MAKE) tests -diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 95ebead..418e21e 100644 ---- a/python/tests/Makefile.am -+++ b/python/tests/Makefile.am +Index: libxml2-2.9.7/python/tests/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/python/tests/Makefile.am ++++ libxml2-2.9.7/python/tests/Makefile.am @@ -59,6 +59,11 @@ XMLS= \ CLEANFILES = core tmp.xml *.pyc
@@ -81,10 +81,10 @@ index 95ebead..418e21e 100644 + tests: endif -diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py -index d5f9be7..3e5bef8 100755 ---- a/python/tests/tstLastError.py -+++ b/python/tests/tstLastError.py +Index: libxml2-2.9.7/python/tests/tstLastError.py +=================================================================== +--- libxml2-2.9.7.orig/python/tests/tstLastError.py ++++ libxml2-2.9.7/python/tests/tstLastError.py @@ -25,7 +25,7 @@ class TestCase(unittest.TestCase): when the exception is raised, check the libxml2.lastError for expected values."""
@@ -94,6 +94,3 @@ index d5f9be7..3e5bef8 100755 try: f(*args) except exc: --- -2.12.0 -
Signature · 1 line
2.11.0
PATCH 7/29 kbd: refresh patches
In reply to Ross Burton--- .../kbd/kbd/set-proper-path-of-resources.patch | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-)
meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch +13 -13
@@ -13,10 +13,10 @@ run as expected. Signed-off-by: Kai Kang <[email protected]> -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1976333..b36aef3 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am +Index: kbd-2.0.4/tests/Makefile.am +=================================================================== +--- kbd-2.0.4.orig/tests/Makefile.am ++++ kbd-2.0.4/tests/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(srcdir)/../src/libkeymap \
@@ -25,11 +25,11 @@ index 1976333..b36aef3 100644 + -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" AM_CFLAGS = $(CHECK_CFLAGS) - LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) -diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in -index ddd5ed8..772fb51 100755 ---- a/tests/alt-is-meta.in -+++ b/tests/alt-is-meta.in + LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ +Index: kbd-2.0.4/tests/alt-is-meta.in +=================================================================== +--- kbd-2.0.4.orig/tests/alt-is-meta.in ++++ kbd-2.0.4/tests/alt-is-meta.in @@ -7,8 +7,8 @@ cd "$cwd" rc=0 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
@@ -41,10 +41,10 @@ index ddd5ed8..772fb51 100755 if [ "$rc" != 0 ]; then printf 'failed\n' -diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in -index 7c856e5..14d92c1 100755 ---- a/tests/dumpkeys-fulltable.in -+++ b/tests/dumpkeys-fulltable.in +Index: kbd-2.0.4/tests/dumpkeys-fulltable.in +=================================================================== +--- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in ++++ kbd-2.0.4/tests/dumpkeys-fulltable.in @@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" cd "$cwd"
Signature · 1 line
2.11.0
PATCH 8/29 dropbear: refresh patches
In reply to Ross Burton--- .../dropbear/dropbear/0004-fix-2kb-keys.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch +7 -10
@@ -5,18 +5,15 @@ Upstream-Status: Inappropriate [configuration] kex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kex.h b/kex.h -index 72430e9..375c677 100644 ---- a/kex.h -+++ b/kex.h -@@ -67,6 +67,6 @@ struct KEXState { - }; +Index: dropbear-2017.75/kex.h +=================================================================== +--- dropbear-2017.75.orig/kex.h ++++ dropbear-2017.75/kex.h +@@ -106,6 +106,6 @@ int curve25519_donna(unsigned char *out, + #endif -#define MAX_KEXHASHBUF 2000 +#define MAX_KEXHASHBUF 3000 - #endif /* _KEX_H_ */ --- -1.7.11.7 - + #endif /* DROPBEAR_KEX_H_ */
Signature · 1 line
2.11.0
PATCH 9/29 nfs-utils: refresh patches
In reply to Ross Burton--- .../files/bugfix-adjust-statd-service-name.patch | 15 ++++++--------- ...nfigure-Allow-to-explicitly-disable-nfsidmap.patch | 19 ++++++++----------- .../nfs-utils-1.2.3-sm-notify-res_init.patch | 11 ++++++----- 3 files changed, 20 insertions(+), 25 deletions(-)
meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch +6 -9
@@ -16,11 +16,11 @@ Signed-off-by: Ulrich Ölmann <[email protected]> utils/statd/start-statd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/utils/statd/start-statd b/utils/statd/start-statd -index 8211a90..3c2aa6f 100755 ---- a/utils/statd/start-statd -+++ b/utils/statd/start-statd -@@ -16,7 +16,7 @@ fi +Index: nfs-utils-2.1.1/utils/statd/start-statd +=================================================================== +--- nfs-utils-2.1.1.orig/utils/statd/start-statd ++++ nfs-utils-2.1.1/utils/statd/start-statd +@@ -28,7 +28,7 @@ fi # First try systemd if it's installed. if [ -d /run/systemd/system ]; then # Quit only if the call worked.
@@ -28,7 +28,4 @@ index 8211a90..3c2aa6f 100755 + systemctl start nfs-statd.service && exit fi - # Fall back to launching it ourselves. --- -2.1.4 - + cd /
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch +8 -11
@@ -12,11 +12,11 @@ Signed-off-by: Martin Jansa <[email protected]> configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index bf433d6..28a8f62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,6 +69,12 @@ AC_ARG_ENABLE(nfsv4, +Index: nfs-utils-2.1.1/configure.ac +=================================================================== +--- nfs-utils-2.1.1.orig/configure.ac ++++ nfs-utils-2.1.1/configure.ac +@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4, AC_SUBST(enable_nfsv4) AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
@@ -27,9 +27,9 @@ index bf433d6..28a8f62 100644 + enable_nfsidmap=yes) + AC_ARG_ENABLE(nfsv41, - [AC_HELP_STRING([--enable-nfsv41], - [enable support for NFSv41 @<:@default=yes@:>@])], -@@ -296,7 +302,7 @@ fi + [AC_HELP_STRING([--disable-nfsv41], + [disable support for NFSv41 @<:@default=no@:>@])], +@@ -339,7 +345,7 @@ fi dnl enable nfsidmap when its support by libnfsidmap AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
@@ -38,6 +38,3 @@ index bf433d6..28a8f62 100644 if test "$knfsd_cv_glibc2" = no; then --- -1.8.4.3 -
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch +6 -5
@@ -13,9 +13,10 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/statd/sm-notify.c ---- nfs-utils-1.2.3/utils/statd/sm-notify.c.orig 2010-09-28 08:24:16.000000000 -0400 -+++ nfs-utils-1.2.3/utils/statd/sm-notify.c 2010-10-15 16:44:43.487119601 -0400 +Index: nfs-utils-2.1.1/utils/statd/sm-notify.c +=================================================================== +--- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c ++++ nfs-utils-2.1.1/utils/statd/sm-notify.c @@ -28,6 +28,9 @@ #include <netdb.h> #include <errno.h>
@@ -24,9 +25,9 @@ diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/stat +#include <arpa/nameser.h> +#include <resolv.h> + #include "conffile.h" #include "sockaddr.h" - #include "xlog.h" -@@ -84,6 +87,7 @@ smn_lookup(const char *name) +@@ -89,6 +92,7 @@ smn_lookup(const char *name) }; int error;
Signature · 1 line
2.11.0
PATCH 10/29 neard: refresh patches
In reply to Ross Burton--- .../neard/neard/Makefile.am-fix-parallel-issue.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch +6 -9
@@ -16,18 +16,15 @@ Signed-off-by: Robert Yang <[email protected]> Makefile.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/Makefile.am b/Makefile.am -index 3241311..a43eaa2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \ +Index: neard-0.16/Makefile.am +=================================================================== +--- neard-0.16.orig/Makefile.am ++++ neard-0.16/Makefile.am +@@ -244,6 +244,7 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(di src/plugin.$(OBJEXT): src/builtin.h src/builtin.h: src/genbuiltin $(builtin_sources) + $(AM_V_at)$(MKDIR_P) src $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ - $(src_neard_OBJECTS) \ --- -1.7.9.5 - + se/plugin.$(OBJEXT): se/builtin.h
Signature · 1 line
2.11.0
PATCH 11/29 iproute2: refresh patches
In reply to Ross Burton--- .../iproute2/iproute2/configure-cross.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +5 -5
@@ -9,19 +9,19 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi <[email protected]> Signed-off-by: Shane Wang <[email protected]> -Index: iproute2-3.7.0/configure +Index: iproute2-4.11.0/configure =================================================================== ---- iproute2-3.7.0.orig/configure -+++ iproute2-3.7.0/configure +--- iproute2-4.11.0.orig/configure ++++ iproute2-4.11.0/configure @@ -2,6 +2,7 @@ - # This is not an autconf generated configure + # This is not an autoconf generated configure # INCLUDE=${1:-"$PWD/include"} +SYSROOT=$1 # Make a temp directory in build tree. TMPDIR=$(mktemp -d config.XXXXXX) -@@ -158,7 +159,7 @@ check_ipt_lib_dir() +@@ -192,7 +193,7 @@ check_ipt_lib_dir() return fi
Signature · 1 line
2.11.0
PATCH 12/29 squashfs-tools: refresh patches
In reply to Ross Burton--- .../squashfs-tools/squashfs-tools/fix-compat.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch +4 -4
@@ -23,7 +23,7 @@ Index: squashfs-tools/mksquashfs.c =================================================================== --- squashfs-tools.orig/mksquashfs.c +++ squashfs-tools/mksquashfs.c -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st +@@ -1261,6 +1261,10 @@ void write_dir(squashfs_inode *inode, st dir_size + 3, directory_block, directory_offset, NULL, NULL, dir, 0);
@@ -50,9 +50,9 @@ Index: squashfs-tools/unsquashfs.c =================================================================== --- squashfs-tools.orig/unsquashfs.c +++ squashfs-tools/unsquashfs.c -@@ -38,6 +38,10 @@ - #include <limits.h> - #include <ctype.h> +@@ -42,6 +42,10 @@ + #include <sys/sysmacros.h> + #endif +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0
Signature · 1 line
2.11.0
PATCH 13/29 mtools: refresh patches
In reply to Ross Burton--- .../mtools/mtools/mtools-makeinfo.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +12 -8
@@ -1,8 +1,10 @@ Upstream-Status: Inappropriate [licensing] ---- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600 -+++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600 -@@ -21,6 +21,33 @@ +Index: mtools-4.0.18/configure.in +=================================================================== +--- mtools-4.0.18.orig/configure.in ++++ mtools-4.0.18/configure.in +@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM AC_C_CONST AC_C_INLINE
@@ -36,9 +38,11 @@ Upstream-Status: Inappropriate [licensing] dnl Check for configuration options dnl Enable OS/2 extended density format disks ---- mtools-3.9.9/Makefile.in.sav 2006-04-14 15:56:19.000000000 -0600 -+++ mtools-3.9.9/Makefile.in 2006-04-14 16:15:29.315245312 -0600 -@@ -11,10 +11,11 @@ +Index: mtools-4.0.18/Makefile.in +=================================================================== +--- mtools-4.0.18.orig/Makefile.in ++++ mtools-4.0.18/Makefile.in +@@ -26,10 +26,11 @@ USERCFLAGS = USERLDFLAGS = USERLDLIBS =
@@ -54,7 +58,7 @@ Upstream-Status: Inappropriate [licensing] # do not edit below this line -@@ -181,7 +182,7 @@ +@@ -198,7 +199,7 @@ dvi: mtools.dvi ps: mtools.ps %.ps: %.dvi
@@ -62,4 +66,4 @@ Upstream-Status: Inappropriate [licensing] + $(DVI2PS) -f < $< > $@ pdf: mtools.pdf - %.pdf: %.texi + %.pdf: %.texi sysconfdir.texi
Signature · 1 line
2.11.0
PATCH 14/29 flex: refresh patches
In reply to Ross Burton--- meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch +5 -5
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate (embedded specific) Signed-off-by: Laurentiu Palcu <[email protected]> -Index: flex-2.5.37/doc/Makefile.am +Index: flex-2.6.0/doc/Makefile.am =================================================================== ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300 -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 -@@ -2,7 +2,7 @@ +--- flex-2.6.0.orig/doc/Makefile.am ++++ flex-2.6.0/doc/Makefile.am +@@ -2,7 +2,7 @@ help2man = @HELP2MAN@ info_TEXINFOS = flex.texi dist_man_MANS = flex.1
@@ -14,4 +14,4 @@ Index: flex-2.5.37/doc/Makefile.am +EXTRA_DIST= flex.pdf CLEANFILES = \ - flex.hks \ + flex.aux \
Signature · 1 line
2.11.0
PATCH 15/29 ccache: refresh patches
In reply to Ross Burton--- .../files/0002-dev.mk.in-fix-file-name-too-long.patch | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch +5 -8
@@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <[email protected]> dev.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dev.mk.in b/dev.mk.in -index 1261ad3..ec55ac4 100644 ---- a/dev.mk.in -+++ b/dev.mk.in +Index: ccache-3.3.4/dev.mk.in +=================================================================== +--- ccache-3.3.4.orig/dev.mk.in ++++ ccache-3.3.4/dev.mk.in @@ -1,7 +1,7 @@ # GNU make syntax reigns in this file.
@@ -26,7 +26,4 @@ index 1261ad3..ec55ac4 100644 +all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d ASCIIDOC = asciidoc - GPERF = gperf --- -1.7.9.5 - + CPPCHECK = cppcheck
Signature · 1 line
2.11.0
PATCH 16/29 elfutils: refresh patches
In reply to Ross Burton--- .../elfutils/files/debian/hppa_backend.diff | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-)
meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff +23 -23
@@ -1,10 +1,10 @@ Upstream-Status: Backport [from debian] Signed-off-by: Hongxu Jia <[email protected]> -Index: b/backends/parisc_init.c +Index: elfutils-0.170/backends/parisc_init.c =================================================================== --- /dev/null -+++ b/backends/parisc_init.c ++++ elfutils-0.170/backends/parisc_init.c @@ -0,0 +1,73 @@ +/* Initialization of PA-RISC specific backend library. + Copyright (C) 2002, 2005, 2006 Red Hat, Inc.
@@ -79,10 +79,10 @@ Index: b/backends/parisc_init.c + + return MODVERSION; +} -Index: b/backends/parisc_regs.c +Index: elfutils-0.170/backends/parisc_regs.c =================================================================== --- /dev/null -+++ b/backends/parisc_regs.c ++++ elfutils-0.170/backends/parisc_regs.c @@ -0,0 +1,159 @@ +/* Register names and numbers for PA-RISC DWARF. + Copyright (C) 2005, 2006 Red Hat, Inc.
@@ -243,10 +243,10 @@ Index: b/backends/parisc_regs.c + name[namelen++] = '\0'; + return namelen; +} -Index: b/backends/parisc_reloc.def +Index: elfutils-0.170/backends/parisc_reloc.def =================================================================== --- /dev/null -+++ b/backends/parisc_reloc.def ++++ elfutils-0.170/backends/parisc_reloc.def @@ -0,0 +1,128 @@ +/* List the relocation types for PA-RISC. -*- C -*- + Copyright (C) 2005 Red Hat, Inc.
@@ -376,10 +376,10 @@ Index: b/backends/parisc_reloc.def +RELOC_TYPE (TLS_DTPMOD64, DYN) + +#define NO_RELATIVE_RELOC 1 -Index: b/backends/parisc_retval.c +Index: elfutils-0.170/backends/parisc_retval.c =================================================================== --- /dev/null -+++ b/backends/parisc_retval.c ++++ elfutils-0.170/backends/parisc_retval.c @@ -0,0 +1,213 @@ +/* Function return value location for Linux/PA-RISC ABI. + Copyright (C) 2005 Red Hat, Inc.
@@ -594,10 +594,10 @@ Index: b/backends/parisc_retval.c + return parisc_return_value_location_ (functypedie, locp, 1); +} + -Index: b/backends/parisc_symbol.c +Index: elfutils-0.170/backends/parisc_symbol.c =================================================================== --- /dev/null -+++ b/backends/parisc_symbol.c ++++ elfutils-0.170/backends/parisc_symbol.c @@ -0,0 +1,112 @@ +/* PA-RISC specific symbolic name handling. + Copyright (C) 2002, 2005 Red Hat, Inc.
@@ -711,10 +711,10 @@ Index: b/backends/parisc_symbol.c + return ELF_T_NUM; + } +} -Index: b/backends/libebl_parisc.h +Index: elfutils-0.170/backends/libebl_parisc.h =================================================================== --- /dev/null -+++ b/backends/libebl_parisc.h ++++ elfutils-0.170/backends/libebl_parisc.h @@ -0,0 +1,9 @@ +#ifndef _LIBEBL_HPPA_H +#define _LIBEBL_HPPA_H 1
@@ -725,10 +725,10 @@ Index: b/backends/libebl_parisc.h +extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp); + +#endif -Index: b/backends/Makefile.am +Index: elfutils-0.170/backends/Makefile.am =================================================================== ---- a/backends/Makefile.am -+++ b/backends/Makefile.am +--- elfutils-0.170.orig/backends/Makefile.am ++++ elfutils-0.170/backends/Makefile.am @@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
@@ -744,7 +744,7 @@ Index: b/backends/Makefile.am noinst_LIBRARIES = $(libebl_pic) noinst_DATA = $(libebl_pic:_pic.a=.so) -@@ -128,6 +128,9 @@ endif +@@ -124,6 +124,9 @@ cpu_bpf = ../libcpu/libcpu_bpf.a libebl_bpf_pic_a_SOURCES = $(bpf_SRCS) am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os)
@@ -752,13 +752,13 @@ Index: b/backends/Makefile.am +libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) +am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) - libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) + libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) @rm -f $(@:.so=.map) -Index: b/libelf/elf.h +Index: elfutils-0.170/libelf/elf.h =================================================================== ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -2055,16 +2055,24 @@ enum +--- elfutils-0.170.orig/libelf/elf.h ++++ elfutils-0.170/libelf/elf.h +@@ -2056,16 +2056,24 @@ enum #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
@@ -783,7 +783,7 @@ Index: b/libelf/elf.h #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ -@@ -2073,6 +2081,7 @@ enum +@@ -2074,6 +2082,7 @@ enum #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
@@ -791,7 +791,7 @@ Index: b/libelf/elf.h #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ -@@ -2098,6 +2107,8 @@ enum +@@ -2099,6 +2108,8 @@ enum #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
Signature · 1 line
2.11.0
PATCH 17/29 btrfs-tools: refresh patches
In reply to Ross Burton--- .../0001-Makefile-build-mktables-using-native-gcc.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch +7 -10
@@ -12,19 +12,16 @@ Signed-off-by: Alexander Kanavin <[email protected]> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index b3e2b63..347aaf1 100644 ---- a/Makefile -+++ b/Makefile -@@ -323,7 +323,7 @@ version.h: version.sh version.h.in configure.ac +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -343,7 +343,7 @@ version.h: version.sh version.h.in confi mktables: kernel-lib/mktables.c @echo " [CC] $@" - $(Q)$(CC) $(CFLAGS) $< -o $@ + $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ - kernel-lib/tables.c: mktables - @echo " [TABLE] $@" --- -2.13.2 - + # the target can be regenerated manually using mktables, but a local copy is + # kept so the build process is simpler
Signature · 1 line
2.11.0
PATCH 18/29 sysklogd: refresh patches
In reply to Ross Burton--- meta/recipes-extended/sysklogd/files/no-strip-install.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-extended/sysklogd/files/no-strip-install.patch +5 -5
@@ -1,10 +1,10 @@ Upstream-Status: Inappropriate [configuration] -Index: sysklogd-1.5/Makefile +Index: sysklogd-1.5.1/Makefile =================================================================== ---- sysklogd-1.5.orig/Makefile 2009-06-09 13:02:41.000000000 +0200 -+++ sysklogd-1.5/Makefile 2009-06-09 13:03:06.000000000 +0200 -@@ -127,8 +127,8 @@ +--- sysklogd-1.5.1.orig/Makefile ++++ sysklogd-1.5.1/Makefile +@@ -127,8 +127,8 @@ clobber: clean rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd install_exec: syslogd klogd
@@ -14,4 +14,4 @@ Index: sysklogd-1.5/Makefile + ${INSTALL} -m 500 klogd ${BINDIR}/klogd install_man: - ${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 + ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
Signature · 1 line
2.11.0
PATCH 19/29 watchdog: refresh patches
In reply to Ross Burton--- .../recipes-extended/watchdog/watchdog/watchdog-conf.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch +8 -6
@@ -1,14 +1,16 @@ Signed-off-by: Diego Rondini <[email protected]> Upstream-Status: Inappropriate ---- watchdog-5.13.orig/watchdog.conf 2013-02-01 12:15:44.000000000 +0100 -+++ watchdog-5.13/watchdog.conf 2014-11-13 10:59:43.233943000 +0100 -@@ -20,7 +20,7 @@ - #test-binary = - #test-timeout = +Index: watchdog-5.15/watchdog.conf +=================================================================== +--- watchdog-5.15.orig/watchdog.conf ++++ watchdog-5.15/watchdog.conf +@@ -28,7 +28,7 @@ + #retry-timeout = 60 + #repair-maximum = 1 -#watchdog-device = /dev/watchdog +watchdog-device = /dev/watchdog # Defaults compiled into the binary - #temperature-device = + #temperature-sensor =
Signature · 1 line
2.11.0
PATCH 20/29 unzip: refresh patches
In reply to Ross Burton--- .../unzip/unzip/10-cve-2014-8140-test-compr-eb.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch +7 -5
@@ -9,9 +9,11 @@ CVE: CVE-2014-8140 Signed-off-by: Roy Li <[email protected]> ---- a/extract.c -+++ b/extract.c -@@ -2232,10 +2232,17 @@ +Index: unzip60/extract.c +=================================================================== +--- unzip60.orig/extract.c ++++ unzip60/extract.c +@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */
@@ -30,5 +32,5 @@ Signed-off-by: Roy Li <[email protected]> + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ - if ( - #ifdef INT_16BIT + method = makeword(eb + (EB_HEADSIZE + compr_offset)); + if ((method == STORED) &&
Signature · 1 line
2.11.0
PATCH 21/29 sysstat: refresh patches
In reply to Ross Burton--- .../0001-Include-needed-headers-explicitly.patch | 29 ++++++++++------------ 1 file changed, 13 insertions(+), 16 deletions(-)
meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch +13 -16
@@ -21,10 +21,10 @@ Upstream-Status: Pending sa_common.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/common.c b/common.c -index a23155b..ad86446 100644 ---- a/common.c -+++ b/common.c +Index: sysstat-11.5.7/common.c +=================================================================== +--- sysstat-11.5.7.orig/common.c ++++ sysstat-11.5.7/common.c @@ -20,6 +20,7 @@ */
@@ -32,11 +32,11 @@ index a23155b..ad86446 100644 +#include <limits.h> #include <string.h> #include <stdlib.h> - #include <time.h> -diff --git a/ioconf.c b/ioconf.c -index 7d88c5d..6d67691 100644 ---- a/ioconf.c -+++ b/ioconf.c + #include <stdarg.h> +Index: sysstat-11.5.7/ioconf.c +=================================================================== +--- sysstat-11.5.7.orig/ioconf.c ++++ sysstat-11.5.7/ioconf.c @@ -27,6 +27,7 @@ #include <errno.h> #include <dirent.h>
@@ -45,10 +45,10 @@ index 7d88c5d..6d67691 100644 #include "ioconf.h" #include "common.h" -diff --git a/sa_common.c b/sa_common.c -index b7351d9..c9e3299 100644 ---- a/sa_common.c -+++ b/sa_common.c +Index: sysstat-11.5.7/sa_common.c +=================================================================== +--- sysstat-11.5.7.orig/sa_common.c ++++ sysstat-11.5.7/sa_common.c @@ -20,6 +20,7 @@ */
@@ -57,6 +57,3 @@ index b7351d9..c9e3299 100644 #include <string.h> #include <stdlib.h> #include <time.h> --- -2.5.2 -
Signature · 1 line
2.11.0
PATCH 22/29 screen: refresh patches
In reply to Ross Burton--- .../screen/0002-comm.h-now-depends-on-term.h.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +8 -11
@@ -15,19 +15,16 @@ Subject: [PATCH] comm.h now depends on term.h src/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.in b/src/Makefile.in -index e791e79..d4f7c0b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h +Index: screen-4.6.1/Makefile.in +=================================================================== +--- screen-4.6.1.orig/Makefile.in ++++ screen-4.6.1/Makefile.in +@@ -133,7 +133,7 @@ kmapdef.c: term.h + tty.c: tty.sh + sh $(srcdir)/tty.sh tty.c -comm.h: comm.c comm.sh config.h +comm.h: comm.c comm.sh config.h term.h AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - docs: --- -2.4.1 - + osdef.h: osdef.sh config.h osdef.h.in
Signature · 1 line
2.11.0
PATCH 23/29 lsb: refresh patches
In reply to Ross Burton--- ...ons-avoid-exit-1-which-causes-init-scripts-to-.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch +7 -10
@@ -7,18 +7,15 @@ Signed-off-by: Chen Qi <[email protected]> rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 6850046..11223f7 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then - fi +Index: initscripts-9.72/rc.d/init.d/functions +=================================================================== +--- initscripts-9.72.orig/rc.d/init.d/functions ++++ initscripts-9.72/rc.d/init.d/functions +@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then + fi fi -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true return 0 - --- -2.1.0 - +
Signature · 1 line
2.11.0
PATCH 24/29 libaio: refresh patches
In reply to Ross Burton--- meta/recipes-extended/libaio/libaio/destdir.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta/recipes-extended/libaio/libaio/destdir.patch +6 -6
@@ -2,16 +2,16 @@ Upstream-Status: Pending from openembedded, added by Qing He <[email protected]> -Index: libaio-0.3.106/Makefile +Index: libaio-0.3.110/Makefile =================================================================== ---- libaio-0.3.106.orig/Makefile 2004-02-26 07:25:10.000000000 -0800 -+++ libaio-0.3.106/Makefile 2006-10-14 09:19:07.000000000 -0700 -@@ -15,7 +15,7 @@ +--- libaio-0.3.110.orig/Makefile ++++ libaio-0.3.110/Makefile +@@ -15,7 +15,7 @@ all: @$(MAKE) -C src install: - @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) + @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - clean: + check: + @$(MAKE) -C harness check
Signature · 1 line
2.11.0
PATCH 25/29 libxcb: refresh patches
In reply to Ross Burton--- .../recipes-graphics/xorg-lib/libxcb/disable-check.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch +8 -8
@@ -9,17 +9,17 @@ Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> -diff --git a/configure.ac b/configure.ac -index 6d7c9a5..22cceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS - - AM_PATH_PYTHON([2.6]) +Index: libxcb-1.12/configure.ac +=================================================================== +--- libxcb-1.12.orig/configure.ac ++++ libxcb-1.12/configure.ac +@@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then + AC_MSG_WARN([dot not found - doxygen targets will be skipped]) + fi -PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) +dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) +HAVE_CHECK=no AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - AC_CONFIG_HEADERS([src/config.h]) + XSLTPROC=no
Signature · 1 line
2.11.0
PATCH 26/29 xproto: refresh patches
In reply to Ross Burton--- .../xorg-proto/xproto/xproto_fix_for_x32.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +6 -4
@@ -10,13 +10,15 @@ This fixes compilation with x32 toolchain. Received this patch from H.J. Lu <[email protected]> Signed-off-by: Nitin A Kamble <[email protected]> 2011/12/1 ---- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 -+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 +Index: xproto-7.0.31/Xmd.h +=================================================================== +--- xproto-7.0.31.orig/Xmd.h ++++ xproto-7.0.31/Xmd.h @@ -62,7 +62,6 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) - # define LONG64 /* 32/64-bit architecture */ - # endif + # if !defined(__ILP32__) /* amd64-x32 is 32bit */ + # define LONG64 /* 32/64-bit architecture */
Signature · 1 line
2.11.0
PATCH 27/29 vulkan: refresh patches
In reply to Ross Burton--- .../vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch +7 -5
@@ -11,9 +11,11 @@ Date: Tue Feb 16 10:05:25 2016 -0500 Upstream-Status: Inappropriate [configuration] Signed-off-by: Jussi Kukkonen <[email protected]> ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -61,46 +61,6 @@ +Index: git/demos/CMakeLists.txt +=================================================================== +--- git.orig/demos/CMakeLists.txt ++++ git/demos/CMakeLists.txt +@@ -63,46 +63,6 @@ elseif(UNIX) else() endif()
@@ -60,7 +62,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]> if(WIN32) include_directories ( -@@ -114,43 +74,6 @@ +@@ -116,43 +76,6 @@ endif() add_executable(${API_LOWERCASE}info vulkaninfo.c) target_link_libraries(${API_LOWERCASE}info ${LIBRARIES})
@@ -103,4 +105,4 @@ Signed-off-by: Jussi Kukkonen <[email protected]> -endif() if(UNIX) - install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(INSTALL_LVL_FILES)
Signature · 1 line
2.11.0
PATCH 28/29 libpcre: refresh patches
In reply to Ross Burton--- .../libpcre/libpcre2/pcre-cross.patch | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-)
meta/recipes-support/libpcre/libpcre2/pcre-cross.patch +12 -12
@@ -9,11 +9,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> -diff --git a/Makefile.am b/Makefile.am -index 38f1d41..2bde083 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config +Index: pcre2-10.30/Makefile.am +=================================================================== +--- pcre2-10.30.orig/Makefile.am ++++ pcre2-10.30/Makefile.am +@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config ## to copy a distributed set of tables that are defined for ASCII code. In this ## case, dftables is not needed.
@@ -35,13 +35,13 @@ index 38f1d41..2bde083 100644 src/pcre2_chartables.c: dftables$(EXEEXT) rm -f $@ ./dftables$(EXEEXT) $@ -diff --git a/configure.ac b/configure.ac -index d7c57aa..d6eb0aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,23 @@ then - fi - fi +Index: pcre2-10.30/configure.ac +=================================================================== +--- pcre2-10.30.orig/configure.ac ++++ pcre2-10.30/configure.ac +@@ -60,6 +60,23 @@ fi + # This is a new thing required to stop a warning from automake 1.12 + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +if test x"$cross_compiling" = xyes; then + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
Signature · 1 line
2.11.0
PATCH 29/29 usbutils: drop upstreamed patch
In reply to Ross BurtonThis has been fixed upstream since 008, albeit slightly differently so the patch continued to apply.
--- .../usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 ---------------------- meta/recipes-bsp/usbutils/usbutils_009.bb | 1 - 2 files changed, 29 deletions(-) delete mode 100644 meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Fix NULL pointer crash. - -Before use usbbuslist, we should check if it is valid. - -Upstream-Status: Pending -Signed-off-by: Roy.Li <[email protected]> ---- - lsusb-t.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/lsusb-t.c b/lsusb-t.c -index f604155..583a46a 100644 ---- a/lsusb-t.c -+++ b/lsusb-t.c -@@ -643,6 +643,10 @@ static void sort_busses(void) - /* need to reverse sort bus numbers */ - struct usbbusnode *t, *p, **pp; - int swapped; -+ -+ if (!usbbuslist) -+ return; -+ - do { - p = usbbuslist; - pp = &usbbuslist; --- -1.7.4.1 -
meta/recipes-bsp/usbutils/usbutils_009.bb +0 -1
@@ -10,7 +10,6 @@ DEPENDS = "libusb zlib virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ - file://Fix-NULL-pointer-crash.patch \ " SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"
Signature · 1 line
2.11.0
✗ patchtest: failure for "dbus: remove upstreamed patch..." and 28 more
In reply to Ross Burton== Series Details ==
Series: "dbus: remove upstreamed patch..." and 28 more
Revision: 1
URL : https://patchwork.openembedded.org/series/11251/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at ba2eb62374)
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe