[ptxdist] [PATCH 18/18] netperf: new package
Signed-off-by: Clemens Gruber --- patches/netperf-2.7.0/0001-fix-inlining.patch | 46 patches/netperf-2.7.0/series | 4 ++ rules/netperf.in | 9 rules/netperf.make| 75 +++ 4 files changed, 134 insertions(+) create mode 100644 patches/netperf-2.7.0/0001-fix-inlining.patch create mode 100644 patches/netperf-2.7.0/series create mode 100644 rules/netperf.in create mode 100644 rules/netperf.make diff --git a/patches/netperf-2.7.0/0001-fix-inlining.patch b/patches/netperf-2.7.0/0001-fix-inlining.patch new file mode 100644 index 0..1e6689da7 --- /dev/null +++ b/patches/netperf-2.7.0/0001-fix-inlining.patch @@ -0,0 +1,46 @@ +From 68cfbafb9f239950065e6a0ed7ca60c12668740f Mon Sep 17 00:00:00 2001 +From: Clemens Gruber +Date: Thu, 15 Dec 2016 16:14:01 +0100 +Subject: [PATCH] fix inlining + +Signed-off-by: Clemens Gruber +--- + src/netlib.c | 14 +- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/src/netlib.c b/src/netlib.c +index f3a3fe5e00ab..4465d0f1b5f3 100644 +--- a/src/netlib.c b/src/netlib.c +@@ -3997,11 +3997,7 @@ void demo_stream_setup(uint32_t a, uint32_t b) { + } + } + +-#ifdef WIN32 +-__forceinline void demo_interval_display(double actual_interval) +-#else +- inline void demo_interval_display(double actual_interval) +-#endif ++void demo_interval_display(double actual_interval) + { + static int count = 0; + struct timeval now; +@@ -4060,15 +4056,7 @@ __forceinline void demo_interval_display(double actual_interval) +important compilers have supported such a construct so it should +not be a big deal. raj 2012-01-23 */ + +-#ifdef WIN32 +-/* It would seem that the Microsoft compiler will not inline across +- source files. So there is little point in having an inline +- directive in that situation. Of course that makes me wonder if an +- inline directive has to appear in netlib.h... */ + void demo_interval_tick(uint32_t units) +-#else +- inline void demo_interval_tick(uint32_t units) +-#endif + { + double actual_interval = 0.0; + +-- +2.10.2 + diff --git a/patches/netperf-2.7.0/series b/patches/netperf-2.7.0/series new file mode 100644 index 0..54488afdf --- /dev/null +++ b/patches/netperf-2.7.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-inlining.patch +# ce464498af68ff457cdb324c32f1c72b - git-ptx-patches magic diff --git a/rules/netperf.in b/rules/netperf.in new file mode 100644 index 0..893852696 --- /dev/null +++ b/rules/netperf.in @@ -0,0 +1,9 @@ +## SECTION=networking + +config NETPERF + bool + prompt "netperf" + select LIBC_M + help + netperf is a benchmark that can be used to measure the + performance of many different types of networking. diff --git a/rules/netperf.make b/rules/netperf.make new file mode 100644 index 0..a317fe529 --- /dev/null +++ b/rules/netperf.make @@ -0,0 +1,75 @@ +# -*-makefile-*- +# +# Copyright (C) 2016 by Clemens Gruber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_NETPERF) += netperf + +# +# Paths and names +# +NETPERF_VERSION:= 2.7.0 +NETPERF_MD5:= ad1c5342d61f297c417a93133aeba65a +NETPERF:= netperf-$(NETPERF_VERSION) +NETPERF_SUFFIX := tar.bz2 +NETPERF_URL:= ftp://ftp.netperf.org/netperf/$(NETPERF).$(NETPERF_SUFFIX) +NETPERF_SOURCE := $(SRCDIR)/$(NETPERF).$(NETPERF_SUFFIX) +NETPERF_DIR:= $(BUILDDIR)/$(NETPERF) +NETPERF_LICENSE:= HP + +# +# Prepare +# + +# +# autoconf +# +NETPERF_CONF_TOOL := autoconf +NETPERF_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-histogram \ + --disable-dirty \ + --enable-demo \ + --disable-unixdomain \ + --disable-dlpi \ + --disable-dccp \ + --enable-omni \ + --disable-xti \ + --disable-sdp \ + --disable-exs \ + --disable-sctp \ + --disable-intervals \ + --disable-spin \ + --enable-burst \ + --enable-cpuutil=procstat + +# +# Target-Install +# + +$(STATEDIR)/netperf.targetinstall: + @$(call targetinfo) + + @$(call install_init, netperf) + @$(call install_fixup, netperf, PRIORITY, optional) + @$(call install_fixup, netperf, SECTION, base) + @$(call install_fixup, netperf, AUTHOR, "Clemens Gruber ") + @$(call install_fixup, n
[ptxdist] [PATCH 17/18] libgcrypt: update 1.7.3 -> 1.7.5
Also add configure options explicitly. Signed-off-by: Clemens Gruber --- rules/libgcrypt.make | 30 +- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index 4ffe6bcee..96768f9a8 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt # # Paths and names # -LIBGCRYPT_VERSION := 1.7.3 -LIBGCRYPT_MD5 := c869e542cc13a1c28d8055487bf7f5c4 +LIBGCRYPT_VERSION := 1.7.5 +LIBGCRYPT_MD5 := 74c8b4b2118946dcbfec5ff1cbf97177 LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SUFFIX := tar.bz2 LIBGCRYPT_URL := http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) @@ -38,12 +38,32 @@ LIBGCRYPT_LICENSE_FILES := \ # LIBGCRYPT_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --enable-build-timestamp="$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01T00:00+" \ - --enable-optimization \ + --disable-static \ + --enable-shared \ + --enable-random=linux \ + --enable-dev-random \ --disable-random-daemon \ --disable-asm \ + --disable-m-guard \ --disable-large-data-tests \ - --disable-doc + --disable-hmac-binary-check \ + --disable-padlock-support \ + --disable-aesni-support \ + --disable-pclmul-support \ + --disable-sse41-support \ + --disable-drng-support \ + --disable-avx-support \ + --disable-avx2-support \ + --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-neon-support \ + --disable-arm-crypto-support \ + --enable-O-flag-munging \ + --disable-amd64-as-feature-detection \ + --enable-optimization \ + --enable-noexecstack \ + --disable-doc \ + --enable-build-timestamp="$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01T00:00+" \ + --without-capabilities + # # ASM needs MPI, which we don't have # -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 16/18] picocom: bump version 1.7 -> 2.2
Signed-off-by: Clemens Gruber --- rules/picocom.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/picocom.make b/rules/picocom.make index e40846aba..565e20438 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.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 15/18] util-linux-ng: update 2.28.2 -> 2.29 and fix URL deduction
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. Also add configure options explicitly, fix mistakes and add missing options. Signed-off-by: Clemens Gruber fixup util-linux --- .../0001-__progname-redefinition-fix.patch | 0 .../{util-linux-2.28.2 => util-linux-2.29}/series | 0 rules/util-linux-ng.make | 23 +++--- 3 files changed, 16 insertions(+), 7 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 e1c86c202..49184a9b0 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,15 +60,16 @@ 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 \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \ - --disable-zramctl \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_ZRAMCTL)-zramctl \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_UUIDD)-uuidd \ @@ -78,15 +80,20 @@ 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-fdformat \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_HWCLOCK)-hwclock \ + --disable-lslogins \ --disable-wdctl \ --disable-cal \ + --disable-logger \ --disable-switch_root \ --disable-pivot_root \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCS)-ipcs \ --disable-tunelp \ --disable-kill \ --disable-last \ @@ -110,12 +117,11 @@ UTIL_LINUX_NG_CONF_OPT:= \ --disable-runuser \ --disable-ul \ --disable-more \ - --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SETTERM)-setterm \ --disable-pg \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SETTERM)-setterm \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SCHEDUTILS)-schedutils \ --disable-wall \ --disable-write \ - --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_ZRAMCTL)-zramctl \ --disable-bash-completion \ --disable-pylibmount \ --disable-pg-bell \ @@ -131,13 +137,16 @@ UTIL_LINUX_NG_CONF_OPT:= \ --without-selinux \ --without-audit \ --without-udev \ + --without-ncurse
[ptxdist] [PATCH 13/18] tmux: update 1.9a -> 2.3
Also add configure options explicitly. Signed-off-by: Clemens Gruber --- rules/tmux.make | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rules/tmux.make b/rules/tmux.make index 39447e5c1..7e4c1f402 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) @@ -33,6 +33,14 @@ TMUX_LICENSE := BSD # autoconf # TMUX_CONF_TOOL := autoconf +TMUX_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-debug \ + --disable-coverage \ + --disable-profile \ + --disable-static \ + --disable-utempter \ + --disable-utf8proc # # Target-Install -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 14/18] u-boot-tools: bump version 2016.07 -> 2016.11
Signed-off-by: Clemens Gruber --- 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 898ce84bd..72b77924b 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.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 12/18] systemd-bootchart: bump version 230 -> 231
Also add LICENSE types and hashes. Signed-off-by: Clemens Gruber --- ...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 12 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 2c2c9d408..0 --- 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 -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" - 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 2d5f2dc2c..0 --- 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 -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 0a3505875..0 --- 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 -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
[ptxdist] [PATCH 10/18] rrdtool: update 1.4.9 -> 1.6.0 and make more modular
Only depend on libxml2 if rrd_restore is enabled and add missing configure options explicitly. Signed-off-by: Clemens Gruber --- ...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 | 11 ++--- 5 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch delete mode 12 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 33dfd6fbd..0 --- 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 -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 - 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 12 index 9f8a4cb7d..0 --- 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 8f63465b1..0 --- 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 d69d404f9..fa7e1de1c 100644 --- a/rules/rrdtool.in +++ b/rules/rrdtool.in @@ -8,9 +8,10 @@ menuconfig RRDTOOL select CAIRO_PDFif RRDTOOL_RRD_GRAPH select CAIRO_PS if RRDTOOL_RRD_GRAPH select PANGOif 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 2e7e09059..2c7453811 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,20 @@ RRDTOOL_CONF_ENV:= \ RRDTOOL_CONF_TOOL := autoconf RRDTOOL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --disable-docs \ + --disable-examples \ + -
[ptxdist] [PATCH 11/18] sqlite: update 3.14.1 -> 3.15.2
Set configure options explicitly and set all defines to 1. Enable a common option to allow AND, NOT and nested parenthesis in FTS3/4 queries. Dynamically link libsqlite3 to sqlite3 shell tool to save space. Signed-off-by: Clemens Gruber --- rules/sqlite.make | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/rules/sqlite.make b/rules/sqlite.make index 1efd64d30..90dd89d68 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) @@ -37,11 +37,12 @@ SQLITE_LICENSE := public_domain SQLITE_CONF_ENV := \ $(CROSS_ENV) \ CPPFLAGS=" \ - -DSQLITE_ENABLE_COLUMN_METADATA \ - -DSQLITE_ENABLE_FTS4 \ - -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_COLUMN_METADATA=1 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \ + -DSQLITE_ENABLE_FTS4=1 \ + -DSQLITE_ENABLE_JSON1=1 \ -DSQLITE_ENABLE_RTREE=1 \ - -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \ -DSQLITE_SOUNDEX=1 \ " @@ -50,9 +51,14 @@ SQLITE_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-static \ + --disable-editline \ --$(call ptx/endis,PTXCONF_SQLITE_READLINE)-readline \ --$(call ptx/endis,PTXCONF_SQLITE_THREADSAFE)-threadsafe \ - --$(call ptx/endis,PTXCONF_SQLITE_LOAD_EXTENTION)-dynamic-extensions + --$(call ptx/endis,PTXCONF_SQLITE_LOAD_EXTENTION)-dynamic-extensions \ + --disable-fts5 \ + --enable-json1 \ + --disable-session \ + --disable-static-shell # # Target-Install -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/18] iproute2: update 4.8.0 -> 4.9.0
Our workaround for the iptables dependency problem is no longer necessary due to the new option TC_CONFIG_NO_XT. Signed-off-by: Clemens Gruber --- .../0001-add-xtables-version.h.patch | 22 -- patches/iproute2-4.8.0/series | 1 - rules/iproute2.make| 7 +++ 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 patches/iproute2-4.8.0/0001-add-xtables-version.h.patch delete mode 100644 patches/iproute2-4.8.0/series diff --git a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch b/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch deleted file mode 100644 index fe9ba7ac0..0 --- a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4d90bfff717bd7be913832c7eaefd5b5f7408012 Mon Sep 17 00:00:00 2001 -From: Clemens Gruber -Date: Mon, 17 Oct 2016 17:06:20 +0200 -Subject: [PATCH] add xtables-version.h - -Signed-off-by: Clemens Gruber - include/xtables-version.h | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 include/xtables-version.h - -diff --git a/include/xtables-version.h b/include/xtables-version.h -new file mode 100644 -index ..905e5fe070e7 /dev/null -+++ b/include/xtables-version.h -@@ -0,0 +1,2 @@ -+#define XTABLES_VERSION "libxtables.so.11" -+#define XTABLES_VERSION_CODE 11 --- -2.10.0 - diff --git a/patches/iproute2-4.8.0/series b/patches/iproute2-4.8.0/series deleted file mode 100644 index b705ae7cf..0 --- a/patches/iproute2-4.8.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-add-xtables-version.h.patch diff --git a/rules/iproute2.make b/rules/iproute2.make index 674894c40..946247c3d 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)) @@ -38,8 +38,7 @@ $(STATEDIR)/iproute2.prepare: @$(call world/prepare, IPROUTE2) # overwrite options we don't want, or may be misdetected @echo 'TC_CONFIG_ATM:=n'>> $(IPROUTE2_DIR)/Config - @echo 'TC_CONFIG_XT:=n' >> $(IPROUTE2_DIR)/Config - @echo 'IPT_LIB_DIR:=/usr/lib' >> $(IPROUTE2_DIR)/Config + @echo 'TC_CONFIG_NO_XT:=y' >> $(IPROUTE2_DIR)/Config @echo 'TC_CONFIG_ELF:=n'>> $(IPROUTE2_DIR)/Config ifndef PTXCONF_GLOBAL_SELINUX @echo 'HAVE_SELINUX:=n' >> $(IPROUTE2_DIR)/Config -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 09/18] projectroot: Fix HTML syntax in examples
Signed-off-by: Clemens Gruber --- 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 da6d138c0..ca5a7dab6 100644 --- a/projectroot/var/www/httpd.html +++ b/projectroot/var/www/httpd.html @@ -1,10 +1,12 @@ Some httpd is running + Some httpd is running Looks like you got it working. Congrats. \o/ + diff --git a/projectroot/var/www/thttpd.html b/projectroot/var/www/thttpd.html index 28823a614..78d520e93 100644 --- a/projectroot/var/www/thttpd.html +++ b/projectroot/var/www/thttpd.html @@ -7,9 +7,11 @@ Looks like you got it working. Congrats. + Here's a link to the http://www.acme.com/software/thttpd/";>thttpd web pages. + -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/18] iperf: update 2.0.5 -> 2.0.9
Add configure options explicitly and switch from the deprecated SF project iperf to the maintained SF project iperf2. Signed-off-by: Clemens Gruber --- patches/iperf-2.0.5/fix_early_termination.diff | 47 -- patches/iperf-2.0.5/series | 1 - rules/iperf.make | 13 --- 3 files changed, 9 insertions(+), 52 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 f24dec727..0 --- 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 - - 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 c490ac05d..0 --- 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 8f73dfcf2..99b4f00e2 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 @@ -37,7 +37,12 @@ IPERF_ENV:= $(CROSS_ENV) # IPERF_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_IPV6_OPTION) + $(GLOBAL_IPV6_OPTION) \ + --disable-multicast \ + --enable-threads \ + --disable-debuginfo \ + --disable-web100 \ + --enable-kalman # # Target-Install -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/18] glib: bump version 2.50.1 -> 2.50.2
Signed-off-by: Clemens Gruber --- rules/glib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glib.make b/rules/glib.make index 8a53b24fc..e4a986efa 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.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/18] dbus: bump version 1.10.10 -> 1.10.14
Signed-off-by: Clemens Gruber --- rules/dbus.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/dbus.make b/rules/dbus.make index 5893011a9..3562ffbd6 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.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 05/18] file: update 5.24 -> 5.29
The configure options are set explicitly. Signed-off-by: Clemens Gruber --- rules/file.make | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rules/file.make b/rules/file.make index 257e1bb9c..c3aaae554 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) @@ -30,7 +30,15 @@ FILE_LICENSE := BSD, 2-term BSD # FILE_PATH := PATH=$(PTXDIST_SYSROOT_HOST)/bin/file:$(CROSS_PATH) + FILE_CONF_TOOL := autoconf +FILE_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --enable-elf \ + --enable-elf-core \ + --enable-zlib \ + --disable-fsect-man5 \ + $(GLOBAL_LARGE_FILE_OPTION) # # Target-Install -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/18] nettle: update 2.7.1 -> 3.3
Also reorder configure options as they are in the help output. Signed-off-by: Clemens Gruber --- rules/nettle.in | 1 - rules/nettle.make | 13 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rules/nettle.in b/rules/nettle.in index 9ec8429cb..fcacb963f 100644 --- a/rules/nettle.in +++ b/rules/nettle.in @@ -2,7 +2,6 @@ config NETTLE tristate - select LIBGMP prompt "nettle" help Nettle is a cryptographic library. diff --git a/rules/nettle.make b/rules/nettle.make index dae19bd94..721f75315 100644 --- a/rules/nettle.make +++ b/rules/nettle.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle # # Paths and names # -NETTLE_VERSION := 2.7.1 -NETTLE_MD5 := 003d5147911317931dd453520eb234a5 +NETTLE_VERSION := 3.3 +NETTLE_MD5 := 10f969f78a463704ae73529978148dbe NETTLE := nettle-$(NETTLE_VERSION) NETTLE_SUFFIX := tar.gz NETTLE_URL := http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX) @@ -36,13 +36,18 @@ NETTLE_MAKE_PAR := NO NETTLE_CONF_TOOL := autoconf NETTLE_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ - --enable-static \ --enable-public-key \ --enable-assembler \ + --enable-static \ + --enable-shared \ + --enable-pic \ --disable-openssl \ --disable-gcov \ --disable-documentation \ - --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon + --disable-fat \ + --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon \ + --disable-x86-aesni \ + --enable-mini-gmp # # Target-Install -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/18] iputils: update s20121221 -> s20161105
The current version of iputils ping can handle IPv4 and IPv6 and does not need the big GnuTLS/libgcrypt/.. dependency. tracepath can also handle both v4 and v6. Signed-off-by: Clemens Gruber --- rules/iputils.in | 41 +++-- rules/iputils.make | 12 +--- 2 files changed, 16 insertions(+), 37 deletions(-) diff --git a/rules/iputils.in b/rules/iputils.in index 99105f75f..4a842a66b 100644 --- a/rules/iputils.in +++ b/rules/iputils.in @@ -3,10 +3,9 @@ menuconfig IPUTILS tristate prompt "iputils " - select LIBC_RESOLV if IPUTILS_PING6 - select LIBCAP if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_PING6 || IPUTILS_TRACEROUTE6 || IPUTILS_CLOCKDIFF - select GNUTLS if IPUTILS_PING6 - select GNUTLS_OPENSSL if IPUTILS_PING6 + select LIBC_RESOLV if IPUTILS_PING + select LIBCAP if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_TRACEROUTE6 || IPUTILS_CLOCKDIFF + select NETTLE if IPUTILS_PING help The iputils package is set of small useful utilities for Linux networking. @@ -35,12 +34,12 @@ config IPUTILS_PING bool depends on (!BUSYBOX_PING && !INETUTILS_PING) || ALLYES prompt "ping" + depends on GLOBAL_IPV6 help - The ping command uses the ICMP protocol's mandatory ECHO_REQUEST datagram - to elicit an ICMP ECHO_RESPONSE from a host or gateway. ECHO_REQUEST - datagrams pings have an IP and ICMP header, followed by a struct - timeval and then an arbitrary number of pad bytes used to fill out - the packet. + ping uses the ICMP protocols mandatory ECHO_REQUEST datagram to elicit + an ICMP ECHO_RESPONSE from a host or gateway. + It works with both IPv4 and IPv6. Using only one of them explicitly can + be enforced by specifying -4 or -6. comment "inetutils' ping is selected!" depends on INETUTILS_PING @@ -48,22 +47,6 @@ comment "inetutils' ping is selected!" comment "BusyBox' ping is selected!" depends on BUSYBOX_PING -config IPUTILS_PING6 - bool - depends on (!BUSYBOX_PING6 && !INETUTILS_PING6) || ALLYES - prompt "ping6" - depends on GLOBAL_IPV6 - help - The ping6 command is IPv6 version of ping, and can also send Node - Information Queries (RFC4620). Intermediate hops may not be allowed, - because IPv6 source routing was deprecated (RFC5095). - -comment "inetutils' ping6 is selected!" -depends on INETUTILS_PING6 - -comment "BusyBox' ping6 is selected!" -depends on BUSYBOX_PING6 - config IPUTILS_RARPD bool prompt "rarpd" @@ -97,13 +80,10 @@ comment "BusyBox' tftpd is selected!" config IPUTILS_TRACEPATH bool prompt "tracepath" - help - -config IPUTILS_TRACEPATH6 - bool - prompt "tracepath6" depends on GLOBAL_IPV6 help + tracepath traces the path to a network host discovering the MTU along + this path. config IPUTILS_TRACEROUTE6 bool @@ -111,6 +91,7 @@ config IPUTILS_TRACEROUTE6 prompt "traceroute6" depends on GLOBAL_IPV6 help + traceroute6 prints the route packets trace to network hosts. comment "BusyBox' traceroute6 is selected!" depends on BUSYBOX_TRACEROUTE6 diff --git a/rules/iputils.make b/rules/iputils.make index dc93d5cbb..f07e3251d 100644 --- a/rules/iputils.make +++ b/rules/iputils.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_IPUTILS) += iputils # # Paths and names # -IPUTILS_VERSION:= s20121221 -IPUTILS_MD5:= 6072aef64205720dd1893b375e184171 +IPUTILS_VERSION:= s20161105 +IPUTILS_MD5:= 06f0be2dabe10dc80fdb328073230e69 IPUTILS:= iputils-$(IPUTILS_VERSION) -IPUTILS_SUFFIX := tar.bz2 -IPUTILS_URL:= http://www.skbuff.net/iputils/$(IPUTILS).$(IPUTILS_SUFFIX) +IPUTILS_SUFFIX := tar.gz +IPUTILS_URL:= http://codeload.github.com/iputils/iputils/$(IPUTILS_SUFFIX)/$(IPUTILS_VERSION) IPUTILS_SOURCE := $(SRCDIR)/$(IPUTILS).$(IPUTILS_SUFFIX) IPUTILS_DIR:= $(BUILDDIR)/$(IPUTILS) IPUTILS_LICENSE:= GPL-2.0 @@ -34,16 +34,14 @@ IPUTILS_TOOLS-y := IPUTILS_TOOLS-$(PTXCONF_IPUTILS_ARPING)+= arping IPUTILS_TOOLS-$(PTXCONF_IPUTILS_CLOCKDIFF) += clockdiff IPUTILS_TOOLS-$(PTXCONF_IPUTILS_PING) += ping -IPUTILS_TOOLS-$(PTXCONF_IPUTILS_PING6) += ping6 IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RARPD) += rarpd IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RDISC) += rdisc IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TFTPD) += tftpd IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TRACEPATH) += tracepath -IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TRACEPATH6)+= tracepath6 IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TRACEROUTE6) += traceroute6 IPUTILS_CONF_TOOL := NO -IPUTILS_MAKEVARS := $(CRO
[ptxdist] [PATCH 03/18] collectd: update 5.4.1 -> 5.7.0 and add sensors support
To avoid mistakes in future updates, reorganize the configure options, add missing options and list all plugins separately. This update adds support for the sensors plugin, which reads sensor data through lm_sensors. Signed-off-by: Clemens Gruber --- projectroot/etc/collectd.d/sensors.conf | 1 + rules/collectd.in | 9 +- rules/collectd.make | 281 ++-- 3 files changed, 164 insertions(+), 127 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 0..2dc3ffeed --- /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 bff2cb587..ba359f092 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 2ef50e725..8d693f80b 100644 --- a/rules/collectd.make +++ b/rules/collectd.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2014 by Markus Pargmann +# Copyright (C) 2016 by Clemens Gruber # # See CREDITS for details about who has contributed to this project. # @@ -16,11 +17,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 @@ -29,11 +30,6 @@ COLLECTD_LICENSE := GPL2 # Prepare # -COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE)+= logfile -COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG) += syslog -COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL)+= rrdtool -COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU)+= cpu - # 'noyywrap' is set, so no lex library is needed COLLECTD_CONF_ENV := \ $(CROSS_ENV) \ @@ -46,133 +42,167 @@ COLLECTD_CONF_TOOL:= autoconf COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-standards \ - --disable-glibtest \ + --disable-xfs \ --disable-debug \ --enable-daemon \ --disable-getifaddrs \ + --disable-werror \ --disable-all-plugins \ --with-included-ltdl \ --with-nan-emulation \ --with-fp-layout=nothing \ - \ - --disable-aggregation \ - --disable-amqp \ - --disable-apache \ - --disable-apcups \ - --disable-apple_sensors \ - --disable-aquaero \ - --disable-ascent \ - --disable-battery \ - --disable-bind \ - --disable-conntrack \ - --disable-contextswitch \ - --disable-cpufreq \ - --disable-csv \ - --disable-curl \ - --disable-curl_json \ - --disable-curl_xml \ - --disable-cgroups \ - --disable-dbi \ - --disable-df \ - --disable-disk \ - --disable-dns \ - --disable-email \ - --disable-entropy \ - --disable-ethstat \ - --disable-exec \ - --disable-filecount \ - --disable-fscache \ - --disable-gmond \ - --disable-hddtemp \ - --disable-interface \ - --disable-ipmi \ - --disable-iptables \ - --disable-ipvs \ - --disable-irq \ - --disable-java \ - --disable-libvirt \ - --disable-load \ - --disable-lpar \ - --disable-lvm \ - --disable-madwifi \ - --disable-match_empty_counter \ - --disable-match_hashed \ - --disable-match_regex \ - --disable-match_timediff \ - --disable-match_value \ - --disable-mbmon \ - --disable-md \ - --disable-memcachec \ - --disable-memcached \ - --disable-memory \ - --disable-mic \ - --disable-modbus \ - --disable-multimeter \ - --disa
[ptxdist] [PATCH 00/18] Patchset for ptxdist
Hi Michael, I decided to resend the whole patchset, plus some patches I left out before, because nearly all of the previously sent patches changed. I went over them again to fix configure options and in the process discovered some other problems as well. There are also several improvements here and there: sqlite, iproute2, .. And the subjects now conform to the suggested old -> new nomenclature. Regards, Clemens Clemens Gruber (18): nettle: update 2.7.1 -> 3.3 iputils: update s20121221 -> s20161105 collectd: update 5.4.1 -> 5.7.0 and add sensors support dbus: bump version 1.10.10 -> 1.10.14 file: update 5.24 -> 5.29 glib: bump version 2.50.1 -> 2.50.2 iperf: update 2.0.5 -> 2.0.9 iproute2: update 4.8.0 -> 4.9.0 projectroot: Fix HTML syntax in examples rrdtool: update 1.4.9 -> 1.6.0 and make more modular sqlite: update 3.14.1 -> 3.15.2 systemd-bootchart: bump version 230 -> 231 tmux: update 1.9a -> 2.3 u-boot-tools: bump version 2016.07 -> 2016.11 util-linux-ng: update 2.28.2 -> 2.29 and fix URL deduction picocom: bump version 1.7 -> 2.2 libgcrypt: update 1.7.3 -> 1.7.5 netperf: new package patches/iperf-2.0.5/fix_early_termination.diff | 47 patches/iperf-2.0.5/series | 1 - .../0001-add-xtables-version.h.patch | 22 -- patches/iproute2-4.8.0/series | 1 - patches/netperf-2.7.0/0001-fix-inlining.patch | 46 patches/netperf-2.7.0/series | 4 + ...c-don-t-specify-hardcoded-include-search-.patch | 27 -- patches/rrdtool-1.4.9/autogen.sh | 1 - patches/rrdtool-1.4.9/series | 4 - ...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 - .../0001-__progname-redefinition-fix.patch | 0 .../{util-linux-2.28.2 => util-linux-2.29}/series | 0 projectroot/etc/collectd.d/sensors.conf| 1 + projectroot/var/www/httpd.html | 2 + projectroot/var/www/thttpd.html| 2 + rules/collectd.in | 9 +- rules/collectd.make| 281 - rules/dbus.make| 4 +- rules/file.make| 12 +- rules/glib.make| 4 +- rules/iperf.make | 13 +- rules/iproute2.make| 7 +- rules/iputils.in | 41 +-- rules/iputils.make | 12 +- rules/libgcrypt.make | 30 ++- rules/netperf.in | 9 + rules/netperf.make | 75 ++ rules/nettle.in| 1 - rules/nettle.make | 13 +- rules/picocom.make | 8 +- rules/rrdtool.in | 14 +- rules/rrdtool.make | 11 +- rules/sqlite.make | 20 +- rules/systemd-bootchart.make | 11 +- rules/tmux.make| 12 +- rules/u-boot-tools.make| 4 +- rules/util-linux-ng.make | 23 +- 42 files changed, 449 insertions(+), 454 deletions(-) delete mode 100644 patches/iperf-2.0.5/fix_early_termination.diff delete mode 100644 patches/iperf-2.0.5/series delete mode 100644 patches/iproute2-4.8.0/0001-add-xtables-version.h.patch delete mode 100644 patches/iproute2-4.8.0/series create mode 100644 patches/netperf-2.7.0/0001-fix-inlining.patch create mode 100644 patches/netperf-2.7.0/series delete mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch delete mode 12 patches/rrdtool-1.4.9/autogen.sh delete mode 100644 patches/rrdtool-1.4.9/series 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 12 patches/systemd-bootchart-230/autogen.sh delete mode 100644 patches/systemd-bootchart-230/series rename patches/{util-linux-2.28.2 => util-linux-2.29}/0001-__progname-redefinition-fix.patch (100%)
[ptxdist] [PATCHv2] networkmanager: version bump 1.2.2 -> 1.4.2
Signed-off-by: Ladislav Michl --- changes: -v2: remove series file, handle new configure options ...-sleep-monitor-upower-add-missing-include.patch | 26 -- patches/NetworkManager-1.2.2/series| 4 rules/networkmanager.in| 5 + rules/networkmanager.make | 22 +- 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch deleted file mode 100644 index 425974c..000 --- a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich -Date: Wed, 18 May 2016 10:16:15 +0200 -Subject: [PATCH] sleep-monitor-upower: add missing include - -Otherwise building fails with: - -nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get' -nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token - -Signed-off-by: Michael Olbrich - src/nm-sleep-monitor-upower.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c -index 5f0ff24552b2..8d0719039ccf 100644 a/src/nm-sleep-monitor-upower.c -+++ b/src/nm-sleep-monitor-upower.c -@@ -24,6 +24,7 @@ - #include - - #include "nm-core-internal.h" -+#include "NetworkManagerUtils.h" - - #include "nm-sleep-monitor.h" - diff --git a/patches/NetworkManager-1.2.2/series b/patches/NetworkManager-1.2.2/series deleted file mode 100644 index d288508..000 --- a/patches/NetworkManager-1.2.2/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-sleep-monitor-upower-add-missing-include.patch -# ed83c6f2cf812e4453d3644fb7eafaaf - git-ptx-patches magic diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 85b1e91..36fe00a 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -16,6 +16,7 @@ menuconfig NETWORKMANAGER select LIBNDP select LIBNEWT if NETWORKMANAGER_NMTUI select LIBNL3 + select LIBSOUP if NETWORKMANAGER_CONCHECK select LIBUUID select MODEMMANAGER if NETWORKMANAGER_WWAN select PPP if NETWORKMANAGER_PPP @@ -80,6 +81,10 @@ config NETWORKMANAGER_PPP bool prompt "enable ppp support" +config NETWORKMANAGER_CONCHECK + bool + prompt "enable connectivity checking support" + config NETWORKMANAGER_EXAMPLES bool prompt "install examples for Network Manager" diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 3e4d2ac..f3a9596 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.2.2 -NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035 +NETWORKMANAGER_VERSION := 1.4.2 +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) @@ -35,8 +35,12 @@ NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_CONF_TOOL := autoconf NETWORKMANAGER_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-silent-rules \ + --disable-maintainer-mode \ + --disable-dependency-tracking \ --disable-static \ --enable-shared \ + --enable-fast-install \ --disable-nls \ --disable-rpath \ --disable-ifcfg-rh \ @@ -47,15 +51,19 @@ NETWORKMANAGER_CONF_OPT := \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ --disable-introspection \ --disable-qt \ - --disable-wimax \ + --disable-teamdctl \ + --disable-json-validation \ --disable-polkit \ --disable-modify-system \ --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \ --disable-bluez5-dun \ - --disable-concheck \ + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_CONCHECK)-concheck \ --enable-more-warnings \ --disable-more-asserts \ --disable-more-logging \ + --disable-lto \ + --disable-address-sanitizer \ + --disable-undefined-sanitizer \ --disable-vala \ --disable-tests \ --dis
[ptxdist] [PATCHv2] usb-modeswitch: version bump 2.3.0 -> 2.4.0
Update also usb-modeswitch-data to version 20160803, as it needs new features from usb-modeswitch-2.4.0 Signed-off-by: Ladislav Michl --- changes: - v2: updated md5sum (unnoticed previously as I overlooked private usb-modeswitch.make rule in my project) rules/usb-modeswitch-data.make | 4 ++-- rules/usb-modeswitch.make | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make index 1e3b86f..14f026a 100644 --- a/rules/usb-modeswitch-data.make +++ b/rules/usb-modeswitch-data.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH_DATA) += usb-modeswitch-data # # Paths and names # -USB_MODESWITCH_DATA_VERSION:= 20160112 -USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f +USB_MODESWITCH_DATA_VERSION:= 20160803 +USB_MODESWITCH_DATA_MD5:= acc927e44827837eb23b2a7980b38a35 USB_MODESWITCH_DATA:= usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION) USB_MODESWITCH_DATA_SUFFIX := tar.bz2 USB_MODESWITCH_DATA_URL:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX) diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make index 95149a3..7210ed9 100644 --- a/rules/usb-modeswitch.make +++ b/rules/usb-modeswitch.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch # # Paths and names # -USB_MODESWITCH_VERSION := 2.3.0 -USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f +USB_MODESWITCH_VERSION := 2.4.0 +USB_MODESWITCH_MD5 := 6e1640db47768bb9012f91b7593116ef USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION) USB_MODESWITCH_SUFFIX := tar.bz2 USB_MODESWITCH_URL := http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX) -- 2.10.2 ___ ptxdist mailing list ptxdist@pengutronix.de