* [ptxdist] [PATCH] stress: add new package: workload generator for POSIX systems @ 2017-05-15 8:47 Roland Hieber 2017-05-15 14:32 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2017-05-15 8:47 UTC (permalink / raw) To: ptxdist --- patches/stress-1.0.4/0001-dont-build-docs.patch | 28 +++++++++++++ patches/stress-1.0.4/series | 1 + rules/stress.in | 9 +++++ rules/stress.make | 54 +++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 patches/stress-1.0.4/0001-dont-build-docs.patch create mode 100644 patches/stress-1.0.4/series create mode 100644 rules/stress.in create mode 100644 rules/stress.make diff --git a/patches/stress-1.0.4/0001-dont-build-docs.patch b/patches/stress-1.0.4/0001-dont-build-docs.patch new file mode 100644 index 0000000..bf73d16 --- /dev/null +++ b/patches/stress-1.0.4/0001-dont-build-docs.patch @@ -0,0 +1,28 @@ +Subject: disable building docs +From: Roland Hieber <rhi@pengutronix.de> +Forwarded: not-needed + +Building docs currently fails with errors in doc/stress.texi: + + stress.texi:68: @itemx must follow @item + stress.texi:87: @itemx must follow @item + stress.texi:102: @itemx must follow @item + stress.texi:105: @itemx must follow @item + stress.texi:120: @itemx must follow @item + stress.texi:123: @itemx must follow @item + Makefile:191: recipe for target 'stress.info' failed + + +diff --git a/Makefile.in b/Makefile.in +index 64e5a39..2396f1c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -155,7 +155,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp + + EXTRA_DIST = ChangeLog +-SUBDIRS = . src doc test ++SUBDIRS = . src test + all: all-recursive + + .SUFFIXES: diff --git a/patches/stress-1.0.4/series b/patches/stress-1.0.4/series new file mode 100644 index 0000000..24d2f45 --- /dev/null +++ b/patches/stress-1.0.4/series @@ -0,0 +1 @@ +0001-dont-build-docs.patch diff --git a/rules/stress.in b/rules/stress.in new file mode 100644 index 0000000..8aabc44 --- /dev/null +++ b/rules/stress.in @@ -0,0 +1,9 @@ +## SECTION=test_suites + +config STRESS + tristate + prompt "stress" + help + stress is a deliberately simple workload generator for POSIX + systems. It imposes a configurable amount of CPU, memory, I/O, and + disk stress on the system. diff --git a/rules/stress.make b/rules/stress.make new file mode 100644 index 0000000..a9e0213 --- /dev/null +++ b/rules/stress.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> +# +# 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_STRESS) += stress + +# +# Paths and names +# +STRESS_VERSION := 1.0.4 +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef +STRESS := stress-$(STRESS_VERSION) +STRESS_SUFFIX := tar.gz +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) +STRESS_DIR := $(BUILDDIR)/$(STRESS) +STRESS_LICENSE := GPL-2 + +# +# autoconf +# +STRESS_CONF_TOOL:= autoconf +STRESS_CONF_OPT := $(CROSS_AUTOCONF_USR) \ + --disable-dependency-tracking + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/stress.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress) + @$(call install_fixup, stress,PRIORITY,optional) + @$(call install_fixup, stress,SECTION,base) + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") + @$(call install_fixup, stress,DESCRIPTION,missing) + + @$(call install_copy, stress, 0, 0, 0755, $(STRESS_DIR)/src/stress, /usr/bin/stress) + + @$(call install_finish, stress) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] stress: add new package: workload generator for POSIX systems 2017-05-15 8:47 [ptxdist] [PATCH] stress: add new package: workload generator for POSIX systems Roland Hieber @ 2017-05-15 14:32 ` Michael Olbrich 2017-05-18 9:52 ` [ptxdist] [PATCH v2] " Roland Hieber 0 siblings, 1 reply; 8+ messages in thread From: Michael Olbrich @ 2017-05-15 14:32 UTC (permalink / raw) To: ptxdist On Mon, May 15, 2017 at 10:47:01AM +0200, Roland Hieber wrote: > --- > patches/stress-1.0.4/0001-dont-build-docs.patch | 28 +++++++++++++ > patches/stress-1.0.4/series | 1 + > rules/stress.in | 9 +++++ > rules/stress.make | 54 +++++++++++++++++++++++++ > 4 files changed, 92 insertions(+) > create mode 100644 patches/stress-1.0.4/0001-dont-build-docs.patch > create mode 100644 patches/stress-1.0.4/series > create mode 100644 rules/stress.in > create mode 100644 rules/stress.make > > diff --git a/patches/stress-1.0.4/0001-dont-build-docs.patch b/patches/stress-1.0.4/0001-dont-build-docs.patch > new file mode 100644 > index 0000000..bf73d16 > --- /dev/null > +++ b/patches/stress-1.0.4/0001-dont-build-docs.patch > @@ -0,0 +1,28 @@ > +Subject: disable building docs > +From: Roland Hieber <rhi@pengutronix.de> > +Forwarded: not-needed > + > +Building docs currently fails with errors in doc/stress.texi: > + > + stress.texi:68: @itemx must follow @item > + stress.texi:87: @itemx must follow @item > + stress.texi:102: @itemx must follow @item > + stress.texi:105: @itemx must follow @item > + stress.texi:120: @itemx must follow @item > + stress.texi:123: @itemx must follow @item > + Makefile:191: recipe for target 'stress.info' failed > + > + > +diff --git a/Makefile.in b/Makefile.in > +index 64e5a39..2396f1c 100644 > +--- a/Makefile.in > ++++ b/Makefile.in > +@@ -155,7 +155,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ > + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp > + > + EXTRA_DIST = ChangeLog > +-SUBDIRS = . src doc test > ++SUBDIRS = . src test > + all: all-recursive > + > + .SUFFIXES: > diff --git a/patches/stress-1.0.4/series b/patches/stress-1.0.4/series > new file mode 100644 > index 0000000..24d2f45 > --- /dev/null > +++ b/patches/stress-1.0.4/series > @@ -0,0 +1 @@ > +0001-dont-build-docs.patch Please regenerate the patches with git: - extract the packages with 'ptxdist --git extract stress' - go to the package source dir and amend the commit if needed - regenerate the patches with 'git ptx-patches' > diff --git a/rules/stress.in b/rules/stress.in > new file mode 100644 > index 0000000..8aabc44 > --- /dev/null > +++ b/rules/stress.in > @@ -0,0 +1,9 @@ > +## SECTION=test_suites > + > +config STRESS > + tristate > + prompt "stress" > + help > + stress is a deliberately simple workload generator for POSIX > + systems. It imposes a configurable amount of CPU, memory, I/O, and > + disk stress on the system. Intend the help text with '<tab><space><space>' > diff --git a/rules/stress.make b/rules/stress.make > new file mode 100644 > index 0000000..a9e0213 > --- /dev/null > +++ b/rules/stress.make > @@ -0,0 +1,54 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> > +# > +# 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_STRESS) += stress > + > +# > +# Paths and names > +# > +STRESS_VERSION := 1.0.4 > +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef > +STRESS := stress-$(STRESS_VERSION) > +STRESS_SUFFIX := tar.gz > +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) > +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) > +STRESS_DIR := $(BUILDDIR)/$(STRESS) > +STRESS_LICENSE := GPL-2 Use SPDX license identifiers and check the code. This should be GPL-2.0+ > + > +# > +# autoconf > +# > +STRESS_CONF_TOOL:= autoconf STRESS_CONF_TOOL := autoconf Indent to align with the line below. > +STRESS_CONF_OPT := \ break. $(CROSS_AUTOCONF_USR) \ > + --disable-dependency-tracking > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/stress.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, stress) > + @$(call install_fixup, stress,PRIORITY,optional) > + @$(call install_fixup, stress,SECTION,base) > + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") > + @$(call install_fixup, stress,DESCRIPTION,missing) > + > + @$(call install_copy, stress, 0, 0, 0755, $(STRESS_DIR)/src/stress, /usr/bin/stress) @$(call install_copy, stress, 0, 0, 0755, -, /usr/bin/stress) Michael > + > + @$(call install_finish, stress) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.11.0 > > > _______________________________________________ > 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] 8+ messages in thread
* [ptxdist] [PATCH v2] stress: add new package: workload generator for POSIX systems 2017-05-15 14:32 ` Michael Olbrich @ 2017-05-18 9:52 ` Roland Hieber 2017-05-18 10:07 ` Uwe Kleine-König 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2017-05-18 9:52 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber --- Changes since v1: - regenerate patches with git ptx-patches - stress: add new package: workload generator for POSIX systems - use correct SPDX license code - fix indentations - use simplified install_copy call --- .../stress-1.0.4/0001-disable-building-docs.patch | 30 ++++++++++++ patches/stress-1.0.4/series | 4 ++ rules/stress.in | 9 ++++ rules/stress.make | 55 ++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 patches/stress-1.0.4/0001-disable-building-docs.patch create mode 100644 patches/stress-1.0.4/series create mode 100644 rules/stress.in create mode 100644 rules/stress.make diff --git a/patches/stress-1.0.4/0001-disable-building-docs.patch b/patches/stress-1.0.4/0001-disable-building-docs.patch new file mode 100644 index 0000000..eb19b71 --- /dev/null +++ b/patches/stress-1.0.4/0001-disable-building-docs.patch @@ -0,0 +1,30 @@ +From: Roland Hieber <rhi@pengutronix.de> +Date: Thu, 18 May 2017 11:20:26 +0200 +Subject: [PATCH] disable building docs + +Building docs currently fails with errors in doc/stress.texi: + + stress.texi:68: @itemx must follow @item + stress.texi:87: @itemx must follow @item + stress.texi:102: @itemx must follow @item + stress.texi:105: @itemx must follow @item + stress.texi:120: @itemx must follow @item + stress.texi:123: @itemx must follow @item + Makefile:191: recipe for target 'stress.info' failed +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 64e5a396bf13..2396f1cad960 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -155,7 +155,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp + + EXTRA_DIST = ChangeLog +-SUBDIRS = . src doc test ++SUBDIRS = . src test + all: all-recursive + + .SUFFIXES: diff --git a/patches/stress-1.0.4/series b/patches/stress-1.0.4/series new file mode 100644 index 0000000..d342ac8 --- /dev/null +++ b/patches/stress-1.0.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-disable-building-docs.patch +# 77619244844e93251aa6326b7e98b81d - git-ptx-patches magic diff --git a/rules/stress.in b/rules/stress.in new file mode 100644 index 0000000..d8b2213 --- /dev/null +++ b/rules/stress.in @@ -0,0 +1,9 @@ +## SECTION=test_suites + +config STRESS + tristate + prompt "stress" + help + stress is a deliberately simple workload generator for POSIX + systems. It imposes a configurable amount of CPU, memory, I/O, and + disk stress on the system. diff --git a/rules/stress.make b/rules/stress.make new file mode 100644 index 0000000..27df156 --- /dev/null +++ b/rules/stress.make @@ -0,0 +1,55 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> +# +# 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_STRESS) += stress + +# +# Paths and names +# +STRESS_VERSION := 1.0.4 +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef +STRESS := stress-$(STRESS_VERSION) +STRESS_SUFFIX := tar.gz +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) +STRESS_DIR := $(BUILDDIR)/$(STRESS) +STRESS_LICENSE := GPL-2.0+ + +# +# autoconf +# +STRESS_CONF_TOOL := autoconf +STRESS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dependency-tracking + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/stress.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress) + @$(call install_fixup, stress,PRIORITY,optional) + @$(call install_fixup, stress,SECTION,base) + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") + @$(call install_fixup, stress,DESCRIPTION,missing) + + @$(call install_copy, stress, 0, 0, 0755, -, /usr/bin/stress) + + @$(call install_finish, stress) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH v2] stress: add new package: workload generator for POSIX systems 2017-05-18 9:52 ` [ptxdist] [PATCH v2] " Roland Hieber @ 2017-05-18 10:07 ` Uwe Kleine-König 2017-05-18 10:47 ` [ptxdist] [PATCH v3] " Roland Hieber 0 siblings, 1 reply; 8+ messages in thread From: Uwe Kleine-König @ 2017-05-18 10:07 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber On Thu, May 18, 2017 at 11:52:44AM +0200, Roland Hieber wrote: > --- > Changes since v1: > - regenerate patches with git ptx-patches > - stress: add new package: workload generator for POSIX systems > - use correct SPDX license code > - fix indentations > - use simplified install_copy call > --- > .../stress-1.0.4/0001-disable-building-docs.patch | 30 ++++++++++++ > patches/stress-1.0.4/series | 4 ++ > rules/stress.in | 9 ++++ > rules/stress.make | 55 ++++++++++++++++++++++ > 4 files changed, 98 insertions(+) > create mode 100644 patches/stress-1.0.4/0001-disable-building-docs.patch > create mode 100644 patches/stress-1.0.4/series > create mode 100644 rules/stress.in > create mode 100644 rules/stress.make > > diff --git a/patches/stress-1.0.4/0001-disable-building-docs.patch b/patches/stress-1.0.4/0001-disable-building-docs.patch > new file mode 100644 > index 0000000..eb19b71 > --- /dev/null > +++ b/patches/stress-1.0.4/0001-disable-building-docs.patch > @@ -0,0 +1,30 @@ > +From: Roland Hieber <rhi@pengutronix.de> > +Date: Thu, 18 May 2017 11:20:26 +0200 > +Subject: [PATCH] disable building docs > + > +Building docs currently fails with errors in doc/stress.texi: s/fails/fail/ + maybe "So exclude the doc folder from building". > + > + stress.texi:68: @itemx must follow @item > + stress.texi:87: @itemx must follow @item > + stress.texi:102: @itemx must follow @item > + stress.texi:105: @itemx must follow @item > + stress.texi:120: @itemx must follow @item > + stress.texi:123: @itemx must follow @item > + Makefile:191: recipe for target 'stress.info' failed > +--- > + Makefile.in | 2 +- Hmm, if you don't adapt Makefile.am (I assume there is one?) the next person who touches something there likely will have to update your patch to change Makefile.am, too. So maybe patch Makefile.am instead and call autoreconf? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH v3] stress: add new package: workload generator for POSIX systems 2017-05-18 10:07 ` Uwe Kleine-König @ 2017-05-18 10:47 ` Roland Hieber 2017-05-18 12:38 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2017-05-18 10:47 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber --- Changes since v2: - include patching Makefile.am in 0001-disable-building-docs.patch - reformulate justification for the patch --- .../stress-1.0.4/0001-disable-building-docs.patch | 47 ++++++++++++++++++ patches/stress-1.0.4/series | 4 ++ rules/stress.in | 9 ++++ rules/stress.make | 55 ++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 patches/stress-1.0.4/0001-disable-building-docs.patch create mode 100644 patches/stress-1.0.4/series create mode 100644 rules/stress.in create mode 100644 rules/stress.make diff --git a/patches/stress-1.0.4/0001-disable-building-docs.patch b/patches/stress-1.0.4/0001-disable-building-docs.patch new file mode 100644 index 0000000..e566200 --- /dev/null +++ b/patches/stress-1.0.4/0001-disable-building-docs.patch @@ -0,0 +1,47 @@ +From: Roland Hieber <r.hieber@pengutronix.de> +Date: Thu, 18 May 2017 12:33:55 +0200 +Subject: [PATCH] disable building docs + +Building the docs currently fails with errors in doc/stress.texi: + + stress.texi:68: @itemx must follow @item + stress.texi:87: @itemx must follow @item + stress.texi:102: @itemx must follow @item + stress.texi:105: @itemx must follow @item + stress.texi:120: @itemx must follow @item + stress.texi:123: @itemx must follow @item + Makefile:191: recipe for target 'stress.info' failed + +Documentation is not installed anyways, so work around that error by +excluding the docs folder from the build. +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 99ae0d6441ac..dfbdfda63b20 100755 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp + EXTRA_DIST = ChangeLog + +-SUBDIRS = . src doc test ++SUBDIRS = . src test + + ChangeLog: Log.cvs + rcs2log -u "apw Amos Waterland apw@rossby.metr.ou.edu" -L $^ | \ +diff --git a/Makefile.in b/Makefile.in +index 64e5a396bf13..2396f1cad960 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -155,7 +155,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp + + EXTRA_DIST = ChangeLog +-SUBDIRS = . src doc test ++SUBDIRS = . src test + all: all-recursive + + .SUFFIXES: diff --git a/patches/stress-1.0.4/series b/patches/stress-1.0.4/series new file mode 100644 index 0000000..d342ac8 --- /dev/null +++ b/patches/stress-1.0.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-disable-building-docs.patch +# 77619244844e93251aa6326b7e98b81d - git-ptx-patches magic diff --git a/rules/stress.in b/rules/stress.in new file mode 100644 index 0000000..d8b2213 --- /dev/null +++ b/rules/stress.in @@ -0,0 +1,9 @@ +## SECTION=test_suites + +config STRESS + tristate + prompt "stress" + help + stress is a deliberately simple workload generator for POSIX + systems. It imposes a configurable amount of CPU, memory, I/O, and + disk stress on the system. diff --git a/rules/stress.make b/rules/stress.make new file mode 100644 index 0000000..27df156 --- /dev/null +++ b/rules/stress.make @@ -0,0 +1,55 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> +# +# 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_STRESS) += stress + +# +# Paths and names +# +STRESS_VERSION := 1.0.4 +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef +STRESS := stress-$(STRESS_VERSION) +STRESS_SUFFIX := tar.gz +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) +STRESS_DIR := $(BUILDDIR)/$(STRESS) +STRESS_LICENSE := GPL-2.0+ + +# +# autoconf +# +STRESS_CONF_TOOL := autoconf +STRESS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dependency-tracking + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/stress.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress) + @$(call install_fixup, stress,PRIORITY,optional) + @$(call install_fixup, stress,SECTION,base) + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") + @$(call install_fixup, stress,DESCRIPTION,missing) + + @$(call install_copy, stress, 0, 0, 0755, -, /usr/bin/stress) + + @$(call install_finish, stress) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH v3] stress: add new package: workload generator for POSIX systems 2017-05-18 10:47 ` [ptxdist] [PATCH v3] " Roland Hieber @ 2017-05-18 12:38 ` Michael Olbrich 2017-05-19 12:29 ` Roland Hieber 2017-05-19 12:31 ` [ptxdist] [PATCH] " Roland Hieber 0 siblings, 2 replies; 8+ messages in thread From: Michael Olbrich @ 2017-05-18 12:38 UTC (permalink / raw) To: ptxdist On Thu, May 18, 2017 at 12:47:43PM +0200, Roland Hieber wrote: > --- > Changes since v2: > - include patching Makefile.am in 0001-disable-building-docs.patch > - reformulate justification for the patch > --- > .../stress-1.0.4/0001-disable-building-docs.patch | 47 ++++++++++++++++++ > patches/stress-1.0.4/series | 4 ++ > rules/stress.in | 9 ++++ > rules/stress.make | 55 ++++++++++++++++++++++ > 4 files changed, 115 insertions(+) > create mode 100644 patches/stress-1.0.4/0001-disable-building-docs.patch > create mode 100644 patches/stress-1.0.4/series > create mode 100644 rules/stress.in > create mode 100644 rules/stress.make > > diff --git a/patches/stress-1.0.4/0001-disable-building-docs.patch b/patches/stress-1.0.4/0001-disable-building-docs.patch > new file mode 100644 > index 0000000..e566200 > --- /dev/null > +++ b/patches/stress-1.0.4/0001-disable-building-docs.patch > @@ -0,0 +1,47 @@ > +From: Roland Hieber <r.hieber@pengutronix.de> > +Date: Thu, 18 May 2017 12:33:55 +0200 > +Subject: [PATCH] disable building docs > + > +Building the docs currently fails with errors in doc/stress.texi: > + > + stress.texi:68: @itemx must follow @item > + stress.texi:87: @itemx must follow @item > + stress.texi:102: @itemx must follow @item > + stress.texi:105: @itemx must follow @item > + stress.texi:120: @itemx must follow @item > + stress.texi:123: @itemx must follow @item > + Makefile:191: recipe for target 'stress.info' failed > + > +Documentation is not installed anyways, so work around that error by > +excluding the docs folder from the build. > +--- > + Makefile.am | 2 +- > + Makefile.in | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 99ae0d6441ac..dfbdfda63b20 100755 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ > + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp > + EXTRA_DIST = ChangeLog > + > +-SUBDIRS = . src doc test > ++SUBDIRS = . src test > + > + ChangeLog: Log.cvs > + rcs2log -u "apw Amos Waterland apw@rossby.metr.ou.edu" -L $^ | \ > +diff --git a/Makefile.in b/Makefile.in > +index 64e5a396bf13..2396f1cad960 100644 > +--- a/Makefile.in > ++++ b/Makefile.in > +@@ -155,7 +155,7 @@ MAINTAINERCLEANFILES = install-sh mkinstalldirs missing Makefile.in \ > + aclocal.m4 configure COPYING Log.cvs ChangeLog depcomp > + > + EXTRA_DIST = ChangeLog > +-SUBDIRS = . src doc test > ++SUBDIRS = . src test > + all: all-recursive > + > + .SUFFIXES: > diff --git a/patches/stress-1.0.4/series b/patches/stress-1.0.4/series > new file mode 100644 > index 0000000..d342ac8 > --- /dev/null > +++ b/patches/stress-1.0.4/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-disable-building-docs.patch > +# 77619244844e93251aa6326b7e98b81d - git-ptx-patches magic > diff --git a/rules/stress.in b/rules/stress.in > new file mode 100644 > index 0000000..d8b2213 > --- /dev/null > +++ b/rules/stress.in > @@ -0,0 +1,9 @@ > +## SECTION=test_suites > + > +config STRESS > + tristate > + prompt "stress" > + help > + stress is a deliberately simple workload generator for POSIX > + systems. It imposes a configurable amount of CPU, memory, I/O, and > + disk stress on the system. > diff --git a/rules/stress.make b/rules/stress.make > new file mode 100644 > index 0000000..27df156 > --- /dev/null > +++ b/rules/stress.make > @@ -0,0 +1,55 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> > +# > +# 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_STRESS) += stress > + > +# > +# Paths and names > +# > +STRESS_VERSION := 1.0.4 > +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef > +STRESS := stress-$(STRESS_VERSION) > +STRESS_SUFFIX := tar.gz > +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) > +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) > +STRESS_DIR := $(BUILDDIR)/$(STRESS) > +STRESS_LICENSE := GPL-2.0+ > + Each stage that has some content in the makefile should have its header: # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- I looked a bit closer at the source. Add this to the rule and you should be able to drop the patch: STRESS_CONF_ENV := \ $(CROSS_ENV) \ MAKEINFO=: Michael > +# > +# autoconf > +# > +STRESS_CONF_TOOL := autoconf > +STRESS_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + --disable-dependency-tracking > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/stress.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, stress) > + @$(call install_fixup, stress,PRIORITY,optional) > + @$(call install_fixup, stress,SECTION,base) > + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") > + @$(call install_fixup, stress,DESCRIPTION,missing) > + > + @$(call install_copy, stress, 0, 0, 0755, -, /usr/bin/stress) > + > + @$(call install_finish, stress) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.11.0 > > > _______________________________________________ > 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] 8+ messages in thread
* Re: [ptxdist] [PATCH v3] stress: add new package: workload generator for POSIX systems 2017-05-18 12:38 ` Michael Olbrich @ 2017-05-19 12:29 ` Roland Hieber 2017-05-19 12:31 ` [ptxdist] [PATCH] " Roland Hieber 1 sibling, 0 replies; 8+ messages in thread From: Roland Hieber @ 2017-05-19 12:29 UTC (permalink / raw) To: ptxdist On 18.05.2017 14:38, Michael Olbrich wrote: > I looked a bit closer at the source. Add this to the rule and you should be > able to drop the patch: > > STRESS_CONF_ENV := \ > $(CROSS_ENV) \ > MAKEINFO=: Oh yes, that is a much more elegant solution. - Roland _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH] stress: add new package: workload generator for POSIX systems 2017-05-18 12:38 ` Michael Olbrich 2017-05-19 12:29 ` Roland Hieber @ 2017-05-19 12:31 ` Roland Hieber 1 sibling, 0 replies; 8+ messages in thread From: Roland Hieber @ 2017-05-19 12:31 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber --- Changes since v3: - use MAKEINFO=: in prepare stage instead of patching Makefiles - bring back section header for prepare stage Signed-off-by: Roland Hieber <r.hieber@pengutronix.de> --- rules/stress.in | 9 ++++++++ rules/stress.make | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 rules/stress.in create mode 100644 rules/stress.make diff --git a/rules/stress.in b/rules/stress.in new file mode 100644 index 0000000..d8b2213 --- /dev/null +++ b/rules/stress.in @@ -0,0 +1,9 @@ +## SECTION=test_suites + +config STRESS + tristate + prompt "stress" + help + stress is a deliberately simple workload generator for POSIX + systems. It imposes a configurable amount of CPU, memory, I/O, and + disk stress on the system. diff --git a/rules/stress.make b/rules/stress.make new file mode 100644 index 0000000..3e57204 --- /dev/null +++ b/rules/stress.make @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> +# +# 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_STRESS) += stress + +# +# Paths and names +# +STRESS_VERSION := 1.0.4 +STRESS_MD5 := 890a4236dd1656792f3ef9a190cf99ef +STRESS := stress-$(STRESS_VERSION) +STRESS_SUFFIX := tar.gz +STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX) +STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX) +STRESS_DIR := $(BUILDDIR)/$(STRESS) +STRESS_LICENSE := GPL-2.0+ + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +# +# autoconf +# +STRESS_CONF_TOOL := autoconf +STRESS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dependency-tracking + +# prevent errors when building the documentation, which is not installed anyways +STRESS_CONF_ENV := \ + $(CROSS_ENV) \ + MAKEINFO=: + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/stress.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress) + @$(call install_fixup, stress,PRIORITY,optional) + @$(call install_fixup, stress,SECTION,base) + @$(call install_fixup, stress,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") + @$(call install_fixup, stress,DESCRIPTION,missing) + + @$(call install_copy, stress, 0, 0, 0755, -, /usr/bin/stress) + + @$(call install_finish, stress) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-05-19 12:31 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-05-15 8:47 [ptxdist] [PATCH] stress: add new package: workload generator for POSIX systems Roland Hieber 2017-05-15 14:32 ` Michael Olbrich 2017-05-18 9:52 ` [ptxdist] [PATCH v2] " Roland Hieber 2017-05-18 10:07 ` Uwe Kleine-König 2017-05-18 10:47 ` [ptxdist] [PATCH v3] " Roland Hieber 2017-05-18 12:38 ` Michael Olbrich 2017-05-19 12:29 ` Roland Hieber 2017-05-19 12:31 ` [ptxdist] [PATCH] " Roland Hieber
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox