mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libreport: update to version 2.17.8
Update SRC_REV and change recipe name. Modify patches to apply and remove unrecognized configure option --without-python2. Retain --with-python3 even though it is the default. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Joe Slater
Khem Raj
parent
545c524c11
commit
1e774dfc31
|
|
@ -1,28 +1,32 @@
|
|||
From 1f7d106c7d982fe055addc8d883b161202233175 Mon Sep 17 00:00:00 2001
|
||||
From 73dc0c2cd942e30f5f7cb40cb5828895b96f0fb1 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
|
||||
Subject: [PATCH] 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>
|
||||
|
||||
Context modified to apply to v2.17.8.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9ad827c..34364a8 100644
|
||||
index 4ff2f5c5..d4e30bc2 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
|
||||
-SUBDIRS = data po src tests doc apidoc
|
||||
+SUBDIRS = data po src tests
|
||||
|
||||
EXTRA_DIST = \
|
||||
libreport.pc.in \
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9beadcdfca9198548f06bf18f3f26e1d11542e53 Mon Sep 17 00:00:00 2001
|
||||
From 276c45d0663124c9ccab0ddc8b97fb5cdc8b3867 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
|
||||
Subject: [PATCH] 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
|
||||
|
|
@ -10,15 +10,19 @@ remove the prog test.
|
|||
Upstream-Status: Inappropriate [workaround]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Modify to apply to v 2.17.8.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
---
|
||||
configure.ac | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index feafc28..aceccf4 100644
|
||||
index da8cf898..17ece200 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -56,24 +56,6 @@ IT_PROG_INTLTOOL([0.35.0])
|
||||
@@ -57,24 +57,6 @@ IT_PROG_INTLTOOL([0.35.0])
|
||||
|
||||
dnl ****** END ****************************************
|
||||
|
||||
|
|
@ -42,7 +46,7 @@ index feafc28..aceccf4 100644
|
|||
-
|
||||
AC_ARG_WITH(bugzilla,
|
||||
AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]),
|
||||
LIBREPORT_PARSE_WITH([bugzilla]))
|
||||
LIBREPORT_PARSE_WITH([bugzilla]),
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,30 @@
|
|||
From 41bce1de2fd2a0f79c266f245ae3e3720ccaf46a Mon Sep 17 00:00:00 2001
|
||||
From f46610901dbac56d9631df012374c600db08453e 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
|
||||
Subject: [PATCH] without build plugins
|
||||
|
||||
Upstream-Status: Inappropriate [workaround]
|
||||
|
||||
Rebase to 2.9.1
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Modify to apply to v2.17.8.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@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
|
||||
index 410bfcb0..bac02b16 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 plugins workflows $(sub_dirs)
|
||||
+SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs)
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
From c1c301502a8f69b9889197744b301a136082f09d Mon Sep 17 00:00:00 2001
|
||||
From 62c922f43b54585d25ba89be36c10612b479270b 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
|
||||
Subject: [PATCH] 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>
|
||||
|
||||
Modify to apply to v2.17.8.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
---
|
||||
configure.ac | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
configure.ac | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aceccf4..83c101b 100644
|
||||
index 17ece200..89b463a4 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])
|
||||
@@ -287,15 +287,6 @@ AC_ARG_WITH(largedatatmpdir,
|
||||
[], [with_largedatatmpdir="/var/tmp"])
|
||||
AC_SUBST([LARGE_DATA_TMP_DIR], [$with_largedatatmpdir])
|
||||
|
||||
-AC_PATH_PROG(AUGPARSE, augparse, no)
|
||||
-[if test "$AUGPARSE" = "no"]
|
||||
-[then]
|
||||
|
|
@ -28,9 +32,10 @@ index aceccf4..83c101b 100644
|
|||
- [echo "Then run configure again before attempting to build libreport."]
|
||||
- [exit 1]
|
||||
-[fi]
|
||||
|
||||
-
|
||||
AC_ARG_WITH([defaultdumpdirmode],
|
||||
AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE],
|
||||
[Default dump dir mode (default: 0x1A0 (0640))]),
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \
|
|||
file://0003-without-build-plugins.patch \
|
||||
file://0004-configure.ac-remove-prog-test-of-augparse.patch \
|
||||
"
|
||||
SRCREV = "eaff08f38d771d9362923765bb404b1514c5ca0a"
|
||||
|
||||
# 2.17.8
|
||||
SRCREV = "46a99a14adba7276e5697b7c613d918796792345"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
|
|
@ -31,7 +33,7 @@ inherit gettext autotools python3native python3targetconfig pkgconfig
|
|||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}"
|
||||
PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3,"
|
||||
|
||||
EXTRA_OECONF += "--without-python2 --with-python3"
|
||||
EXTRA_OECONF += "--with-python3"
|
||||
|
||||
RDEPENDS:python3-libreport += "${PN}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user