CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rrdtool: upgrade 1.7.1 -> 1.7.2

Browse Source 
License-Update: Update year in COPYRIGHT and Update FSF address and fix UTF8

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li 2019-06-05 11:03:57 +08:00 committed by Khem Raj
parent 934d71cb14
commit bbf5e3f137
4 changed files with 3 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta-oe/recipes-extended/rrdtool/rrdtool/0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch
View File

@ -1,45 +0,0 @@
From 35aae13a34728e14150706b2a4b1a57fabe00e98 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 4 Feb 2019 16:25:06 +0100
Subject: [PATCH 1/3] add missing etc/rrdcached-default-lsb.in to tarball -
fixes #956
Add missing etc/rrdcached-default-lsb.in to tarball - fixes #956
Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/35aae13a34728e14150706b2a4b1a57fabe00e98]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
Makefile.am | 2 +-
Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5a15db6c..6bec092e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \
+ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
diff --git a/Makefile.in b/Makefile.in
index 607193c1..c9b1939f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -432,7 +432,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat \
+ etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
--
2.17.1

93
meta-oe/recipes-extended/rrdtool/rrdtool/0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch
View File

@ -1,93 +0,0 @@
From 3e469b4c4b5c219469b0be299ce75c4fac09afc9 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 4 Feb 2019 17:17:25 +0100
Subject: [PATCH 2/3] properly add etc files via EXTRA_DIST - fixes #956 some more
Add etc files via EXTRA_DIST - fixes #956 some more
Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/3e469b4c4b5c219469b0be299ce75c4fac09afc9]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
Makefile.am | 3 +--
Makefile.in | 5 ++---
etc/Makefile.am | 3 +++
etc/Makefile.in | 3 +++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6bec092e..c3e2c303 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh
# build the following subdirectories
-SUBDIRS = po src bindings tests
+SUBDIRS = po src bindings tests etc
if BUILD_DOCS
SUBDIRS += doc
@@ -20,7 +20,6 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
diff --git a/Makefile.in b/Makefile.in
index c9b1939f..6a1280e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-DIST_SUBDIRS = po src bindings tests doc examples
+DIST_SUBDIRS = po src bindings tests etc doc examples
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/conftools/compile \
$(top_srcdir)/conftools/config.guess \
@@ -427,12 +427,11 @@ top_srcdir = @top_srcdir@
RSYNC = rsync --rsh=ssh
# build the following subdirectories
-SUBDIRS = po src bindings tests $(am__append_1) $(am__append_2)
+SUBDIRS = po src bindings tests etc $(am__append_1) $(am__append_2)
EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
rrdtool.spec favicon.ico bootstrap \
libtool \
m4/snprintf.m4 \
- etc/rrdcached-default-redhat etc/rrdcached-init-redhat etc/rrdcached-default-lsb.in \
win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \
win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index f5503f0c..ab763dc8 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
+ rrdcached.socket.in rrdcached.service.in
+
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
etc/rrdcached.socket \
diff --git a/etc/Makefile.in b/etc/Makefile.in
index c67f9214..74b914b9 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -364,6 +364,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \
+ rrdcached.socket.in rrdcached.service.in
+
@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
--
2.17.1

51
meta-oe/recipes-extended/rrdtool/rrdtool/0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch
View File

@ -1,51 +0,0 @@
From 865a9bade72f93cf72ca59954c6df01e8c48915d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 5 Feb 2019 15:04:34 +0100
Subject: [PATCH 3/3] Fixed 'No rule to make target 'etc/rrdcached.socket'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixed 'No rule to make target 'etc/rrdcached.socket'
Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/865a9bade72f93cf72ca59954c6df01e8c48915d]
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
etc/Makefile.am | 4 ++--
etc/Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/etc/Makefile.am b/etc/Makefile.am
index ab763dc8..7d18178a 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
- etc/rrdcached.socket \
- etc/rrdcached.service
+ rrdcached.socket \
+ rrdcached.service
endif
\ No newline at end of file
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 74b914b9..d512fd59 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
rrdcached.socket.in rrdcached.service.in
@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
+@HAVE_SYSTEMD_TRUE@ rrdcached.socket \
+@HAVE_SYSTEMD_TRUE@ rrdcached.service
all: all-am
--
2.17.1

9
meta-oe/recipes-extended/rrdtool/rrdtool_1.7.1.bb → meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb
View File

@ -2,18 +2,15 @@ SUMMARY = "High performance data logging and graphing system for time series dat
HOMEPAGE = "http://oss.oetiker.ch/rrdtool/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39df84cfd8a5e18bf988f277f7946676"
DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native python-setuptools-native"
SRCREV = "34e6ff6218bb0372eb545f886dec96dd3d20be47"
PV = "1.7.1"
SRCREV = "56a83f4f52e6745cd4352f9ee008be3183a6dedf"
PV = "1.7.2"
SRC_URI = "\
git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \
file://0001-add-missing-etc-rrdcached-default-lsb.in-to-tarball-.patch \
file://0002-properly-add-etc-files-via-EXTRA_DIST-fixes-956-some.patch \
file://0003-Fixed-No-rule-to-make-target-etc-rrdcached.socket.patch \
"
S = "${WORKDIR}/git"