diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-07-27 04:44:23 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:19:41 +0200 |
commit | 1f56b4212369b1ab90c27ae87954c1b3d990c555 (patch) | |
tree | f227966f3073093cdb1d27349fb6ea9d250d47cb | |
parent | 3d87b6643c74e59b850c7bdc13171eee480e6e19 (diff) | |
download | meta-openembedded-1f56b4212369b1ab90c27ae87954c1b3d990c555.tar.gz |
libreport: add recipe 2.9.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
6 files changed, 323 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch new file mode 100644 index 000000000..9b328a10a --- /dev/null +++ b/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From db32ba60ca75d288d3ac08b54256cb74d9e1581a Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 26 Apr 2017 03:47:58 -0400 | ||
4 | Subject: [PATCH 1/3] Makefile.am: remove doc and apidoc | ||
5 | |||
6 | There was a failure at do_install time, so remove doc to workaround. | ||
7 | |||
8 | Upstream-Status: Inappropriate workaround | ||
9 | |||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | ||
12 | Makefile.am | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index c6ab640..fb09fc1 100644 | ||
17 | --- a/Makefile.am | ||
18 | +++ b/Makefile.am | ||
19 | @@ -1,5 +1,5 @@ | ||
20 | ACLOCAL_AMFLAGS = -I m4 | ||
21 | -SUBDIRS = po src tests doc apidoc | ||
22 | +SUBDIRS = po src tests | ||
23 | |||
24 | EXTRA_DIST = \ | ||
25 | libreport.pc.in \ | ||
26 | -- | ||
27 | 2.8.1 | ||
28 | |||
diff --git a/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch new file mode 100644 index 000000000..146510e3c --- /dev/null +++ b/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From d8c49e6a15ab28f4ca94e03b2a53ed8df63346cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 26 Apr 2017 03:49:45 -0400 | ||
4 | Subject: [PATCH 2/3] configure.ac: remove prog test of xmlto and asciidoc | ||
5 | |||
6 | The prog of xmlto and asciidoc were used to generate documents, | ||
7 | and since the doc module has already been disabled, so we should | ||
8 | remove the prog test. | ||
9 | |||
10 | Upstream-Status: Inappropriate workaround | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | configure.ac | 18 ------------------ | ||
15 | 1 file changed, 18 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index ccefe50..ed48c88 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -68,24 +68,6 @@ if test -z "$PYTHON3"; then | ||
22 | exit 1 | ||
23 | fi | ||
24 | |||
25 | -AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) | ||
26 | -[if test "$ASCIIDOC" = "no"] | ||
27 | -[then] | ||
28 | - [echo "The asciidoc program was not found in the search path. Please ensure"] | ||
29 | - [echo "that it is installed and its directory is included in the search path."] | ||
30 | - [echo "Then run configure again before attempting to build libreport."] | ||
31 | - [exit 1] | ||
32 | -[fi] | ||
33 | - | ||
34 | -AC_PATH_PROG([XMLTO], [xmlto], [no]) | ||
35 | -[if test "$XMLTO" = "no"] | ||
36 | -[then] | ||
37 | - [echo "The xmlto program was not found in the search path. Please ensure"] | ||
38 | - [echo "that it is installed and its directory is included in the search path."] | ||
39 | - [echo "Then run configure again before attempting to build libreport."] | ||
40 | - [exit 1] | ||
41 | -[fi] | ||
42 | - | ||
43 | AC_ARG_WITH(bugzilla, | ||
44 | AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), | ||
45 | LIBREPORT_PARSE_WITH([bugzilla])) | ||
46 | -- | ||
47 | 2.8.1 | ||
48 | |||
diff --git a/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch new file mode 100644 index 000000000..3ad777464 --- /dev/null +++ b/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 0e96d9f23b2b166e7444e7c8e0a6d4b83c2eccd7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 26 Apr 2017 03:51:03 -0400 | ||
4 | Subject: [PATCH 3/3] without build plugins | ||
5 | |||
6 | Upstream-Status: Inappropriate workaround | ||
7 | |||
8 | Rebase to 2.9.1 | ||
9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
10 | --- | ||
11 | src/Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
15 | index c15928c..bac02b1 100644 | ||
16 | --- a/src/Makefile.am | ||
17 | +++ b/src/Makefile.am | ||
18 | @@ -8,4 +8,4 @@ if BUILD_NEWT | ||
19 | sub_dirs += report-newt | ||
20 | endif | ||
21 | |||
22 | -SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) | ||
23 | +SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) | ||
24 | -- | ||
25 | 2.8.1 | ||
26 | |||
diff --git a/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch new file mode 100644 index 000000000..9839e5a9f --- /dev/null +++ b/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From cf3b646facc19078ed29f828e36dd2e552283518 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 27 Apr 2017 02:15:02 -0400 | ||
4 | Subject: [PATCH] configure.ac: remove prog test of augparse | ||
5 | |||
6 | The build time does not require it. | ||
7 | |||
8 | Upstream-Status: Inappropriate workaround | ||
9 | |||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | ||
12 | configure.ac | 8 -------- | ||
13 | 1 file changed, 8 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index c06af2d..b90f49e 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -288,14 +288,6 @@ AC_ARG_WITH(augeaslenslibdir, | ||
20 | [Directory for librepor lens (default: /usr/share/augeas/lenses)])], | ||
21 | [], [with_augeaslenslibdir="/usr/share/augeas/lenses"]) | ||
22 | AC_SUBST([AUGEAS_LENS_LIB_DIR], [$with_augeaslenslibdir]) | ||
23 | -AC_PATH_PROG(AUGPARSE, augparse, no) | ||
24 | -[if test "$AUGPARSE" = "no"] | ||
25 | -[then] | ||
26 | - [echo "The augparse program was not found in the search path. Please ensure"] | ||
27 | - [echo "that it is installed and its directory is included in the search path."] | ||
28 | - [echo "Then run configure again before attempting to build libreport."] | ||
29 | - [exit 1] | ||
30 | -[fi] | ||
31 | |||
32 | AC_ARG_WITH([defaultdumpdirmode], | ||
33 | AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], | ||
34 | -- | ||
35 | 2.8.1 | ||
36 | |||
diff --git a/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch b/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch new file mode 100644 index 000000000..9770f077c --- /dev/null +++ b/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch | |||
@@ -0,0 +1,142 @@ | |||
1 | From 06710ab89fc7d7a82a378289aa3fcd92d33074f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 27 Apr 2017 03:31:00 -0400 | ||
4 | Subject: [PATCH] remove python2 support | ||
5 | |||
6 | We do not require python2, so remove it. | ||
7 | |||
8 | Upstream-Status: Inappropriate workaround | ||
9 | |||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | ||
12 | configure.ac | 15 --------------- | ||
13 | src/client-python/reportclient/Makefile.am | 9 --------- | ||
14 | src/report-python/Makefile.am | 19 ------------------- | ||
15 | 3 files changed, 43 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index eb50382..826d0fe 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -166,15 +166,6 @@ do | ||
22 | done | ||
23 | fi dnl end NO_MANTISBT | ||
24 | |||
25 | -AC_PATH_PROG([PYTHON_CONFIG], [python-config], [no]) | ||
26 | -[if test "$PYTHON_CONFIG" = "no"] | ||
27 | -[then] | ||
28 | - [echo "The python-config program was not found in the search path. Please ensure"] | ||
29 | - [echo "that it is installed and its directory is included in the search path."] | ||
30 | - [echo "Then run configure again before attempting to build libreport."] | ||
31 | - [exit 1] | ||
32 | -[fi] | ||
33 | - | ||
34 | AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) | ||
35 | [if test "$PYTHON3_CONFIG" = "no"] | ||
36 | [then] | ||
37 | @@ -184,9 +175,6 @@ AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) | ||
38 | [exit 1] | ||
39 | [fi] | ||
40 | |||
41 | -PYTHON_CFLAGS=`python-config --cflags 2> /dev/null` | ||
42 | -PYTHON_LIBS=`python-config --libs 2> /dev/null` | ||
43 | - | ||
44 | PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null` | ||
45 | PYTHON3_LIBS=`python3-config --libs 2> /dev/null` | ||
46 | |||
47 | @@ -198,9 +186,6 @@ PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ | ||
48 | PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ | ||
49 | print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` | ||
50 | |||
51 | -AC_SUBST(PYTHON_CFLAGS) | ||
52 | -AC_SUBST(PYTHON_LIBS) | ||
53 | - | ||
54 | AC_SUBST(PYTHON3_CFLAGS) | ||
55 | AC_SUBST(PYTHON3_LIBS) | ||
56 | AC_SUBST(python3dir, $PYTHON3_DIR) | ||
57 | diff --git a/src/client-python/reportclient/Makefile.am b/src/client-python/reportclient/Makefile.am | ||
58 | index 46ac42f..fb5216a 100644 | ||
59 | --- a/src/client-python/reportclient/Makefile.am | ||
60 | +++ b/src/client-python/reportclient/Makefile.am | ||
61 | @@ -4,13 +4,10 @@ PYFILES = \ | ||
62 | dnfdebuginfo.py \ | ||
63 | yumdebuginfo.py | ||
64 | |||
65 | -py2clientdir = $(pyexecdir)/reportclient | ||
66 | py3clientdir = $(py3execdir)/reportclient | ||
67 | |||
68 | -py2client_PYTHON = $(PYFILES) | ||
69 | py3client_PYTHON = $(PYFILES) | ||
70 | |||
71 | -py2client_LTLIBRARIES = _reportclient.la | ||
72 | py3client_LTLIBRARIES = _reportclient3.la | ||
73 | |||
74 | PYEXTFILES = \ | ||
75 | @@ -33,12 +30,6 @@ PYEXTLDFLAGS = \ | ||
76 | -avoid-version \ | ||
77 | -Wl,-z,relro -Wl,-z,now | ||
78 | |||
79 | -_reportclient_la_SOURCES = $(PYEXTFILES) | ||
80 | -_reportclient_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON_CFLAGS) | ||
81 | -_reportclient_la_LDFLAGS = $(PYEXTLDFLAGS) \ | ||
82 | - -export-symbols-regex init_reportclient | ||
83 | -_reportclient_la_LIBADD = ../../lib/libreport.la | ||
84 | - | ||
85 | _reportclient3_la_SOURCES = $(PYEXTFILES) | ||
86 | _reportclient3_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON3_CFLAGS) | ||
87 | _reportclient3_la_LDFLAGS = $(PYEXTLDFLAGS) \ | ||
88 | diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am | ||
89 | index 793cebd..241dcb7 100644 | ||
90 | --- a/src/report-python/Makefile.am | ||
91 | +++ b/src/report-python/Makefile.am | ||
92 | @@ -1,12 +1,9 @@ | ||
93 | PYFILES = __init__.py accountmanager.py | ||
94 | |||
95 | -pyreportexecdir = $(pyexecdir)/report | ||
96 | py3reportexecdir = $(py3execdir)/report | ||
97 | |||
98 | -pyreportexec_PYTHON = $(PYFILES) | ||
99 | py3reportexec_PYTHON = $(PYFILES) | ||
100 | |||
101 | -pyreportexec_LTLIBRARIES = _pyreport.la | ||
102 | py3reportexec_LTLIBRARIES = _py3report.la | ||
103 | |||
104 | PYEXTFILES = \ | ||
105 | @@ -34,20 +31,6 @@ PYEXTLDFLAGS = \ | ||
106 | -avoid-version \ | ||
107 | -Wl,-z,relro -Wl,-z,now | ||
108 | |||
109 | -_pyreport_la_SOURCES = $(PYEXTFILES) | ||
110 | - | ||
111 | -_pyreport_la_CPPFLAGS = \ | ||
112 | - $(PYEXTCPPFLAGS) \ | ||
113 | - $(PYTHON_CFLAGS) | ||
114 | - | ||
115 | -_pyreport_la_LDFLAGS = \ | ||
116 | - $(PYEXTLDFLAGS) \ | ||
117 | - -export-symbols-regex init_pyreport | ||
118 | - | ||
119 | -_pyreport_la_LIBADD = \ | ||
120 | - ../lib/libreport.la \ | ||
121 | - $(PYTHON2_LIBS) | ||
122 | - | ||
123 | _py3report_la_SOURCES = $(PYEXTFILES) | ||
124 | |||
125 | _py3report_la_CPPFLAGS = \ | ||
126 | @@ -64,7 +47,6 @@ _py3report_la_LIBADD = \ | ||
127 | |||
128 | # report compat: | ||
129 | |||
130 | -pyreportioexecdir = $(pyexecdir)/report/io | ||
131 | py3reportioexecdir = $(py3execdir)/report/io | ||
132 | |||
133 | PYIOFILES = \ | ||
134 | @@ -73,5 +55,4 @@ PYIOFILES = \ | ||
135 | io/NewtIO.py \ | ||
136 | io/TextIO.py | ||
137 | |||
138 | -pyreportioexec_PYTHON = $(PYIOFILES) | ||
139 | py3reportioexec_PYTHON = $(PYIOFILES) | ||
140 | -- | ||
141 | 2.8.1 | ||
142 | |||
diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.1.bb b/meta-oe/recipes-extended/libreport/libreport_2.9.1.bb new file mode 100644 index 000000000..459f0f23f --- /dev/null +++ b/meta-oe/recipes-extended/libreport/libreport_2.9.1.bb | |||
@@ -0,0 +1,43 @@ | |||
1 | DESCRIPTION = "Libraries providing API for reporting different problems in applications \ | ||
2 | to different bug targets like Bugzilla, ftp, trac, etc..." | ||
3 | SUMMARY = "Generic library for reporting various problems" | ||
4 | HOMEPAGE = "https://abrt.readthedocs.org/" | ||
5 | LICENSE = "GPLv2+" | ||
6 | DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ | ||
7 | json-c libtar libnewt libproxy rpm \ | ||
8 | augeas satyr systemd gtk+3 \ | ||
9 | " | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
12 | |||
13 | |||
14 | SRC_URI = "https://github.com/abrt/${BPN}/archive/${PV}/${BPN}}-%{PV}.tar.gz" | ||
15 | SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ | ||
16 | file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ | ||
17 | file://0003-without-build-plugins.patch \ | ||
18 | file://0004-configure.ac-remove-prog-test-of-augparse.patch \ | ||
19 | file://0005-remove-python2-support.patch \ | ||
20 | " | ||
21 | |||
22 | SRC_URI[md5sum] = "f732a63dcc68cf96f0df02bcfc5fccc7" | ||
23 | SRC_URI[sha256sum] = "484e15759a079730608b708ea9ae74a045ebe74f35dbfe9c9c16834c4462bcd4" | ||
24 | |||
25 | inherit distro_features_check | ||
26 | REQUIRED_DISTRO_FEATURES = "systemd" | ||
27 | |||
28 | inherit gettext autotools python3native pkgconfig | ||
29 | |||
30 | RDEPENDS_${PN}-python3 += "${PN}" | ||
31 | |||
32 | do_patch[prefuncs] += "do_gen_version" | ||
33 | do_gen_version() { | ||
34 | cd ${S} | ||
35 | ./gen-version | ||
36 | } | ||
37 | |||
38 | PACKAGES += "python3-${PN}" | ||
39 | |||
40 | FILES_${PN} += "${datadir}/*" | ||
41 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug" | ||
42 | FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
43 | |||