[PATCH 0/2] Debian's rt-tests patches

[PATCH 0/2] Debian's rt-tests patches

[Uwe Kleine-König]

Hi Clark,

here come two patches I use for packaging rt-tests for Debian.  Actually
I have two more patches[*1*], but one of them is Debian specific
and the other one installs hwlatdetect to /usr/sbin instead of
/usr/lib/pythonX.Y/site-packages + a symlink as this confuses debhelper.
Maybe the right approach is to install a script to /usr/sbin that just
does

	exec python -m hwlatdetect

?!  Another thing I do in the Debian packages is using dkms for building
the backfire kernel module at install time.  I don't know how this
works with Redhat's Linux distributions though.

I'll send the two patches that I think are ready for you to include as a
reply to this mail.  Diffstat, shortlog and an URL to pull these two are
included below.

Best regards
Uwe

[*1*] see http://patch-tracker.debian.org/package/rt-tests/0.71-1

The following changes since commit 886d26833d637ab778023626a158061e4eb9c5d0:

  version bump to 0.72 (2010-06-25 16:16:46 -0500)

are available in the git repository at:
  git://git.pengutronix.de/git/ukl/rt-tests.git for-clark

Uwe Kleine-König (2):
      modernize backfire's Makefile
      install backfire's Makefile

 Makefile              |    1 +
 src/backfire/Makefile |   21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

-- 
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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] modernize backfire's Makefile

[Uwe Kleine-König]

- don't rely on non-standard envvar PWD, use make's CURDIR instead
- allow overwriting KERNELDIR
- less repetition by conflating targets
- explicitly differentiate between kbuild and ordinary make part

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 src/backfire/Makefile |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/backfire/Makefile b/src/backfire/Makefile
index b5d2b3e..bbad91a 100644
--- a/src/backfire/Makefile
+++ b/src/backfire/Makefile
@@ -1,14 +1,17 @@
+# If KERNELRELEASE is defined, we've been invoked from the
+# kernel build system and can use its language
+ifneq ($(KERNELRELEASE),)
 obj-m := backfire.o
 
-all:	modules modules_install
-	@echo Done
+# otherwise we were called directly from the command
+# line; invoke the kernel build system.
+else
+KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 
-modules:
-	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+modules modules_install clean::
+	make -C $(KERNELDIR) M=$(CURDIR) $@
 
-modules_install:
-	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules_install
+clean::
+	rm -f *.o Module.markers modules.order
 
-clean:
-	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean
-	@rm -f *.o Module.markers modules.order
+endif
-- 
1.7.1

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

[PATCH 2/2] install backfire's Makefile

[Uwe Kleine-König]

Only installing backfire.c hardly makes sense.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index b83614c..3554bec 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@ install: all
 	fi
 	mkdir -p "$(DESTDIR)$(srcdir)/backfire"
 	install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
+	install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
 	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.7.1

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

Re: [PATCH 0/2] Debian's rt-tests patches

[Clark Williams]

[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]

On Thu, 1 Jul 2010 07:24:30 +0200
Uwe Kleine-König  <u.kleine-koenig@pengutronix.de> wrote:

> Hi Clark,
> 
> here come two patches I use for packaging rt-tests for Debian.  Actually
> I have two more patches[*1*], but one of them is Debian specific
> and the other one installs hwlatdetect to /usr/sbin instead of
> /usr/lib/pythonX.Y/site-packages + a symlink as this confuses debhelper.
> Maybe the right approach is to install a script to /usr/sbin that just
> does
> 
> 	exec python -m hwlatdetect
> 
> ?!  Another thing I do in the Debian packages is using dkms for building
> the backfire kernel module at install time.  I don't know how this
> works with Redhat's Linux distributions though.
> 
> I'll send the two patches that I think are ready for you to include as a
> reply to this mail.  Diffstat, shortlog and an URL to pull these two are
> included below.
> 
> Best regards
> Uwe
> 
> [*1*] see http://patch-tracker.debian.org/package/rt-tests/0.71-1
> 
> The following changes since commit 886d26833d637ab778023626a158061e4eb9c5d0:
> 
>   version bump to 0.72 (2010-06-25 16:16:46 -0500)
> 
> are available in the git repository at:
>   git://git.pengutronix.de/git/ukl/rt-tests.git for-clark
> 
> Uwe Kleine-König (2):
>       modernize backfire's Makefile
>       install backfire's Makefile
> 
>  Makefile              |    1 +
>  src/backfire/Makefile |   21 ++++++++++++---------
>  2 files changed, 13 insertions(+), 9 deletions(-)

Thanks Uwe, I'll try and get these merged after the holiday this
weekend. 

Clark

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]