Skip to contentSkip to conversation

rt-tests patches

PATCH In review Uwe Kleine-König 2 participants 10 messages Feb 24, 2010 – Mar 1, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

cover rt-tests patches

Hello,

here come a few changes that I came across while preparing the Debian package for rt-tests 0.66.

I'll send the patches as a reply to this mail. They are available in my repository, too, see below.

There is another problem, namely the symlink $(bindir)/hwlatdetect -> $(PYLIB)/hwlatdetect.py that get's broken by debhelper. For now I fixed it up by just installing hwlatdetect.py directly to $(sbindir)[1], but this isn't suitable for inclusion. A proper fix would be to split hwlatdetect in a module and an small program using the module, but I didn't come around to do that yet.

The following changes since commit 73d48f4e04684a376b41525bfed030b7671f03f7:
Clark Williams (1):
version bump to 0.66

are available in the git repository at:

git://git.pengutronix.de/git/ukl/rt-tests.git for-clark

Uwe Kleine-König (3):
trivial: s/specifed/specified/
install backfire.c to $(srcdir)/backfire/
Makefile: don't use temporary files in generation of dependency files

 Makefile                    |    6 ++----
 src/cyclictest/cyclictest.8 |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

[1]
http://patch-tracker.debian.org/patch/series/view/rt-tests/0.66-1/install_hwlatdetect_into_sbindir

Signature · 6 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

PATCH 1/3 trivial: s/specifed/specified/

---
 src/cyclictest/cyclictest.8 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
src/cyclictest/cyclictest.8 +1 -1
index 8f846c6..91e1102 100644
@@ -130,7 +130,7 @@ set the ftrace tracer function. Used with the \-b option. Must be one
 of the trace functions available from <debugfs-mountpoint>/kernel/debug/tracing/available_tracers
 .TP
 .B \-t, \-\-threads[=NUM]
-Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specifed, NUM is set to
+Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specified, NUM is set to
 the number of available CPUs. See \-d, \-i and \-p for further information.
 .TP
 .B \-m, \-\-mlockall
Signature · 6 lines
1.6.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] trivial: s/specifed/specified/

2010/2/24 Uwe Kleine-König <[email protected]>:

Quoted 15 lines

---
 src/cyclictest/cyclictest.8 |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
src/cyclictest/cyclictest.8 +0 -0
index 8f846c6..91e1102 100644
@@ -130,7 +130,7 @@ set the ftrace tracer function. Used with the \-b option. Must be one

 of the trace functions available from <debugfs-mountpoint>/kernel/debug/tracing/available_tracers .TP
 .B \-t, \-\-threads[=NUM]

src/cyclictest/cyclictest.8 +1 -1
-Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specifed, NUM is set to
+Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specified, NUM is set to
Quoted 5 lines

 the number of available CPUs. See \-d, \-i and \-p for further information. .TP
 .B \-m, \-\-mlockall
--
1.6.6.2

This is fine of course.

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw

PATCH 2/3 install backfire.c to $(srcdir)/backfire/

In reply to Uwe Kleine-König
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Makefile +1 -0
index 043b747..99fbba4 100644
@@ -110,6 +110,7 @@ install: all
 	install -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py
 	ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect"
 	mkdir -p "$(DESTDIR)$(srcdir)/backfire"
+	install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
 	gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
 	gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
 	gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
Signature · 6 lines
1.6.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#4 lore raw

Re: [PATCH 2/3] install backfire.c to $(srcdir)/backfire/

2010/2/24 Uwe Kleine-König <[email protected]>:

Quoted 11 lines

---
 Makefile |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
Makefile +0 -0
index 043b747..99fbba4 100644
@@ -110,6 +110,7 @@ install: all

       install -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py

Quoted 9 lines

       ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" mkdir -p "$(DESTDIR)$(srcdir)/backfire"
+       install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" --
1.6.6.2

Hi Uwe

What is the purpose of this patch?
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

Re: [PATCH 2/3] install backfire.c to $(srcdir)/backfire/

Hi John,

Quoted 24 lines · John Kacur

2010/2/24 Uwe Kleine-König <[email protected]>:

Quoted 11 lines

---
 Makefile |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
Makefile +0 -0
index 043b747..99fbba4 100644
@@ -110,6 +110,7 @@ install: all

       install -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py

Quoted 9 lines

       ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" mkdir -p "$(DESTDIR)$(srcdir)/backfire"
+       install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" --
1.6.6.2

Hi Uwe

Quoted 1 line

What is the purpose of this patch?

the idea if that if $(make install) creates the directory /usr/src/backfire it should add something below, too. Installing backfire.c seems reasonable. Maybe installing even the Makefile would make sence, doesn't it?

Best regards
Uwe

Signature · 6 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#6 lore raw

PATCH 3/3 Makefile: don't use temporary files in generation of dependency files

In reply to Uwe Kleine-König

These temporary files were a real problem when creating the Debian package for rt-tests. debhelper (a generic suite of scripts to ease packaging) did something like:

