* [ptxdist] [PATCH] dbus: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
` (12 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/dbus.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/dbus.make b/rules/dbus.make
index 5893011..3562ffb 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
#
# Paths and names
#
-DBUS_VERSION := 1.10.10
-DBUS_MD5 := 495676d240eb982921b3ad1343526849
+DBUS_VERSION := 1.10.14
+DBUS_MD5 := 3f7b013ce8f641cd4c897acda0ef3467
DBUS := dbus-$(DBUS_VERSION)
DBUS_SUFFIX := tar.gz
DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] file: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] dbus: bump version Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:05 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] glib: " Clemens Gruber
` (11 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/file.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/file.make b/rules/file.make
index 257e1bb..eaf6571 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
#
# Paths and names
#
-FILE_VERSION := 5.24
-FILE_MD5 := ec161b5a0d2aef147fb046e5630b1408
+FILE_VERSION := 5.29
+FILE_MD5 := b7b57b36b577c9cede2f2d1342203302
FILE := file-$(FILE_VERSION)
FILE_SUFFIX := tar.gz
FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] file: bump version
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
@ 2016-12-16 15:05 ` Michael Olbrich
0 siblings, 0 replies; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:05 UTC (permalink / raw)
To: ptxdist
On Thu, Dec 15, 2016 at 02:52:11PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
New configure option!
Michael
> ---
> rules/file.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/file.make b/rules/file.make
> index 257e1bb..eaf6571 100644
> --- a/rules/file.make
> +++ b/rules/file.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
> #
> # Paths and names
> #
> -FILE_VERSION := 5.24
> -FILE_MD5 := ec161b5a0d2aef147fb046e5630b1408
> +FILE_VERSION := 5.29
> +FILE_MD5 := b7b57b36b577c9cede2f2d1342203302
> FILE := file-$(FILE_VERSION)
> FILE_SUFFIX := tar.gz
> FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* [ptxdist] [PATCH] glib: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] dbus: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
` (10 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/glib.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/glib.make b/rules/glib.make
index 8a53b24..e4a986e 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
#
# Paths and names
#
-GLIB_VERSION := 2.50.1
-GLIB_MD5 := 6baee4d7e3b1ec791b4ced93976365ee
+GLIB_VERSION := 2.50.2
+GLIB_MD5 := 5eeb2bfaf78a07be59585e8b6e80b1d6
GLIB := glib-$(GLIB_VERSION)
GLIB_SUFFIX := tar.xz
GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] iperf: version bump
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (2 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] glib: " Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:12 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] iproute2: bump version Clemens Gruber
` (9 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
patches/iperf-2.0.5/fix_early_termination.diff | 47 --------------------------
patches/iperf-2.0.5/series | 1 -
rules/iperf.make | 6 ++--
3 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 patches/iperf-2.0.5/fix_early_termination.diff
delete mode 100644 patches/iperf-2.0.5/series
diff --git a/patches/iperf-2.0.5/fix_early_termination.diff b/patches/iperf-2.0.5/fix_early_termination.diff
deleted file mode 100644
index f24dec7..0000000
--- a/patches/iperf-2.0.5/fix_early_termination.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-iperf version 2.0.4 running in server mode exits when a client connects
-using the -d (duplex) flag.
-
-To reproduce: On machine foo, run server:
-
-[somlo@foo]$ iperf -s
-
-on machine bar, run client in duplex mode:
-
-[somlo@bar]$ iperf -c foo -d
-
-
-What happens: At the end of the test, the iperf process on machine foo exits.
-
-What *should* happen: At the end of the test, the iperf process on machine
-should keep running, listening for new connections.
-
-===
-
-Patch form L. Gabriel Somlo on the iperf maillist 2009-01-21
-More precisely: http://sourceforge.net/tracker/index.php?func=detail&aid=1983829&group_id=128336&atid=711371
-
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-
----
- src/Client.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: src/Client.cpp
-===================================================================
---- src/Client.cpp.orig
-+++ src/Client.cpp
-@@ -207,10 +207,10 @@ void Client::Run( void ) {
- char* readAt = mBuf;
-
- #if HAVE_THREAD
-- if ( !isUDP( mSettings ) ) {
-- RunTCP();
-- return;
-- }
-+// if ( !isUDP( mSettings ) ) {
-+// RunTCP();
-+// return;
-+// }
- #endif
-
- // Indicates if the stream is readable
diff --git a/patches/iperf-2.0.5/series b/patches/iperf-2.0.5/series
deleted file mode 100644
index c490ac0..0000000
--- a/patches/iperf-2.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_early_termination.diff -p0
diff --git a/rules/iperf.make b/rules/iperf.make
index 8f73dfc..469458e 100644
--- a/rules/iperf.make
+++ b/rules/iperf.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_IPERF) += iperf
#
# Paths and names
#
-IPERF_VERSION := 2.0.5
-IPERF_MD5 := 44b5536b67719f4250faed632a3cd016
+IPERF_VERSION := 2.0.9
+IPERF_MD5 := 351b018b71176b8cb25f20eef6a9e37c
IPERF := iperf-$(IPERF_VERSION)
IPERF_SUFFIX := tar.gz
-IPERF_URL := $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX))
+IPERF_URL := $(call ptx/mirror, SF, iperf2/$(IPERF).$(IPERF_SUFFIX))
IPERF_SOURCE := $(SRCDIR)/$(IPERF).$(IPERF_SUFFIX)
IPERF_DIR := $(BUILDDIR)/$(IPERF)
IPERF_LICENSE := BSD
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] iperf: version bump
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
@ 2016-12-16 15:12 ` Michael Olbrich
2016-12-17 19:51 ` Clemens Gruber
0 siblings, 1 reply; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:12 UTC (permalink / raw)
To: ptxdist
Hi,
Well, the configure options could use some cleanup in general, but that's
nothing new.
And for all packages: I prefer it if the subject contains '<oldversion> ->
<newversion>'. It makes review easier. That way it's easier to see which
updates a small patch-level updates and require less review (and can be
applied shortly before a release) and which require a deeper look.
Michael
On Thu, Dec 15, 2016 at 02:52:13PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> patches/iperf-2.0.5/fix_early_termination.diff | 47 --------------------------
> patches/iperf-2.0.5/series | 1 -
> rules/iperf.make | 6 ++--
> 3 files changed, 3 insertions(+), 51 deletions(-)
> delete mode 100644 patches/iperf-2.0.5/fix_early_termination.diff
> delete mode 100644 patches/iperf-2.0.5/series
>
> diff --git a/patches/iperf-2.0.5/fix_early_termination.diff b/patches/iperf-2.0.5/fix_early_termination.diff
> deleted file mode 100644
> index f24dec7..0000000
> --- a/patches/iperf-2.0.5/fix_early_termination.diff
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -iperf version 2.0.4 running in server mode exits when a client connects
> -using the -d (duplex) flag.
> -
> -To reproduce: On machine foo, run server:
> -
> -[somlo@foo]$ iperf -s
> -
> -on machine bar, run client in duplex mode:
> -
> -[somlo@bar]$ iperf -c foo -d
> -
> -
> -What happens: At the end of the test, the iperf process on machine foo exits.
> -
> -What *should* happen: At the end of the test, the iperf process on machine
> -should keep running, listening for new connections.
> -
> -===
> -
> -Patch form L. Gabriel Somlo on the iperf maillist 2009-01-21
> -More precisely: http://sourceforge.net/tracker/index.php?func=detail&aid=1983829&group_id=128336&atid=711371
> -
> -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> -
> ----
> - src/Client.cpp | 8 ++++----
> - 1 file changed, 4 insertions(+), 4 deletions(-)
> -
> -Index: src/Client.cpp
> -===================================================================
> ---- src/Client.cpp.orig
> -+++ src/Client.cpp
> -@@ -207,10 +207,10 @@ void Client::Run( void ) {
> - char* readAt = mBuf;
> -
> - #if HAVE_THREAD
> -- if ( !isUDP( mSettings ) ) {
> -- RunTCP();
> -- return;
> -- }
> -+// if ( !isUDP( mSettings ) ) {
> -+// RunTCP();
> -+// return;
> -+// }
> - #endif
> -
> - // Indicates if the stream is readable
> diff --git a/patches/iperf-2.0.5/series b/patches/iperf-2.0.5/series
> deleted file mode 100644
> index c490ac0..0000000
> --- a/patches/iperf-2.0.5/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -fix_early_termination.diff -p0
> diff --git a/rules/iperf.make b/rules/iperf.make
> index 8f73dfc..469458e 100644
> --- a/rules/iperf.make
> +++ b/rules/iperf.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_IPERF) += iperf
> #
> # Paths and names
> #
> -IPERF_VERSION := 2.0.5
> -IPERF_MD5 := 44b5536b67719f4250faed632a3cd016
> +IPERF_VERSION := 2.0.9
> +IPERF_MD5 := 351b018b71176b8cb25f20eef6a9e37c
> IPERF := iperf-$(IPERF_VERSION)
> IPERF_SUFFIX := tar.gz
> -IPERF_URL := $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX))
> +IPERF_URL := $(call ptx/mirror, SF, iperf2/$(IPERF).$(IPERF_SUFFIX))
> IPERF_SOURCE := $(SRCDIR)/$(IPERF).$(IPERF_SUFFIX)
> IPERF_DIR := $(BUILDDIR)/$(IPERF)
> IPERF_LICENSE := BSD
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] iperf: version bump
2016-12-16 15:12 ` Michael Olbrich
@ 2016-12-17 19:51 ` Clemens Gruber
2017-01-04 16:33 ` Michael Olbrich
0 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-17 19:51 UTC (permalink / raw)
To: ptxdist
Hi,
On Fri, Dec 16, 2016 at 04:12:51PM +0100, Michael Olbrich wrote:
> Well, the configure options could use some cleanup in general, but that's
> nothing new.
You mean adding the (current) default options explicitly, right?
To sum up the update checklist:
1) Check the diff of the configure --help outputs between the versions
2) Check if options were missing/suboptimal before
3) Check if they are in alphabetical order
4) Check if there are new binaries/libraries
5) Move/remove the patches
6) Testing
Tooling would be nice. But probably not worth the effort. Maybe for the
download, extract and ./configure --help diff.. what do you think?
> And for all packages: I prefer it if the subject contains '<oldversion> ->
> <newversion>'. It makes review easier. That way it's easier to see which
> updates a small patch-level updates and require less review (and can be
> applied shortly before a release) and which require a deeper look.
I'll keep the subjects for the v2 but will use the -> notation next
time. (?)
Clemens
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [ptxdist] [PATCH] iperf: version bump
2016-12-17 19:51 ` Clemens Gruber
@ 2017-01-04 16:33 ` Michael Olbrich
2017-01-04 20:34 ` Robert Schwebel
0 siblings, 1 reply; 23+ messages in thread
From: Michael Olbrich @ 2017-01-04 16:33 UTC (permalink / raw)
To: ptxdist
Hi,
On Sat, Dec 17, 2016 at 08:51:10PM +0100, Clemens Gruber wrote:
> On Fri, Dec 16, 2016 at 04:12:51PM +0100, Michael Olbrich wrote:
> > Well, the configure options could use some cleanup in general, but that's
> > nothing new.
>
> You mean adding the (current) default options explicitly, right?
>
> To sum up the update checklist:
> 1) Check the diff of the configure --help outputs between the versions
> 2) Check if options were missing/suboptimal before
> 3) Check if they are in alphabetical order
Not alphabetical. Same order as 'configure --help'.
I Open the makefile and diff next to each other in my editor. That makes it
easy to see if
a) the old options are ok
b) what new options need to be added and where
> 4) Check if there are new binaries/libraries
For larger packages I usually compare 'find <platform>/packages/<pkg>'.
Usually with some tweeks to sort and filter out docs and headers etc.
> 5) Move/remove the patches
Very important. Especially patches for other architectures are often
forgotten.
> 6) Testing
>
> Tooling would be nice. But probably not worth the effort. Maybe for the
> download, extract and ./configure --help diff.. what do you think?
What I usually do is:
- build & install the old version
- change the version number
- 'ptxdist extract <pkg>'
- update the options
- 'ptxdist install <pkg>'
- update the targetinstall stage
- 'ptxdist targetinstall <pkg>'
- test
> > And for all packages: I prefer it if the subject contains '<oldversion> ->
> > <newversion>'. It makes review easier. That way it's easier to see which
> > updates a small patch-level updates and require less review (and can be
> > applied shortly before a release) and which require a deeper look.
>
> I'll keep the subjects for the v2 but will use the -> notation next
> time. (?)
Yes. No need to change the current patches.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [ptxdist] [PATCH] iperf: version bump
2017-01-04 16:33 ` Michael Olbrich
@ 2017-01-04 20:34 ` Robert Schwebel
0 siblings, 0 replies; 23+ messages in thread
From: Robert Schwebel @ 2017-01-04 20:34 UTC (permalink / raw)
To: ptxdist
On Wed, Jan 04, 2017 at 05:33:42PM +0100, Michael Olbrich wrote:
> On Sat, Dec 17, 2016 at 08:51:10PM +0100, Clemens Gruber wrote:
> > On Fri, Dec 16, 2016 at 04:12:51PM +0100, Michael Olbrich wrote:
> > > Well, the configure options could use some cleanup in general, but that's
> > > nothing new.
> >
> > You mean adding the (current) default options explicitly, right?
> >
> > To sum up the update checklist:
> > 1) Check the diff of the configure --help outputs between the versions
> > 2) Check if options were missing/suboptimal before
> > 3) Check if they are in alphabetical order
>
> Not alphabetical. Same order as 'configure --help'.
> I Open the makefile and diff next to each other in my editor. That makes it
> easy to see if
> a) the old options are ok
> b) what new options need to be added and where
>
> > 4) Check if there are new binaries/libraries
>
> For larger packages I usually compare 'find <platform>/packages/<pkg>'.
> Usually with some tweeks to sort and filter out docs and headers etc.
>
> > 5) Move/remove the patches
>
> Very important. Especially patches for other architectures are often
> forgotten.
>
> > 6) Testing
> >
> > Tooling would be nice. But probably not worth the effort. Maybe for the
> > download, extract and ./configure --help diff.. what do you think?
>
> What I usually do is:
> - build & install the old version
> - change the version number
> - 'ptxdist extract <pkg>'
> - update the options
> - 'ptxdist install <pkg>'
> - update the targetinstall stage
> - 'ptxdist targetinstall <pkg>'
> - test
>
> > > And for all packages: I prefer it if the subject contains '<oldversion> ->
> > > <newversion>'. It makes review easier. That way it's easier to see which
> > > updates a small patch-level updates and require less review (and can be
> > > applied shortly before a release) and which require a deeper look.
> >
> > I'll keep the subjects for the v2 but will use the -> notation next
> > time. (?)
>
> Yes. No need to change the current patches.
Any volunteer who writes a patch with these infos that improves the
documentation?
rsc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* [ptxdist] [PATCH] iproute2: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (3 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples Clemens Gruber
` (8 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-add-xtables-version.h.patch | 0
patches/{iproute2-4.8.0 => iproute2-4.9.0}/series | 0
rules/iproute2.make | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{iproute2-4.8.0 => iproute2-4.9.0}/0001-add-xtables-version.h.patch (100%)
rename patches/{iproute2-4.8.0 => iproute2-4.9.0}/series (100%)
diff --git a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch b/patches/iproute2-4.9.0/0001-add-xtables-version.h.patch
similarity index 100%
rename from patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
rename to patches/iproute2-4.9.0/0001-add-xtables-version.h.patch
diff --git a/patches/iproute2-4.8.0/series b/patches/iproute2-4.9.0/series
similarity index 100%
rename from patches/iproute2-4.8.0/series
rename to patches/iproute2-4.9.0/series
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 674894c..b8ab449 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
#
# Paths and names
#
-IPROUTE2_VERSION := 4.8.0
-IPROUTE2_MD5 := 54c6411863cb16a4375aa5f788dca767
+IPROUTE2_VERSION := 4.9.0
+IPROUTE2_MD5 := 44a8371a4b2c40e48e4c9f98cbd41391
IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (4 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] iproute2: bump version Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Clemens Gruber
` (7 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
projectroot/var/www/httpd.html | 2 ++
projectroot/var/www/thttpd.html | 2 ++
2 files changed, 4 insertions(+)
diff --git a/projectroot/var/www/httpd.html b/projectroot/var/www/httpd.html
index da6d138..ca5a7da 100644
--- a/projectroot/var/www/httpd.html
+++ b/projectroot/var/www/httpd.html
@@ -1,10 +1,12 @@
<HTML>
<HEAD><TITLE>Some httpd is running</TITLE></HEAD>
+<BODY>
<H3>Some httpd is running</H3>
<P>
Looks like you got it working. Congrats. \o/
+</P>
</BODY>
</HTML>
diff --git a/projectroot/var/www/thttpd.html b/projectroot/var/www/thttpd.html
index 28823a6..78d520e 100644
--- a/projectroot/var/www/thttpd.html
+++ b/projectroot/var/www/thttpd.html
@@ -7,9 +7,11 @@
<P>
Looks like you got it working. Congrats.
+</P>
<P>
Here's a link to the <A HREF="http://www.acme.com/software/thttpd/">thttpd web pages</A>.
+</P>
</BODY>
</HTML>
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (5 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:22 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] sqlite: bump version Clemens Gruber
` (6 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
...c-don-t-specify-hardcoded-include-search-.patch | 27 ----------------------
patches/rrdtool-1.4.9/autogen.sh | 1 -
patches/rrdtool-1.4.9/series | 4 ----
rules/rrdtool.in | 14 ++++++++---
rules/rrdtool.make | 10 +++++---
5 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
delete mode 120000 patches/rrdtool-1.4.9/autogen.sh
delete mode 100644 patches/rrdtool-1.4.9/series
diff --git a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
deleted file mode 100644
index 33dfd6f..0000000
--- a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Sat, 24 Jan 2015 20:57:27 +0100
-Subject: [PATCH] configure.ac: don't specify hardcoded include search path
-
-If we crosscompile rrdtool or packetize for a distribution, libxml2
-headers may be installed in a SYSROOT/DESTDIR directory, not in
-/usr/include. For the cross compile usecase, this leaks a host header
-file in.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e934595b102..793e02874d4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -540,7 +540,7 @@ EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h,
- EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "")
- EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
- fi
--EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2)
-+EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html)
-
- if test "$EX_CHECK_ALL_ERR" = "YES"; then
- AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/patches/rrdtool-1.4.9/autogen.sh b/patches/rrdtool-1.4.9/autogen.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/rrdtool-1.4.9/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
deleted file mode 100644
index 8f63465..0000000
--- a/patches/rrdtool-1.4.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
-# 4f69babc0b922fa5b09478ce957d196a - git-ptx-patches magic
diff --git a/rules/rrdtool.in b/rules/rrdtool.in
index d69d404..fa7e1de 100644
--- a/rules/rrdtool.in
+++ b/rules/rrdtool.in
@@ -8,9 +8,10 @@ menuconfig RRDTOOL
select CAIRO_PDF if RRDTOOL_RRD_GRAPH
select CAIRO_PS if RRDTOOL_RRD_GRAPH
select PANGO if RRDTOOL_RRD_GRAPH
- select LIBXML2
- select LIBXML2_SAX1
- select LIBXML2_READER
+ select LIBXML2 if RRDTOOL_RRD_RESTORE
+ select LIBXML2_SAX1 if RRDTOOL_RRD_RESTORE
+ select LIBXML2_READER if RRDTOOL_RRD_RESTORE
+
# for autotools only
select HOST_GETTEXT
prompt "rrdtool "
@@ -61,6 +62,13 @@ config RRDTOOL_RRDUPDATE
help
Store a new set of values into the RRD
+config RRDTOOL_RRD_RESTORE
+ bool
+ prompt "enable rrd restore"
+ help
+ rrd restore reads the XML representation of an RRD via libxml2
+ and converts it to the native RRD format.
+
config RRDTOOL_WRAP
bool
prompt "build in support for libwrap (tcp wrapper)"
diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 2e7e090..692a3d6 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RRDTOOL) += rrdtool
#
# Paths and names
#
-RRDTOOL_VERSION := 1.4.9
-RRDTOOL_MD5 := 1cea5a9efd6a48ac4035b0f9c7e336cf
+RRDTOOL_VERSION := 1.6.0
+RRDTOOL_MD5 := 4ff52cc44b935b02d2742e6875094da5
RRDTOOL := rrdtool-$(RRDTOOL_VERSION)
RRDTOOL_SUFFIX := tar.gz
RRDTOOL_URL := http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX)
@@ -40,14 +40,19 @@ RRDTOOL_CONF_ENV := \
RRDTOOL_CONF_TOOL := autoconf
RRDTOOL_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --disable-docs \
+ --disable-examples \
+ --$(call ptx/endis, PTXCONF_RRDTOOL_RRDCACHED)-rrdcached \
--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
--$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \
+ --$(call ptx/endis, PTXCONF_RRDTOOL_RRD_RESTORE)-rrd_restore \
--enable-mmap \
--enable-pthread \
--disable-static-programs \
--disable-nls \
--disable-rpath \
--disable-libdbi \
+ --disable-librados \
--$(call ptx/endis, PTXCONF_RRDTOOL_WRAP)-libwrap \
--disable-perl \
--disable-ruby \
@@ -88,7 +93,6 @@ ifdef PTXCONF_RRDTOOL_RRDUPDATE
endif
@$(call install_lib, rrdtool, 0, 0, 0644, librrd)
- @$(call install_lib, rrdtool, 0, 0, 0644, librrd_th)
@$(call install_finish, rrdtool)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular
2016-12-15 13:52 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Clemens Gruber
@ 2016-12-16 15:22 ` Michael Olbrich
0 siblings, 0 replies; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:22 UTC (permalink / raw)
To: ptxdist
On Thu, Dec 15, 2016 at 02:52:16PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> ...c-don-t-specify-hardcoded-include-search-.patch | 27 ----------------------
> patches/rrdtool-1.4.9/autogen.sh | 1 -
> patches/rrdtool-1.4.9/series | 4 ----
> rules/rrdtool.in | 14 ++++++++---
> rules/rrdtool.make | 10 +++++---
> 5 files changed, 18 insertions(+), 38 deletions(-)
> delete mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> delete mode 120000 patches/rrdtool-1.4.9/autogen.sh
> delete mode 100644 patches/rrdtool-1.4.9/series
>
> diff --git a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> deleted file mode 100644
> index 33dfd6f..0000000
> --- a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Sat, 24 Jan 2015 20:57:27 +0100
> -Subject: [PATCH] configure.ac: don't specify hardcoded include search path
> -
> -If we crosscompile rrdtool or packetize for a distribution, libxml2
> -headers may be installed in a SYSROOT/DESTDIR directory, not in
> -/usr/include. For the cross compile usecase, this leaks a host header
> -file in.
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 9e934595b102..793e02874d4b 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -540,7 +540,7 @@ EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h,
> - EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "")
> - EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
> - fi
> --EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2)
> -+EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html)
> -
> - if test "$EX_CHECK_ALL_ERR" = "YES"; then
> - AC_MSG_ERROR([Please fix the library issues listed above and try again.])
> diff --git a/patches/rrdtool-1.4.9/autogen.sh b/patches/rrdtool-1.4.9/autogen.sh
> deleted file mode 120000
> index 9f8a4cb..0000000
> --- a/patches/rrdtool-1.4.9/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
> deleted file mode 100644
> index 8f63465..0000000
> --- a/patches/rrdtool-1.4.9/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> -# 4f69babc0b922fa5b09478ce957d196a - git-ptx-patches magic
> diff --git a/rules/rrdtool.in b/rules/rrdtool.in
> index d69d404..fa7e1de 100644
> --- a/rules/rrdtool.in
> +++ b/rules/rrdtool.in
> @@ -8,9 +8,10 @@ menuconfig RRDTOOL
> select CAIRO_PDF if RRDTOOL_RRD_GRAPH
> select CAIRO_PS if RRDTOOL_RRD_GRAPH
> select PANGO if RRDTOOL_RRD_GRAPH
> - select LIBXML2
> - select LIBXML2_SAX1
> - select LIBXML2_READER
> + select LIBXML2 if RRDTOOL_RRD_RESTORE
> + select LIBXML2_SAX1 if RRDTOOL_RRD_RESTORE
> + select LIBXML2_READER if RRDTOOL_RRD_RESTORE
> +
> # for autotools only
> select HOST_GETTEXT
> prompt "rrdtool "
> @@ -61,6 +62,13 @@ config RRDTOOL_RRDUPDATE
> help
> Store a new set of values into the RRD
>
> +config RRDTOOL_RRD_RESTORE
> + bool
> + prompt "enable rrd restore"
> + help
> + rrd restore reads the XML representation of an RRD via libxml2
> + and converts it to the native RRD format.
> +
> config RRDTOOL_WRAP
> bool
> prompt "build in support for libwrap (tcp wrapper)"
> diff --git a/rules/rrdtool.make b/rules/rrdtool.make
> index 2e7e090..692a3d6 100644
> --- a/rules/rrdtool.make
> +++ b/rules/rrdtool.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RRDTOOL) += rrdtool
> #
> # Paths and names
> #
> -RRDTOOL_VERSION := 1.4.9
> -RRDTOOL_MD5 := 1cea5a9efd6a48ac4035b0f9c7e336cf
> +RRDTOOL_VERSION := 1.6.0
> +RRDTOOL_MD5 := 4ff52cc44b935b02d2742e6875094da5
> RRDTOOL := rrdtool-$(RRDTOOL_VERSION)
> RRDTOOL_SUFFIX := tar.gz
> RRDTOOL_URL := http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX)
> @@ -40,14 +40,19 @@ RRDTOOL_CONF_ENV := \
> RRDTOOL_CONF_TOOL := autoconf
> RRDTOOL_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + --disable-docs \
> + --disable-examples \
> + --$(call ptx/endis, PTXCONF_RRDTOOL_RRDCACHED)-rrdcached \
> --$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
> --$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \
> + --$(call ptx/endis, PTXCONF_RRDTOOL_RRD_RESTORE)-rrd_restore \
> --enable-mmap \
> --enable-pthread \
--enable-flock
Michael
> --disable-static-programs \
> --disable-nls \
> --disable-rpath \
> --disable-libdbi \
> + --disable-librados \
> --$(call ptx/endis, PTXCONF_RRDTOOL_WRAP)-libwrap \
> --disable-perl \
> --disable-ruby \
> @@ -88,7 +93,6 @@ ifdef PTXCONF_RRDTOOL_RRDUPDATE
> endif
>
> @$(call install_lib, rrdtool, 0, 0, 0644, librrd)
> - @$(call install_lib, rrdtool, 0, 0, 0644, librrd_th)
>
> @$(call install_finish, rrdtool)
>
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* [ptxdist] [PATCH] sqlite: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (6 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] systemd-bootchart: update to 231 Clemens Gruber
` (5 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/sqlite.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/sqlite.make b/rules/sqlite.make
index 1efd64d..e89a7ab 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite
#
# Paths and names
#
-SQLITE_VERSION := 3140100
-SQLITE_MD5 := 3634a90a3f49541462bcaed3474b2684
+SQLITE_VERSION := 3150200
+SQLITE_MD5 := 6b4fc0d8f7f02dd56bbde10a7c497a05
SQLITE := sqlite-autoconf-$(SQLITE_VERSION)
SQLITE_SUFFIX := tar.gz
SQLITE_URL := https://www.sqlite.org/2016/$(SQLITE).$(SQLITE_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] systemd-bootchart: update to 231
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (7 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] sqlite: bump version Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
` (4 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Also add LICENSE types and hashes.
Signed-off-by: Clemens Gruber <clemens.gruber@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.1998@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.1998@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.kok@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.kok@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.olbrich@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.olbrich@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
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] tmux: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (8 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] systemd-bootchart: update to 231 Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:25 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] u-boot-tools: " Clemens Gruber
` (3 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/tmux.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/tmux.make b/rules/tmux.make
index 39447e5..2908f67 100644
--- a/rules/tmux.make
+++ b/rules/tmux.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TMUX) += tmux
#
# Paths and names
#
-TMUX_VERSION := 1.9a
-TMUX_MD5 := b07601711f96f1d260b390513b509a2d
+TMUX_VERSION := 2.3
+TMUX_MD5 := fcfd1611d705d8b31df3c26ebc93bd3e
TMUX := tmux-$(TMUX_VERSION)
TMUX_SUFFIX := tar.gz
TMUX_URL := https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)/$(TMUX).$(TMUX_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] tmux: bump version
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
@ 2016-12-16 15:25 ` Michael Olbrich
0 siblings, 0 replies; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:25 UTC (permalink / raw)
To: ptxdist
Configure options!
Michael
On Thu, Dec 15, 2016 at 02:52:19PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> rules/tmux.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/tmux.make b/rules/tmux.make
> index 39447e5..2908f67 100644
> --- a/rules/tmux.make
> +++ b/rules/tmux.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TMUX) += tmux
> #
> # Paths and names
> #
> -TMUX_VERSION := 1.9a
> -TMUX_MD5 := b07601711f96f1d260b390513b509a2d
> +TMUX_VERSION := 2.3
> +TMUX_MD5 := fcfd1611d705d8b31df3c26ebc93bd3e
> TMUX := tmux-$(TMUX_VERSION)
> TMUX_SUFFIX := tar.gz
> TMUX_URL := https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)/$(TMUX).$(TMUX_SUFFIX)
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* [ptxdist] [PATCH] u-boot-tools: bump version
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (9 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Clemens Gruber
` (2 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/u-boot-tools.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 898ce84..72b7792 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
#
# Paths and names
#
-U_BOOT_TOOLS_VERSION := 2016.07
-U_BOOT_TOOLS_MD5 := 425a3fa610a7d972e5092a0e92276c70
+U_BOOT_TOOLS_VERSION := 2016.11
+U_BOOT_TOOLS_MD5 := ca1f6e019d08aff8d0ca1beb2e66737d
U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
U_BOOT_TOOLS_SUFFIX := tar.bz2
U_BOOT_TOOLS_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (10 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] u-boot-tools: " Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:30 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] picocom: update to version 2.2 Clemens Gruber
2016-12-16 15:53 ` [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Michael Olbrich
13 siblings, 1 reply; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Using sed instead of basename allows us to keep the _URL line as is, for
both the two- and three-part version numbers and not switch between
using and not using the basename command every release.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-__progname-redefinition-fix.patch | 0
patches/{util-linux-2.28.2 => util-linux-2.29}/series | 0
rules/util-linux-ng.make | 11 +++++++----
3 files changed, 7 insertions(+), 4 deletions(-)
rename patches/{util-linux-2.28.2 => util-linux-2.29}/0001-__progname-redefinition-fix.patch (100%)
rename patches/{util-linux-2.28.2 => util-linux-2.29}/series (100%)
diff --git a/patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.28.2/series b/patches/util-linux-2.29/series
similarity index 100%
rename from patches/util-linux-2.28.2/series
rename to patches/util-linux-2.29/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index e1c86c2..44cc04e 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,11 +17,12 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
#
# Paths and names
#
-UTIL_LINUX_NG_VERSION := 2.28.2
-UTIL_LINUX_NG_MD5 := 46a232a37bce45371a86d19300edc47a
+UTIL_LINUX_NG_VERSION := 2.29
+UTIL_LINUX_NG_MD5 := 07b6845f48a421ad5844aa9d58edb837
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
-UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v$(basename $(UTIL_LINUX_NG_VERSION))/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
+UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
+UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
UTIL_LINUX_NG_LICENSE := GPL-2.0, GPL-2.0+, GPL-3.0+, LGPL-2.0+, BSD-3-Clause, BSD-4-Clause, public_domain
@@ -59,10 +60,10 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-static-programs \
--enable-all-programs=undefined \
--enable-tls \
+ --disable-widechar \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
- --enable-libmount-force-mountinfo \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
@@ -78,6 +79,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-setpriv \
--disable-eject \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
+ --disable-plymouth_support \
--disable-cramfs \
--disable-bfs \
--disable-minix \
@@ -132,6 +134,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--without-audit \
--without-udev \
--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
+ --without-ncursesw \
--without-slang \
--without-tinfo \
--without-readline \
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction
2016-12-15 13:52 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Clemens Gruber
@ 2016-12-16 15:30 ` Michael Olbrich
0 siblings, 0 replies; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:30 UTC (permalink / raw)
To: ptxdist
On Thu, Dec 15, 2016 at 02:52:21PM +0100, Clemens Gruber wrote:
> Using sed instead of basename allows us to keep the _URL line as is, for
> both the two- and three-part version numbers and not switch between
> using and not using the basename command every release.
>
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> .../0001-__progname-redefinition-fix.patch | 0
> patches/{util-linux-2.28.2 => util-linux-2.29}/series | 0
> rules/util-linux-ng.make | 11 +++++++----
> 3 files changed, 7 insertions(+), 4 deletions(-)
> rename patches/{util-linux-2.28.2 => util-linux-2.29}/0001-__progname-redefinition-fix.patch (100%)
> rename patches/{util-linux-2.28.2 => util-linux-2.29}/series (100%)
>
> diff --git a/patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
> similarity index 100%
> rename from patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch
> rename to patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
> diff --git a/patches/util-linux-2.28.2/series b/patches/util-linux-2.29/series
> similarity index 100%
> rename from patches/util-linux-2.28.2/series
> rename to patches/util-linux-2.29/series
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index e1c86c2..44cc04e 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -17,11 +17,12 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
> #
> # Paths and names
> #
> -UTIL_LINUX_NG_VERSION := 2.28.2
> -UTIL_LINUX_NG_MD5 := 46a232a37bce45371a86d19300edc47a
> +UTIL_LINUX_NG_VERSION := 2.29
> +UTIL_LINUX_NG_MD5 := 07b6845f48a421ad5844aa9d58edb837
> UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
> UTIL_LINUX_NG_SUFFIX := tar.xz
> -UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v$(basename $(UTIL_LINUX_NG_VERSION))/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
> +UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
> +UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
> UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
> UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
> UTIL_LINUX_NG_LICENSE := GPL-2.0, GPL-2.0+, GPL-3.0+, LGPL-2.0+, BSD-3-Clause, BSD-4-Clause, public_domain
> @@ -59,10 +60,10 @@ UTIL_LINUX_NG_CONF_OPT := \
> --disable-static-programs \
> --enable-all-programs=undefined \
> --enable-tls \
> + --disable-widechar \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
> - --enable-libmount-force-mountinfo \
--disable-libmount-support-mtab
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
> @@ -78,6 +79,7 @@ UTIL_LINUX_NG_CONF_OPT := \
> --disable-setpriv \
> --disable-eject \
> --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
> + --disable-plymouth_support \
> --disable-cramfs \
> --disable-bfs \
> --disable-minix \
--disable-pg
> @@ -132,6 +134,7 @@ UTIL_LINUX_NG_CONF_OPT := \
> --without-audit \
> --without-udev \
> --$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
> + --without-ncursesw \
order!
Michael
> --without-slang \
> --without-tinfo \
> --without-readline \
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread
* [ptxdist] [PATCH] picocom: update to version 2.2
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (11 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Clemens Gruber
@ 2016-12-15 13:52 ` Clemens Gruber
2016-12-16 15:53 ` [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Michael Olbrich
13 siblings, 0 replies; 23+ messages in thread
From: Clemens Gruber @ 2016-12-15 13:52 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/picocom.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/picocom.make b/rules/picocom.make
index e40846a..565e204 100644
--- a/rules/picocom.make
+++ b/rules/picocom.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_PICOCOM) += picocom
#
# Paths and names
#
-PICOCOM_VERSION := 1.7
-PICOCOM_MD5 := 8eaba1d31407e8408674d6e57af447ef
+PICOCOM_VERSION := 2.2
+PICOCOM_MD5 := 65da5cd32f8cfa456bbe79bbcc908daf
PICOCOM := picocom-$(PICOCOM_VERSION)
PICOCOM_SUFFIX := tar.gz
-PICOCOM_URL := https://picocom.googlecode.com/files//$(PICOCOM).$(PICOCOM_SUFFIX)
-PICOCOM_SOURCE := $(SRCDIR)/$(PICOCOM).$(PICOCOM_SUFFIX)
+PICOCOM_URL := https://github.com/npat-efault/picocom/archive/$(PICOCOM_VERSION).$(PICOCOM_SUFFIX)
+PICOCOM_SOURCE := $(SRCDIR)/$(PICOCOM_VERSION).$(PICOCOM_SUFFIX)
PICOCOM_DIR := $(BUILDDIR)/$(PICOCOM)
PICOCOM_LICENSE := GPL-2.0+
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
` (12 preceding siblings ...)
2016-12-15 13:52 ` [ptxdist] [PATCH] picocom: update to version 2.2 Clemens Gruber
@ 2016-12-16 15:53 ` Michael Olbrich
13 siblings, 0 replies; 23+ messages in thread
From: Michael Olbrich @ 2016-12-16 15:53 UTC (permalink / raw)
To: ptxdist
On Thu, Dec 15, 2016 at 02:52:09PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> projectroot/etc/collectd.d/sensors.conf | 1 +
> rules/collectd.in | 9 +++++++-
> rules/collectd.make | 39 +++++++++++++++++++++++++++------
> 3 files changed, 41 insertions(+), 8 deletions(-)
> create mode 100644 projectroot/etc/collectd.d/sensors.conf
>
> diff --git a/projectroot/etc/collectd.d/sensors.conf b/projectroot/etc/collectd.d/sensors.conf
> new file mode 100644
> index 0000000..2dc3ffe
> --- /dev/null
> +++ b/projectroot/etc/collectd.d/sensors.conf
> @@ -0,0 +1 @@
> +LoadPlugin sensors
> diff --git a/rules/collectd.in b/rules/collectd.in
> index bff2cb5..ba359f0 100644
> --- a/rules/collectd.in
> +++ b/rules/collectd.in
> @@ -2,7 +2,8 @@
>
> menuconfig COLLECTD
> tristate
> - select RRDTOOL if COLLECTD_RRDTOOL
> + select RRDTOOL if COLLECTD_RRDTOOL
> + select LM_SENSORS if COLLECTD_SENSORS
> prompt "collectd "
> help
> collectd is a daemon which collects system performance statistics
> @@ -43,4 +44,10 @@ config COLLECTD_CPU
> The CPU plugin collects data about what your CPU is actually doing,
> and if it is being idle or in the various states.
>
> +config COLLECTD_SENSORS
> + bool
> + prompt "sensors"
> + help
> + The Sensors plugin uses lm-sensors to read hardware sensors.
> +
> endif
> diff --git a/rules/collectd.make b/rules/collectd.make
> index 2ef50e7..61f3dca 100644
> --- a/rules/collectd.make
> +++ b/rules/collectd.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_COLLECTD) += collectd
> #
> # Paths and names
> #
> -COLLECTD_VERSION := 5.4.1
> +COLLECTD_VERSION := 5.7.0
> COLLECTD := collectd-$(COLLECTD_VERSION)
> COLLECTD_SUFFIX := tar.bz2
> COLLECTD_URL := http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
> -COLLECTD_MD5 := 6f56c71c96573a7f4f7fb3bfab185974
> +COLLECTD_MD5 := c5cbe74a5638cac793caa13b3df60ce1
> COLLECTD_DIR := $(BUILDDIR)/$(COLLECTD)
> COLLECTD_SOURCE := $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
> COLLECTD_LICENSE := GPL2
> @@ -33,6 +33,7 @@ COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE) += logfile
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG) += syslog
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL) += rrdtool
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU) += cpu
> +COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SENSORS) += sensors
>
> # 'noyywrap' is set, so no lex library is needed
> COLLECTD_CONF_ENV := \
> @@ -46,8 +47,8 @@ COLLECTD_CONF_TOOL := autoconf
> COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --disable-standards \
> - --disable-glibtest \
> --disable-debug \
> + --disable-xfs \
Wrong order.
And add the --disable-werror. Warnings are often compiler version and
architecture specific.
Michael
> --enable-daemon \
> --disable-getifaddrs \
> --disable-all-plugins \
> @@ -62,20 +63,26 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-apple_sensors \
> --disable-aquaero \
> --disable-ascent \
> + --disable-barometer \
> --disable-battery \
> --disable-bind \
> + --disable-ceph \
> + --disable-cgroups \
> + --disable-chrony \
> --disable-conntrack \
> --disable-contextswitch \
> --disable-cpufreq \
> + --disable-cpusleep \
> --disable-csv \
> --disable-curl \
> --disable-curl_json \
> --disable-curl_xml \
> - --disable-cgroups \
> --disable-dbi \
> --disable-df \
> --disable-disk \
> --disable-dns \
> + --disable-dpdkstat \
> + --disable-drbd \
> --disable-email \
> --disable-entropy \
> --disable-ethstat \
> @@ -83,16 +90,22 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-filecount \
> --disable-fscache \
> --disable-gmond \
> + --disable-gps \
> + --disable-grpc \
> --disable-hddtemp \
> + --disable-hugepages \
> + --disable-intel_rdt \
> --disable-interface \
> + --disable-ipc \
> --disable-ipmi \
> --disable-iptables \
> --disable-ipvs \
> --disable-irq \
> --disable-java \
> - --disable-libvirt \
> --disable-load \
> + --disable-log_logstash \
> --disable-lpar \
> + --disable-lua \
> --disable-lvm \
> --disable-madwifi \
> --disable-match_empty_counter \
> @@ -107,6 +120,7 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-memory \
> --disable-mic \
> --disable-modbus \
> + --disable-mqtt \
> --disable-multimeter \
> --disable-mysql \
> --disable-netapp \
> @@ -116,11 +130,13 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-nginx \
> --disable-notify_desktop \
> --disable-notify_email \
> + --disable-notify_nagios \
> --disable-ntpd \
> --disable-numa \
> --disable-nut \
> --disable-olsrd \
> --disable-onewire \
> + --disable-openldap \
> --disable-openvpn \
> --disable-oracle \
> --disable-perl \
> @@ -135,9 +151,9 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-redis \
> --disable-routeros \
> --disable-rrdcached \
> - --disable-sensors \
> --disable-serial \
> --disable-sigrok \
> + --disable-smart \
> --disable-snmp \
> --disable-statsd \
> --disable-swap \
> @@ -156,21 +172,31 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-thermal \
> --disable-threshold \
> --disable-tokyotyrant \
> + --disable-turbostat \
> --disable-unixsock \
> --disable-uptime \
> --disable-users \
> --disable-uuid \
> --disable-varnish \
> + --disable-virt \
> --disable-vmem \
> --disable-vserver \
> --disable-wireless \
> --disable-write_graphite \
> --disable-write_http \
> + --disable-write_kafka \
> --disable-write_mongodb \
> + --disable-write_prometheus \
> --disable-write_redis \
> --disable-write_riemann \
> + --disable-write_sensu \
> + --disable-write_tsdb \
> + --disable-xencpu \
> --disable-xmms \
> --disable-zfs_arc \
> + --disable-zone \
> + --disable-zonekeeper \
Here is a typo and there are some plugins missing. Please update this list
by filtering the output from ./configure --help.
This is currectly a bit awkward with the optional plugins above.
Maybe list them all above and use
COLLECTD_ENABLE- += <plugin>
for the unconditional plugins? The way things are, we are currently likely
to forget some for each update.
Something like this can be generated for all options and then merged with
the existing listing.
Michael
> + --without-libdpdk \
> --without-perl-bindings
>
> ifneq ($(call remove_quotes,$(COLLECTD_ENABLE-y)),)
> @@ -198,7 +224,6 @@ $(STATEDIR)/collectd.targetinstall:
> @$(call install_lib, collectd, 0, 0, 0644, libcollectdclient)
> @$(call install_copy, collectd, 0, 0, 0755, -, /usr/sbin/collectd)
> @$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.conf)
> - @$(call install_copy, collectd, 0, 0, 0644, /etc/collectd)
> @$(call install_copy, collectd, 0, 0, 0644, -, /usr/share/collectd/types.db)
> @$(call install_copy, collectd, 0, 0, 0755, /usr/lib/collectd)
>
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 23+ messages in thread