summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2019-04-25 02:33:56 -0700
committerKhem Raj <raj.khem@gmail.com>2019-04-29 10:13:56 -0700
commit7392f986b69d80a66322149d024f24347a273076 (patch)
tree0c83643952dfaf9a32ec6394c63c84a1c0e33758
parent6294e0e6bc55d71f2fafab8e90924bd2a34a061c (diff)
downloadmeta-openembedded-7392f986b69d80a66322149d024f24347a273076.tar.gz
rrdtool: Upgrade to 1.7.1
Backport 3 patches to fix below error: ERROR: rrdtool-1.7.1-r0 do_package: SYSTEMD_SERVICE_rrdcached value rrdcached.socket does not exist Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch45
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch93
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch51
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb (renamed from meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb)7
4 files changed, 194 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch
new file mode 100644
index 000000000..701ab2c5b
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch
@@ -0,0 +1,45 @@
1From 35aae13a34728e14150706b2a4b1a57fabe00e98 Mon Sep 17 00:00:00 2001
2From: Tobias Oetiker <tobi@oetiker.ch>
3Date: Mon, 4 Feb 2019 16:25:06 +0100
4Subject: [PATCH 1/3] add missing etc/rrdcached-default-lsb.in to tarball -
5 fixes #956
6
7Add missing etc/rrdcached-default-lsb.in to tarball - fixes #956
8
9Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/35aae13a34728e14150706b2a4b1a57fabe00e98]
10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12---
13 Makefile.am | 2 +-
14 Makefile.in | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/Makefile.am b/Makefile.am
18index 5a15db6c..6bec092e 100644
19--- a/Makefile.am
20+++ b/Makefile.am
21@@ -20,7 +20,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
22 rrdtool.spec favicon.ico bootstrap \
23 libtool \
24 m4/snprintf.m4 \
25- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \
26+ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
27 win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
28 win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
29 win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
30diff --git a/Makefile.in b/Makefile.in
31index 607193c1..c9b1939f 100644
32--- a/Makefile.in
33+++ b/Makefile.in
34@@ -432,7 +432,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
35 rrdtool.spec favicon.ico bootstrap \
36 libtool \
37 m4/snprintf.m4 \
38- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \
39+ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
40 win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
41 win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
42 win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
43--
442.17.1
45
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch
new file mode 100644
index 000000000..0385ae6d6
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch
@@ -0,0 +1,93 @@
1From 3e469b4c4b5c219469b0be299ce75c4fac09afc9 Mon Sep 17 00:00:00 2001
2From: Tobias Oetiker <tobi@oetiker.ch>
3Date: Mon, 4 Feb 2019 17:17:25 +0100
4Subject: [PATCH 2/3] properly add etc files via EXTRA_DIST - fixes #956 some more
5
6Add etc files via EXTRA_DIST - fixes #956 some more
7
8Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/3e469b4c4b5c219469b0be299ce75c4fac09afc9]
9
10Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
11---
12 Makefile.am | 3 +--
13 Makefile.in | 5 ++---
14 etc/Makefile.am | 3 +++
15 etc/Makefile.in | 3 +++
16 4 files changed, 9 insertions(+), 5 deletions(-)
17
18diff --git a/Makefile.am b/Makefile.am
19index 6bec092e..c3e2c303 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh
23
24 # build the following subdirectories
25
26-SUBDIRS = po src bindings tests
27+SUBDIRS = po src bindings tests etc
28
29 if BUILD_DOCS
30 SUBDIRS += doc
31@@ -20,7 +20,6 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
32 rrdtool.spec favicon.ico bootstrap \
33 libtool \
34 m4/snprintf.m4 \
35- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
36 win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
37 win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
38 win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
39diff --git a/Makefile.in b/Makefile.in
40index c9b1939f..6a1280e4 100644
41--- a/Makefile.in
42+++ b/Makefile.in
43@@ -168,7 +168,7 @@ am__define_uniq_tagged_files = \
44 ETAGS = etags
45 CTAGS = ctags
46 CSCOPE = cscope
47-DIST_SUBDIRS = po src bindings tests doc examples
48+DIST_SUBDIRS = po src bindings tests etc doc examples
49 am__DIST_COMMON = $(srcdir)/Makefile.in \
50 $(top_srcdir)/conftools/compile \
51 $(top_srcdir)/conftools/config.guess \
52@@ -427,12 +427,11 @@ top_srcdir = @top_srcdir@
53 RSYNC = rsync --rsh=ssh
54
55 # build the following subdirectories
56-SUBDIRS = po src bindings tests $(am__append_1) $(am__append_2)
57+SUBDIRS = po src bindings tests etc $(am__append_1) $(am__append_2)
58 EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
59 rrdtool.spec favicon.ico bootstrap \
60 libtool \
61 m4/snprintf.m4 \
62- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
63 win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
64 win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
65 win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
66diff --git a/etc/Makefile.am b/etc/Makefile.am
67index f5503f0c..ab763dc8 100644
68--- a/etc/Makefile.am
69+++ b/etc/Makefile.am
70@@ -1,3 +1,6 @@
71+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
72+ rrdcached.socket.in rrdcached.service.in
73+
74 if HAVE_SYSTEMD
75 systemdsystemunit_DATA = \
76 etc/rrdcached.socket \
77diff --git a/etc/Makefile.in b/etc/Makefile.in
78index c67f9214..74b914b9 100644
79--- a/etc/Makefile.in
80+++ b/etc/Makefile.in
81@@ -364,6 +364,9 @@ target_vendor = @target_vendor@
82 top_build_prefix = @top_build_prefix@
83 top_builddir = @top_builddir@
84 top_srcdir = @top_srcdir@
85+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
86+ rrdcached.socket.in rrdcached.service.in
87+
88 @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
89 @HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
90 @HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
91--
922.17.1
93
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch
new file mode 100644
index 000000000..b929e31f8
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch
@@ -0,0 +1,51 @@
1From 865a9bade72f93cf72ca59954c6df01e8c48915d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
3Date: Tue, 5 Feb 2019 15:04:34 +0100
4Subject: [PATCH 3/3] Fixed 'No rule to make target 'etc/rrdcached.socket'
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Fixed 'No rule to make target 'etc/rrdcached.socket'
10
11Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/865a9bade72f93cf72ca59954c6df01e8c48915d]
12
13Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com
14Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
15---
16 etc/Makefile.am | 4 ++--
17 etc/Makefile.in | 4 ++--
18 2 files changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/etc/Makefile.am b/etc/Makefile.am
21index ab763dc8..7d18178a 100644
22--- a/etc/Makefile.am
23+++ b/etc/Makefile.am
24@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
25
26 if HAVE_SYSTEMD
27 systemdsystemunit_DATA = \
28- etc/rrdcached.socket \
29- etc/rrdcached.service
30+ rrdcached.socket \
31+ rrdcached.service
32 endif
33\ No newline at end of file
34diff --git a/etc/Makefile.in b/etc/Makefile.in
35index 74b914b9..d512fd59 100644
36--- a/etc/Makefile.in
37+++ b/etc/Makefile.in
38@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
39 rrdcached.socket.in rrdcached.service.in
40
41 @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
42-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
43-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
44+@HAVE_SYSTEMD_TRUE@ rrdcached.socket \
45+@HAVE_SYSTEMD_TRUE@ rrdcached.service
46
47 all: all-am
48
49--
502.17.1
51
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb
index 4a6c44669..63cdb7aee 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb
@@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d"
6 6
7DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native python-setuptools-native" 7DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native python-setuptools-native"
8 8
9SRCREV = "bfc82d5242855628b826018479df00e0ec4e8360" 9SRCREV = "34e6ff6218bb0372eb545f886dec96dd3d20be47"
10PV = "1.7.0" 10PV = "1.7.1"
11 11
12SRC_URI = "\ 12SRC_URI = "\
13 git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ 13 git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \
14 file://0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch \
15 file://0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch \
16 file://0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch \
14" 17"
15 18
16S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-31 13:03:20 +0000