perl -c 'close(STDERR); exec("make distclean");'

which leaked the *.d.$$ files and then wailed that the package contained untracked changes to the vanilla source. See
http://bugs.debian.org/570443 for some more details.

---
 Makefile |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Makefile +1 -4
index 99fbba4..5bb8774 100644
@@ -43,10 +43,7 @@ VPATH	+= src/lib
 
 # Pattern rule to generate dependency files from .c files
 %.d: %.c
-	@set -e; rm -f $@; \
-	$(CC) -MM $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
+	@$(CC) -MM $(CFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ || rm -f $@
 
 .PHONY: all
 all: $(TARGETS) hwlatdetect
Signature · 6 lines
1.6.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by on v1 3/3
#7 lore raw

Re: [PATCH 3/3] Makefile: don't use temporary files in generation of dependency files

2010/2/24 Uwe Kleine-König <[email protected]>:

Quoted 29 lines

These temporary files were a real problem when creating the Debian package for rt-tests.  debhelper (a generic suite of scripts to ease packaging) did something like:

       perl -c 'close(STDERR); exec("make distclean");'

which leaked the *.d.$$ files and then wailed that the package contained untracked changes to the vanilla source.  See
http://bugs.debian.org/570443 for some more details.

---
 Makefile |    5 +----

 1 files changed, 1 insertions(+), 4 deletions(-)
Makefile +0 -0
index 99fbba4..5bb8774 100644
@@ -43,10 +43,7 @@ VPATH        += src/lib
 
  # Pattern rule to generate dependency files from .c files

 %.d: %.c
-       @set -e; rm -f $@; \
-       $(CC) -MM $(CFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
-       rm -f $@.$$$$
+       @$(CC) -MM $(CFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ || rm -f $@

Quoted 5 lines

 .PHONY: all
 all: $(TARGETS) hwlatdetect
--
1.6.6.2

This is fine too, it may even be faster.

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#8 lore raw

Re: [PATCH 3/3] Makefile: don't use temporary files in generation of dependency files

Hey Clark,

I updated my tree to contain John's Acks, so if you want to pull ...

The changelogs are slightly improved since submission and the patch

	install backfire.c to $(srcdir)/backfire/

is skipped for now as John didn't understand it (yet).

Best regards
Uwe

The following changes since commit 73d48f4e04684a376b41525bfed030b7671f03f7:
Clark Williams (1):
version bump to 0.66

are available in the git repository at:

git://git.pengutronix.de/git/ukl/rt-tests.git for-clark

Uwe Kleine-König (3):
trivial: fix typo: "specifed" -> "specified"
Makefile: don't use temporary files in generation of dependency files rename pip to pip_stress as pip is too general

 .gitignore                           |    2 +-
 Makefile                             |    9 +++------
 src/cyclictest/cyclictest.8          |    2 +-
 src/include/{pip.h => pip_stress.h}  |    7 +++----
 src/pi_tests/{pip.c => pip_stress.c} |   10 +++++-----
 5 files changed, 13 insertions(+), 17 deletions(-)
 rename src/include/{pip.h => pip_stress.h} (93%)
 rename src/pi_tests/{pip.c => pip_stress.c} (98%)
Signature · 6 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by
#9 lore raw

Re: [PATCH 3/3] Makefile: don't use temporary files in generation of dependency files

2010/3/1 Uwe Kleine-König <[email protected]>:

Quoted 9 lines

Hey Clark,

I updated my tree to contain John's Acks, so if you want to pull ...

The changelogs are slightly improved since submission and the patch

       install backfire.c to $(srcdir)/backfire/

is skipped for now as John didn't understand it (yet).

Well, I would phrase it a tad differently. We're discussing what the best way is to deliver this, since it doesn't quite fit in to the rest of the package. However, at least for now,

Quoted 26 lines

Best regards
Uwe

The following changes since commit 73d48f4e04684a376b41525bfed030b7671f03f7:
 Clark Williams (1):
       version bump to 0.66

are available in the git repository at:

 git://git.pengutronix.de/git/ukl/rt-tests.git for-clark

Uwe Kleine-König (3):
     trivial: fix typo: "specifed" -> "specified"
     Makefile: don't use temporary files in generation of dependency files rename pip to pip_stress as pip is too general

 .gitignore                           |    2 +- Makefile                             |    9 +++------ src/cyclictest/cyclictest.8          |    2 +- src/include/{pip.h => pip_stress.h}  |    7 +++---- src/pi_tests/{pip.c => pip_stress.c} |   10 +++++-----

 5 files changed, 13 insertions(+), 17 deletions(-)

 rename src/include/{pip.h => pip_stress.h} (93%) rename src/pi_tests/{pip.c => pip_stress.c} (98%)

Quoted 8 lines

--
Pengutronix e.K.                           | Uwe Kleine-König            | Industrial Linux Solutions                 | http://www.pengutronix.de/  | --
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html