From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../0001-Makefile.am-remove-doc-and-apidoc.patch | 8 +- ...ac-remove-prog-test-of-xmlto-and-asciidoc.patch | 16 +-- .../files/0003-without-build-plugins.patch | 6 +- ...configure.ac-remove-prog-test-of-augparse.patch | 10 +- .../files/0005-remove-python2-support.patch | 142 --------------------- 5 files changed, 20 insertions(+), 162 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch (limited to 'meta-openembedded/meta-oe/recipes-extended/libreport/files') diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch index 9b328a10a..97fb097fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch @@ -1,7 +1,7 @@ -From db32ba60ca75d288d3ac08b54256cb74d9e1581a Mon Sep 17 00:00:00 2001 +From 1f7d106c7d982fe055addc8d883b161202233175 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 26 Apr 2017 03:47:58 -0400 -Subject: [PATCH 1/3] Makefile.am: remove doc and apidoc +Subject: [PATCH 1/4] Makefile.am: remove doc and apidoc There was a failure at do_install time, so remove doc to workaround. @@ -13,7 +13,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index c6ab640..fb09fc1 100644 +index 9ad827c..34364a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ @@ -24,5 +24,5 @@ index c6ab640..fb09fc1 100644 EXTRA_DIST = \ libreport.pc.in \ -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch index 146510e3c..7f5895ea1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch @@ -1,7 +1,7 @@ -From d8c49e6a15ab28f4ca94e03b2a53ed8df63346cd Mon Sep 17 00:00:00 2001 +From 9beadcdfca9198548f06bf18f3f26e1d11542e53 Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Wed, 26 Apr 2017 03:49:45 -0400 -Subject: [PATCH 2/3] configure.ac: remove prog test of xmlto and asciidoc +Date: Tue, 31 Jul 2018 16:53:04 +0800 +Subject: [PATCH 2/4] configure.ac: remove prog test of xmlto and asciidoc The prog of xmlto and asciidoc were used to generate documents, and since the doc module has already been disabled, so we should @@ -15,12 +15,12 @@ Signed-off-by: Hongxu Jia 1 file changed, 18 deletions(-) diff --git a/configure.ac b/configure.ac -index ccefe50..ed48c88 100644 +index feafc28..aceccf4 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,24 +68,6 @@ if test -z "$PYTHON3"; then - exit 1 - fi +@@ -56,24 +56,6 @@ IT_PROG_INTLTOOL([0.35.0]) + + dnl ****** END **************************************** -AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) -[if test "$ASCIIDOC" = "no"] @@ -44,5 +44,5 @@ index ccefe50..ed48c88 100644 AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), LIBREPORT_PARSE_WITH([bugzilla])) -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch index 3ad777464..2ff1731be 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch @@ -1,7 +1,7 @@ -From 0e96d9f23b2b166e7444e7c8e0a6d4b83c2eccd7 Mon Sep 17 00:00:00 2001 +From 41bce1de2fd2a0f79c266f245ae3e3720ccaf46a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 26 Apr 2017 03:51:03 -0400 -Subject: [PATCH 3/3] without build plugins +Subject: [PATCH 3/4] without build plugins Upstream-Status: Inappropriate workaround @@ -22,5 +22,5 @@ index c15928c..bac02b1 100644 -SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) +SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch index 9839e5a9f..4ba69c793 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch @@ -1,7 +1,7 @@ -From cf3b646facc19078ed29f828e36dd2e552283518 Mon Sep 17 00:00:00 2001 +From c1c301502a8f69b9889197744b301a136082f09d Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 27 Apr 2017 02:15:02 -0400 -Subject: [PATCH] configure.ac: remove prog test of augparse +Subject: [PATCH 4/4] configure.ac: remove prog test of augparse The build time does not require it. @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac -index c06af2d..b90f49e 100644 +index aceccf4..83c101b 100644 --- a/configure.ac +++ b/configure.ac -@@ -288,14 +288,6 @@ AC_ARG_WITH(augeaslenslibdir, +@@ -350,14 +350,6 @@ AC_ARG_WITH(augeaslenslibdir, [Directory for librepor lens (default: /usr/share/augeas/lenses)])], [], [with_augeaslenslibdir="/usr/share/augeas/lenses"]) AC_SUBST([AUGEAS_LENS_LIB_DIR], [$with_augeaslenslibdir]) @@ -32,5 +32,5 @@ index c06af2d..b90f49e 100644 AC_ARG_WITH([defaultdumpdirmode], AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch deleted file mode 100644 index 9770f077c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 06710ab89fc7d7a82a378289aa3fcd92d33074f2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 27 Apr 2017 03:31:00 -0400 -Subject: [PATCH] remove python2 support - -We do not require python2, so remove it. - -Upstream-Status: Inappropriate workaround - -Signed-off-by: Hongxu Jia ---- - configure.ac | 15 --------------- - src/client-python/reportclient/Makefile.am | 9 --------- - src/report-python/Makefile.am | 19 ------------------- - 3 files changed, 43 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eb50382..826d0fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,15 +166,6 @@ do - done - fi dnl end NO_MANTISBT - --AC_PATH_PROG([PYTHON_CONFIG], [python-config], [no]) --[if test "$PYTHON_CONFIG" = "no"] --[then] -- [echo "The python-config program was not found in the search path. Please ensure"] -- [echo "that it is installed and its directory is included in the search path."] -- [echo "Then run configure again before attempting to build libreport."] -- [exit 1] --[fi] -- - AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) - [if test "$PYTHON3_CONFIG" = "no"] - [then] -@@ -184,9 +175,6 @@ AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) - [exit 1] - [fi] - --PYTHON_CFLAGS=`python-config --cflags 2> /dev/null` --PYTHON_LIBS=`python-config --libs 2> /dev/null` -- - PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null` - PYTHON3_LIBS=`python3-config --libs 2> /dev/null` - -@@ -198,9 +186,6 @@ PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ - PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` - --AC_SUBST(PYTHON_CFLAGS) --AC_SUBST(PYTHON_LIBS) -- - AC_SUBST(PYTHON3_CFLAGS) - AC_SUBST(PYTHON3_LIBS) - AC_SUBST(python3dir, $PYTHON3_DIR) -diff --git a/src/client-python/reportclient/Makefile.am b/src/client-python/reportclient/Makefile.am -index 46ac42f..fb5216a 100644 ---- a/src/client-python/reportclient/Makefile.am -+++ b/src/client-python/reportclient/Makefile.am -@@ -4,13 +4,10 @@ PYFILES = \ - dnfdebuginfo.py \ - yumdebuginfo.py - --py2clientdir = $(pyexecdir)/reportclient - py3clientdir = $(py3execdir)/reportclient - --py2client_PYTHON = $(PYFILES) - py3client_PYTHON = $(PYFILES) - --py2client_LTLIBRARIES = _reportclient.la - py3client_LTLIBRARIES = _reportclient3.la - - PYEXTFILES = \ -@@ -33,12 +30,6 @@ PYEXTLDFLAGS = \ - -avoid-version \ - -Wl,-z,relro -Wl,-z,now - --_reportclient_la_SOURCES = $(PYEXTFILES) --_reportclient_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON_CFLAGS) --_reportclient_la_LDFLAGS = $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_reportclient --_reportclient_la_LIBADD = ../../lib/libreport.la -- - _reportclient3_la_SOURCES = $(PYEXTFILES) - _reportclient3_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON3_CFLAGS) - _reportclient3_la_LDFLAGS = $(PYEXTLDFLAGS) \ -diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am -index 793cebd..241dcb7 100644 ---- a/src/report-python/Makefile.am -+++ b/src/report-python/Makefile.am -@@ -1,12 +1,9 @@ - PYFILES = __init__.py accountmanager.py - --pyreportexecdir = $(pyexecdir)/report - py3reportexecdir = $(py3execdir)/report - --pyreportexec_PYTHON = $(PYFILES) - py3reportexec_PYTHON = $(PYFILES) - --pyreportexec_LTLIBRARIES = _pyreport.la - py3reportexec_LTLIBRARIES = _py3report.la - - PYEXTFILES = \ -@@ -34,20 +31,6 @@ PYEXTLDFLAGS = \ - -avoid-version \ - -Wl,-z,relro -Wl,-z,now - --_pyreport_la_SOURCES = $(PYEXTFILES) -- --_pyreport_la_CPPFLAGS = \ -- $(PYEXTCPPFLAGS) \ -- $(PYTHON_CFLAGS) -- --_pyreport_la_LDFLAGS = \ -- $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_pyreport -- --_pyreport_la_LIBADD = \ -- ../lib/libreport.la \ -- $(PYTHON2_LIBS) -- - _py3report_la_SOURCES = $(PYEXTFILES) - - _py3report_la_CPPFLAGS = \ -@@ -64,7 +47,6 @@ _py3report_la_LIBADD = \ - - # report compat: - --pyreportioexecdir = $(pyexecdir)/report/io - py3reportioexecdir = $(py3execdir)/report/io - - PYIOFILES = \ -@@ -73,5 +55,4 @@ PYIOFILES = \ - io/NewtIO.py \ - io/TextIO.py - --pyreportioexec_PYTHON = $(PYIOFILES) - py3reportioexec_PYTHON = $(PYIOFILES) --- -2.8.1 - -- cgit v1.2.1