[Xenomai-core] Script marking

[Xenomai-core] Script marking

[Roland Stigge]

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

Hi,

at Debian, I noticed that the "run" scripts are not marked as such and
therefore produce "lintian errors". Consider the attached patch that I
propose.

Besides, the documentation seems to be installed under
/usr/share/doc/xenomai-2.4.2. Shouldn't /usr/share/doc/xenomai be more
appropriate? (I implemented the latter in Debian.)

Further, I updated the package in Debian with the suggested changes.

bye,
  Roland

[-- Attachment #2: xenomai.patch --]
[-- Type: text/x-patch, Size: 4668 bytes --]

diff -ruN xenomai-2.4.2/src/testsuite/clocktest/Makefile.am xenomai-2.4.2.new/src/testsuite/clocktest/Makefile.am
--- xenomai-2.4.2/src/testsuite/clocktest/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/clocktest/Makefile.am	2008-02-28 21:29:24.000000000 +0100
@@ -14,7 +14,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:
diff -ruN xenomai-2.4.2/src/testsuite/cyclic/Makefile.am xenomai-2.4.2.new/src/testsuite/cyclic/Makefile.am
--- xenomai-2.4.2/src/testsuite/cyclic/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/cyclic/Makefile.am	2008-02-28 21:34:34.000000000 +0100
@@ -14,7 +14,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:
diff -ruN xenomai-2.4.2/src/testsuite/irqbench/Makefile.am xenomai-2.4.2.new/src/testsuite/irqbench/Makefile.am
--- xenomai-2.4.2/src/testsuite/irqbench/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/irqbench/Makefile.am	2008-02-28 21:31:22.000000000 +0100
@@ -34,7 +34,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:
diff -ruN xenomai-2.4.2/src/testsuite/latency/Makefile.am xenomai-2.4.2.new/src/testsuite/latency/Makefile.am
--- xenomai-2.4.2/src/testsuite/latency/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/latency/Makefile.am	2008-02-28 21:32:02.000000000 +0100
@@ -18,7 +18,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:
diff -ruN xenomai-2.4.2/src/testsuite/switchbench/Makefile.am xenomai-2.4.2.new/src/testsuite/switchbench/Makefile.am
--- xenomai-2.4.2/src/testsuite/switchbench/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/switchbench/Makefile.am	2008-02-28 21:32:38.000000000 +0100
@@ -17,7 +17,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:
diff -ruN xenomai-2.4.2/src/testsuite/switchtest/Makefile.am xenomai-2.4.2.new/src/testsuite/switchtest/Makefile.am
--- xenomai-2.4.2/src/testsuite/switchtest/Makefile.am	2007-12-09 11:46:39.000000000 +0100
+++ xenomai-2.4.2.new/src/testsuite/switchtest/Makefile.am	2008-02-28 21:30:41.000000000 +0100
@@ -14,7 +14,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(testdir)
 	@sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > $(DESTDIR)$(testdir)/.runinfo
-	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" > $(DESTDIR)$(testdir)/run
+	@echo "#!/bin/sh" > $(DESTDIR)$(testdir)/run
+	@echo "\$${DESTDIR}$(exec_prefix)/bin/xeno-load \`dirname \$$0\` \$$*" >> $(DESTDIR)$(testdir)/run
 	@chmod +x $(DESTDIR)$(testdir)/run
 
 uninstall-local:

Re: [Xenomai-core] Script marking

[Gilles Chanteperdrix]

On Thu, Feb 28, 2008 at 9:43 PM, Roland Stigge <stigge@domain.hid> wrote:
> Hi,
>
>  at Debian, I noticed that the "run" scripts are not marked as such and
>  therefore produce "lintian errors". Consider the attached patch that I
>  propose.
>
>  Besides, the documentation seems to be installed under
>  /usr/share/doc/xenomai-2.4.2. Shouldn't /usr/share/doc/xenomai be more
>  appropriate? (I implemented the latter in Debian.)
>
>  Further, I updated the package in Debian with the suggested changes.

We trust you, please send patches.

-- 
                                               Gilles Chanteperdrix

Re: [Xenomai-core] Script marking

[Roland Stigge]

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

Gilles Chanteperdrix wrote:
>>  Further, I updated the package in Debian with the suggested changes.
> 
> We trust you, please send patches.

The attached patch (and the latest version of it) can also always be
found at the Debian developer's package page for Xenomai at
http://packages.qa.debian.org/x/xenomai.html .

It applies to the latest Xenomai release (currently 2.4.2), and assumes
that there is _no_ debian/ directory in the original source tree (as
discussed beforehand - Debian maintains the complete debian/* hierarchy
completely - for further questions just ask).

bye,
  Roland

[-- Attachment #2: xenomai_2.4.2-2.diff.gz --]
[-- Type: text/html, Size: 6651 bytes --]

Re: [Xenomai-core] Script marking

[Gilles Chanteperdrix]

On Fri, Feb 29, 2008 at 2:49 PM, Roland Stigge <stigge@domain.hid> wrote:
> Gilles Chanteperdrix wrote:
>  >>  Further, I updated the package in Debian with the suggested changes.
>  >
>  > We trust you, please send patches.
>
>  The attached patch (and the latest version of it) can also always be
>  found at the Debian developer's package page for Xenomai at
>  http://packages.qa.debian.org/x/xenomai.html .
>
>  It applies to the latest Xenomai release (currently 2.4.2), and assumes
>  that there is _no_ debian/ directory in the original source tree (as
>  discussed beforehand - Debian maintains the complete debian/* hierarchy
>  completely - for further questions just ask).

I see that xenomai packages depends on glibc version >= 2.7.1. Is this
dependency really needed ? Without this dependency it would be
possible to compile the Xenomai package for older versions of Debian.

-- 
                                               Gilles Chanteperdrix

Re: [Xenomai-core] Script marking

[Roland Stigge]

Hi,

Gilles Chanteperdrix wrote:
> I see that xenomai packages depends on glibc version >= 2.7.1. Is this
> dependency really needed ? Without this dependency it would be
> possible to compile the Xenomai package for older versions of Debian.

This is an automatically generated dependency at package built time
_only_ for Debian sid (to be released later), and only for the binary
package.

If you build the package for yourself, or in another Debian environment
(an already released version, e.g. for backporting?), the dependency
would look different. Theoretically, it could even be sth. else than
glibc. ;-O

The versioned dependency is for safety reasons, not always really
necessary, but provided be default; taken from the actual build
environment...

bye,
  Roland

Re: [Xenomai-core] Script marking

[Gilles Chanteperdrix]

Roland Stigge wrote:
 > Gilles Chanteperdrix wrote:
 > >>  Further, I updated the package in Debian with the suggested changes.
 > > 
 > > We trust you, please send patches.
 > 
 > The attached patch (and the latest version of it) can also always be
 > found at the Debian developer's package page for Xenomai at
 > http://packages.qa.debian.org/x/xenomai.html .
 > 
 > It applies to the latest Xenomai release (currently 2.4.2), and assumes
 > that there is _no_ debian/ directory in the original source tree (as
 > discussed beforehand - Debian maintains the complete debian/* hierarchy
 > completely - for further questions just ask).

Hi Paul,

Is it Ok for you to replace the repository debian directory current
contents with the debian directory as provided by Roland ? Or will it
break things on your side ?

Regards.

-- 


					    Gilles Chanteperdrix.

Re: [Xenomai-core] Script marking

[Paul]

Hi Giles

First, sorry about not jumping in on some of the other threads about Debian 
and packaging...

On Friday 29 February 2008 19:50, Gilles Chanteperdrix wrote:
> Roland Stigge wrote:
>  > Gilles Chanteperdrix wrote:
>  > >>  Further, I updated the package in Debian with the suggested changes.
>  > >
>  > > We trust you, please send patches.
>  >
>  > The attached patch (and the latest version of it) can also always be
>  > found at the Debian developer's package page for Xenomai at
>  > http://packages.qa.debian.org/x/xenomai.html .
>  >
>  > It applies to the latest Xenomai release (currently 2.4.2), and assumes
>  > that there is _no_ debian/ directory in the original source tree (as
>  > discussed beforehand - Debian maintains the complete debian/* hierarchy
>  > completely - for further questions just ask).
>
> Hi Paul,
>
> Is it Ok for you to replace the repository debian directory current
> contents with the debian directory as provided by Roland ? Or will it
> break things on your side ?

I have no problem with Roland's changes, it won't break anything I do. The 
relevant wiki page will need to be updated to reflect the extra packages that 
are generated, but that is a minor detail.

On a personal level, I would like to see a debian/ structure retained within 
SVN - This simplifies test builds and allows changes (such as merged x86 
trees) to be tackled before (Debian) releases are made.


Regards, Paul.

Re: [Xenomai-core] Script marking

[Gilles Chanteperdrix]

Paul wrote:
 > 
 > Hi Giles
 > 
 > First, sorry about not jumping in on some of the other threads about Debian 
 > and packaging...
 > 
 > On Friday 29 February 2008 19:50, Gilles Chanteperdrix wrote:
 > > Roland Stigge wrote:
 > >  > Gilles Chanteperdrix wrote:
 > >  > >>  Further, I updated the package in Debian with the suggested changes.
 > >  > >
 > >  > > We trust you, please send patches.
 > >  >
 > >  > The attached patch (and the latest version of it) can also always be
 > >  > found at the Debian developer's package page for Xenomai at
 > >  > http://packages.qa.debian.org/x/xenomai.html .
 > >  >
 > >  > It applies to the latest Xenomai release (currently 2.4.2), and assumes
 > >  > that there is _no_ debian/ directory in the original source tree (as
 > >  > discussed beforehand - Debian maintains the complete debian/* hierarchy
 > >  > completely - for further questions just ask).
 > >
 > > Hi Paul,
 > >
 > > Is it Ok for you to replace the repository debian directory current
 > > contents with the debian directory as provided by Roland ? Or will it
 > > break things on your side ?
 > 
 > I have no problem with Roland's changes, it won't break anything I do. The 
 > relevant wiki page will need to be updated to reflect the extra packages that 
 > are generated, but that is a minor detail.

IMO, the page should be updated to talk about the official Debian
packages as well.

 > 
 > On a personal level, I would like to see a debian/ structure retained within 
 > SVN - This simplifies test builds and allows changes (such as merged x86 
 > trees) to be tackled before (Debian) releases are made.

I agree. This is a way to build Xenomai which we should not
remove. Roland also has the choice to use it if he changes his mind.

-- 


					    Gilles Chanteperdrix.