diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-extended/libreport/files')
4 files changed, 138 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch new file mode 100644 index 00000000..97fb097f --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch @@ -0,0 +1,28 @@ +From 1f7d106c7d982fe055addc8d883b161202233175 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 26 Apr 2017 03:47:58 -0400 +Subject: [PATCH 1/4] Makefile.am: remove doc and apidoc + +There was a failure at do_install time, so remove doc to workaround. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9ad827c..34364a8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = po src tests doc apidoc ++SUBDIRS = po src tests + + EXTRA_DIST = \ + libreport.pc.in \ +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch new file mode 100644 index 00000000..7f5895ea --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch @@ -0,0 +1,48 @@ +From 9beadcdfca9198548f06bf18f3f26e1d11542e53 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +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 +remove the prog test. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index feafc28..aceccf4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,24 +56,6 @@ IT_PROG_INTLTOOL([0.35.0]) + + dnl ****** END **************************************** + +-AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) +-[if test "$ASCIIDOC" = "no"] +-[then] +- [echo "The asciidoc 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([XMLTO], [xmlto], [no]) +-[if test "$XMLTO" = "no"] +-[then] +- [echo "The xmlto 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_ARG_WITH(bugzilla, + AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), + LIBREPORT_PARSE_WITH([bugzilla])) +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch new file mode 100644 index 00000000..2ff1731b --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch @@ -0,0 +1,26 @@ +From 41bce1de2fd2a0f79c266f245ae3e3720ccaf46a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 26 Apr 2017 03:51:03 -0400 +Subject: [PATCH 3/4] without build plugins + +Upstream-Status: Inappropriate workaround + +Rebase to 2.9.1 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index c15928c..bac02b1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,4 +8,4 @@ if BUILD_NEWT + sub_dirs += report-newt + endif + +-SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) ++SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch new file mode 100644 index 00000000..4ba69c79 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch @@ -0,0 +1,36 @@ +From c1c301502a8f69b9889197744b301a136082f09d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Apr 2017 02:15:02 -0400 +Subject: [PATCH 4/4] configure.ac: remove prog test of augparse + +The build time does not require it. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aceccf4..83c101b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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]) +-AC_PATH_PROG(AUGPARSE, augparse, no) +-[if test "$AUGPARSE" = "no"] +-[then] +- [echo "The augparse 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_ARG_WITH([defaultdumpdirmode], + AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], +-- +2.7.4 + |