Also add LICENSE types and hashes.
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
...igure-add-option-to-not-build-manpages-14.patch | 52 ----------------------
...oottime_or_monotonic-everywhere-to-pick-c.patch | 24 ----------
...ke-time-from-proc-schedstat-for-processes.patch | 26 -----------
...04-missing-define-GRND_NONBLOCK-if-needed.patch | 21 ---------
patches/systemd-bootchart-230/autogen.sh | 1 -
patches/systemd-bootchart-230/series | 7 ---
rules/systemd-bootchart.make | 11 +++--
7 files changed, 7 insertions(+), 135 deletions(-)
delete mode 100644
patches/systemd-bootchart-230/0001-configure-add-option-to-not-build-manpages-14.patch
delete mode 100644
patches/systemd-bootchart-230/0002-Use-clock_boottime_or_monotonic-everywhere-to-pick-c.patch
delete mode 100644
patches/systemd-bootchart-230/0003-Don-t-take-time-from-proc-schedstat-for-processes.patch
delete mode 100644
patches/systemd-bootchart-230/0004-missing-define-GRND_NONBLOCK-if-needed.patch
delete mode 120000 patches/systemd-bootchart-230/autogen.sh
delete mode 100644 patches/systemd-bootchart-230/series
diff --git
a/patches/systemd-bootchart-230/0001-configure-add-option-to-not-build-manpages-14.patch
b/patches/systemd-bootchart-230/0001-configure-add-option-to-not-build-manpages-14.patch
deleted file mode 100644
index 2c2c9d4..0000000
---
a/patches/systemd-bootchart-230/0001-configure-add-option-to-not-build-manpages-14.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: yann-morin-1998 <yann.morin.1...@free.fr>
-Date: Tue, 30 Aug 2016 22:52:15 +0200
-Subject: [PATCH] configure: add option to not build manpages (#14)
-
-Man pages are not always needed, especially on embedded systems.
-
-Add a configure option to not build them; by default, build them.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1...@free.fr>
----
- Makefile.am | 5 ++++-
- configure.ac | 10 +++++++++-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index a71f8d8f8d19..e6510d5b3706 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -74,7 +74,10 @@ EXTRA_DIST = \
- MANPAGES = man/bootchart.conf.5 man/systemd-bootchart.1
- MANPAGES_ALIAS = man/bootchart.conf.d.5
-
--man_MANS = $(MANPAGES) $(MANPAGES_ALIAS)
-+if COND_man
-+MAYBE_MANPAGES = $(MANPAGES) $(MANPAGES_ALIAS)
-+endif
-+man_MANS = $(MAYBE_MANPAGES)
-
- man/bootchart.conf.d.5: man/bootchart.conf.5
-
-diff --git a/configure.ac b/configure.ac
-index f8e62d83aea2..90e8b0344c8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -167,8 +167,16 @@ AC_ARG_WITH([rootlibdir],
- AC_SUBST([rootprefix], [$with_rootprefix])
- AC_SUBST([rootlibdir], [$with_rootlibdir])
-
-+AC_ARG_ENABLE([man],
-+ AS_HELP_STRING([--diable-man],[Build the man pages (default: yes)]),
-+ [build_man=$enableval],
-+ [build_man=yes])
-+
- AC_PATH_PROG([XSLTPROC], [xsltproc])
--AS_IF([test -z "$XSLTPROC"], AC_MSG_ERROR([*** xsltproc is required for man
pages]))
-+AS_IF([test -z "$XSLTPROC" -a "$build_man" = "yes"],
-+ [AC_MSG_ERROR([*** xsltproc is required for man pages])])
-+
-+AM_CONDITIONAL([COND_man],[test "$build_man" = "yes"])
-
- AC_CONFIG_FILES([
- Makefile
diff --git
a/patches/systemd-bootchart-230/0002-Use-clock_boottime_or_monotonic-everywhere-to-pick-c.patch
b/patches/systemd-bootchart-230/0002-Use-clock_boottime_or_monotonic-everywhere-to-pick-c.patch
deleted file mode 100644
index 2d5f2dc..0000000
---
a/patches/systemd-bootchart-230/0002-Use-clock_boottime_or_monotonic-everywhere-to-pick-c.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Auke Kok <auke-jan.h....@intel.com>
-Date: Tue, 30 Aug 2016 12:41:45 -0700
-Subject: [PATCH] Use `clock_boottime_or_monotonic()` everywhere to pick
- clocksrc.
-
-This clocksrc is used every measurement and should be used
-everywhere, not just in one location.
----
- src/store.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/store.c b/src/store.c
-index 42cb8043ced0..e34b6ae1fcb8 100644
---- a/src/store.c
-+++ b/src/store.c
-@@ -53,7 +53,7 @@ static int skip = 0;
- double gettime_ns(void) {
- struct timespec n;
-
-- clock_gettime(CLOCK_MONOTONIC, &n);
-+ clock_gettime(clock_boottime_or_monotonic(), &n);
-
- return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
- }
diff --git
a/patches/systemd-bootchart-230/0003-Don-t-take-time-from-proc-schedstat-for-processes.patch
b/patches/systemd-bootchart-230/0003-Don-t-take-time-from-proc-schedstat-for-processes.patch
deleted file mode 100644
index 0a35058..0000000
---
a/patches/systemd-bootchart-230/0003-Don-t-take-time-from-proc-schedstat-for-processes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Auke Kok <auke-jan.h....@intel.com>
-Date: Tue, 30 Aug 2016 13:28:22 -0700
-Subject: [PATCH] Don't take time from /proc/schedstat for processes.
-
-I assume this is a copy-paste error. We shouldn't take the rt and wt
-values here from /proc/schedstat, as they're resulting in entirely
-incorrect values. Instead, the loop code fills them properly with
-the per-process value already, and they can be left blank here
-intentionally. This was the case before in the pre-systemd code tree.
----
- src/store.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/store.c b/src/store.c
-index e34b6ae1fcb8..c9aa235aeb50 100644
---- a/src/store.c
-+++ b/src/store.c
-@@ -249,8 +249,6 @@ schedstat_next:
-
- /* mark our first sample */
- ps->first = ps->last = ps->sample;
-- ps->sample->runtime = atoll(rt);
-- ps->sample->waittime = atoll(wt);
-
- /* get name, start time */
- if (ps->sched < 0) {
diff --git
a/patches/systemd-bootchart-230/0004-missing-define-GRND_NONBLOCK-if-needed.patch
b/patches/systemd-bootchart-230/0004-missing-define-GRND_NONBLOCK-if-needed.patch
deleted file mode 100644
index d1888c4..0000000
---
a/patches/systemd-bootchart-230/0004-missing-define-GRND_NONBLOCK-if-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Michael Olbrich <m.olbr...@pengutronix.de>
-Date: Mon, 5 Sep 2016 14:20:40 +0200
-Subject: [PATCH] missing: define GRND_NONBLOCK if needed
-
-Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
----
- src/missing.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/missing.h b/src/missing.h
-index e323d269c98e..a24ad0391ecc 100644
---- a/src/missing.h
-+++ b/src/missing.h
-@@ -55,3 +55,7 @@ static inline int getrandom(void *buffer, size_t count,
unsigned flags) {
- return syscall(__NR_getrandom, buffer, count, flags);
- }
- #endif
-+
-+#ifndef GRND_NONBLOCK
-+#define GRND_NONBLOCK 0x0001
-+#endif
diff --git a/patches/systemd-bootchart-230/autogen.sh
b/patches/systemd-bootchart-230/autogen.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/systemd-bootchart-230/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/systemd-bootchart-230/series
b/patches/systemd-bootchart-230/series
deleted file mode 100644
index ff5df53..0000000
--- a/patches/systemd-bootchart-230/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure-add-option-to-not-build-manpages-14.patch
-0002-Use-clock_boottime_or_monotonic-everywhere-to-pick-c.patch
-0003-Don-t-take-time-from-proc-schedstat-for-processes.patch
-0004-missing-define-GRND_NONBLOCK-if-needed.patch
-# 73827f21be31d7a9312a09b004a922c3 - git-ptx-patches magic
diff --git a/rules/systemd-bootchart.make b/rules/systemd-bootchart.make
index 90f6162..c6d6e29 100644
--- a/rules/systemd-bootchart.make
+++ b/rules/systemd-bootchart.make
@@ -16,14 +16,17 @@ PACKAGES-$(PTXCONF_SYSTEMD_BOOTCHART) += systemd-bootchart
#
# Paths and names
#
-SYSTEMD_BOOTCHART_VERSION := 230
-SYSTEMD_BOOTCHART_MD5 := ff19741e25987add1fc547e2e4ddf87c
+SYSTEMD_BOOTCHART_VERSION := 231
+SYSTEMD_BOOTCHART_MD5 := 809c148769a937746b667ba478134bcf
SYSTEMD_BOOTCHART :=
systemd-bootchart-$(SYSTEMD_BOOTCHART_VERSION)
SYSTEMD_BOOTCHART_SUFFIX := tar.xz
-SYSTEMD_BOOTCHART_URL :=
https://github.com/systemd/systemd-bootchart/releases/download/v230/$(SYSTEMD_BOOTCHART).$(SYSTEMD_BOOTCHART_SUFFIX)
+SYSTEMD_BOOTCHART_URL :=
https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION)/$(SYSTEMD_BOOTCHART).$(SYSTEMD_BOOTCHART_SUFFIX)
SYSTEMD_BOOTCHART_SOURCE :=
$(SRCDIR)/$(SYSTEMD_BOOTCHART).$(SYSTEMD_BOOTCHART_SUFFIX)
SYSTEMD_BOOTCHART_DIR := $(BUILDDIR)/$(SYSTEMD_BOOTCHART)
-SYSTEMD_BOOTCHART_LICENSE := unknown
+SYSTEMD_BOOTCHART_LICENSE := GPL-2.0+, LGPL-2.1
+SYSTEMD_BOOTCHART_LICENSE_FILES := \
+ file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
+ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
# ----------------------------------------------------------------------------
# Prepare
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
