Am 26.02.2010 15:07, schrieb Philippe Gerum: > On Fri, 2010-02-26 at 14:48 +0100, Stefan Kisdaroczi wrote: >> Am 26.02.2010 14:28, schrieb Philippe Gerum: >>> On Fri, 2010-02-26 at 14:13 +0100, Stefan Kisdaroczi wrote: >>>> Am 24.02.2010 14:13, schrieb Philippe Gerum: >>>>> On Wed, 2010-02-24 at 14:11 +0100, Philippe Gerum wrote: >>>>>> On Wed, 2010-02-24 at 14:06 +0100, Stefan Kisdaroczi wrote: >>>>>>> Hi Philippe, >>>>>>> >>>>>>> Am 23.02.2010 18:46, schrieb Philippe Gerum: >>>>>>>> On Tue, 2010-02-23 at 17:52 +0100, Stefan Kisdaroczi wrote: >>>>>>>>> Hi, >>>>>>>>> >>>>>>>>> Am 14.02.2010 10:38, schrieb Philippe Gerum: >>>>>>>>>> >>>>>>>>>> <snip> >>>>>>>>>> In the future, maybe we could simply provide a wrapper script >>>>>>>>>> accepting >>>>>>>>>> sub-commands, such as "xeno latency, xeno sigtest" etc, to be put >>>>>>>>>> into /usr/bin by distros, which would hide the actual location of >>>>>>>>>> those >>>>>>>>>> binaries? >>>>>>>>>> >>>>>>>>>> In any case, thanks for your work so far. We probably need to discuss >>>>>>>>>> the packaging issues on this list, so that we get both consistency >>>>>>>>>> and >>>>>>>>>> usability in the future. >>>>>>>>>> >>>>>>>>>> Gilles and Roland, if this is fine with you, I'll handle the liaison >>>>>>>>>> role with upstream packagers, so please CC me explicitly on those >>>>>>>>>> mails. >>>>>>>>>> We'll sort out this issue, it doesn't look that bad anyway. >>>>>>>>> >>>>>>>>> Roland added a xeno wrapper to the debian.org xenomai package 2.5.1-3. >>>>>>>>> >>>>>>>>> I synced now the debian/ directories from debian.org and xenomai.org: >>>>>>>>> - For debian.org I sent patches to the Debian bugtracker [1] [2]. >>>>>>>>> Another patch for dpkg-cross support [3] I sent to Roland >>>>>>>>> privately. >>>>>>>>> - For xenomai.org I attached patches to this mail (against -2.5.git). >>>>>>>>> >>>>>>>>> If both parties apply the patches the debian directories are in sync, >>>>>>>>> except some minor differences in the debian/control file, see patch >>>>>>>>> do-not-commit-please.patch. I would like to keep these changes out so >>>>>>>>> that the xenomai.org packages are compatible with Debian 5.0 Lenny. >>>>>>>>> The debian.org packages are for Debian 6.0 Squeeze. >>>>>>>>> >>>>>>>> >>>>>>>> Merged into my queue (except the last one as mentioned). This will be >>>>>>>> pushed upstream to Gilles for 2.5.2. Thanks. >>>>>>> >>>>>>> I took a look at your branch for-upstream. Your commit >>>>>>> scripts: add wrapper script to run standard Xenomai commands >>>>>>> 6e0574791f48cbf8b3421a68c5789254e7d084b7 >>>>>>> adds the same wrapper as my patch >>>>>>> 0005-debian-wrapper-script-usr-bin-xeno-to-call-executa.patch >>>>>>> debian: wrapper script /usr/bin/xeno to call executables in >>>>>>> /usr/lib/xenomai/ >>>>>>> fbe86cc50d3a65cd23e93d43adba4ed369fe70b1 >>>>>>> Please revert the commit of my patch, we need another fix for >>>>>>> debian/rules for "your" wrapper. >>>>>>> >>>>>> >>>>>> Ok, I thought your patch set was based on my tree, so I did not check >>>>>> thoroughly. I did not send any pull request to Gilles, so no harm done. >>>>>> >>>>>>> How do I call configure to install the wrapper in /usr/bin and >>>>>>> the programs like latency, switchtest etc. to /usr/lib/xenomai ? >>>>>>> >>>>>> >>>>>> We need some fixage in scripts/wrappers/Makefile.am to do that. I'll >>>>>> prepare this asap. >>>>> >>>>> scripts/Makefile.am... >>>> >>>> Hi Philippe, >>>> >>>> I just tried the --with-testdir switch. It worked, but i'm not really sure >>>> if >>>> this is the right track. >>>> >>>> Roland's packages install all binaries to /usr/lib/xenomai, except xeno and >>>> xeno-config. You state in your commit message more or less the same goal: >>>> "At some point, all remaining executables or scripts left under >>>> $prefix/bin should match >>>> xeno*, to further reduce the odds of causing name collisions." >>>> >>>> Using --with-testdir all tests (latency,switchtest,...) are now in >>>> /usr/lib/xenomai. >>>> To install the "utils" (rtcansend,insn_write,insn_write,cmd_read,...) to >>>> the same >>>> directory using --with-testdir sounds not obviously. You could add a >>>> second switch >>>> --with-utildir, but a second dir will not work for the xeno-wrapper-script. >>>> >>> >>> CAN and other utilities should definitely remain in $bindir. The fact >>> that they are not prefixed by xeno* is another thing; CAN utilities are >>> already prefixed, maybe Analogy ones should be named in a bit less >>> generic way, although they are not raising any conflict today. I wrote >>> that what's under $bindir "should" match xeno* when a risk of collision >>> exists, but there is no point in enforcing a stricter rule at this >>> point. In any case, I don't want to enforce a never-in-bindir rule for >>> all Xenomai binaries, we can still pick their names in a way that avoids >>> obvious issues. >>> >>> The real problem was about tests, for which using rather generic names >>> made sense. This is what that patch is for. >> >> ok, got the goal now, thanks for the explanation. >> But "xeno.in" needs a fix to use @XENO_TEST_DIR@, no? >> > > Yes, I overlooked that. In fact, I think we may not even need the new > xeno wrapper at all, but we probably want to rewrite xeno-test to wrap > to what is in XENO_TEST_DIR now. > > I would suggest to hold the changes to the debian/ area for now, until
Agree with holding back wrapper-changes, but please consider the attached patch with small fixes, thanks. (against rpm/for-upstream) > the dust has settled a bit. We are trying to fix long-standing problems > in the way we allow people to test their setup. > >>>> I think something like using --bindir=/usr/lib/xenomai and >>>> --wrapperdir=/usr/bin >>>> is probably better, as there are less exceptions. >>>> >>>> For the test I patched xeno.in: exec @XENO_TEST_DIR@/$@ >> >> >>>> >>>> Stefan >>>> >>>>>> >>>>>>> Stefan >>>>>>> >>>>>>>> >>>>>>>>> Thanks >>>>>>>>> kisda >>>>>>>>> >>>>>>>>> [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571099 >>>>>>>>> [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571104 >>>>>>>>> [3] >>>>>>>>> http://git.xenomai.org/?p=xenomai-2.5.git;a=commitdiff;h=5bcd18f714f4cbeaaac0cc4a08e6c9f375aa3b77 >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>> >>>>> >>>> >>>> >>> >>> >> >> > >
From a730e95eca146e944e376e0d28bcfa536dd6a062 Mon Sep 17 00:00:00 2001
From: Stefan Kisdaroczi <ki...@hispeed.ch>
Date: Wed, 3 Mar 2010 17:17:35 +0100
Subject: [PATCH] debian: fix package libxenomai1
---
debian/changelog | 9 +++++++++
debian/libxenomai1.dirs | 2 +-
debian/libxenomai1.lintian | 2 +-
debian/rules | 6 +++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 45736a4..6d2d3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xenomai (2.5.1-4) unstable; urgency=low
+
+ * Added patches by Stefan Kisdaroczi <ki...@hispeed.ch>:
+ - debian/copyright: Typo and email address (Closes: #571099)
+ - debian/control: ia64 support removed (Closes: #571104)
+ - debian/rules: Added dpkg-cross support
+
+ -- Roland Stigge <sti...@antcom.de> Wed, 24 Feb 2010 22:20:10 +0100
+
xenomai (2.5.1-3) unstable; urgency=low
* xenomai-runtime: Replaced "xenomai-" prefixed executables with
diff --git a/debian/libxenomai1.dirs b/debian/libxenomai1.dirs
index d5bb34f..1737ea1 100644
--- a/debian/libxenomai1.dirs
+++ b/debian/libxenomai1.dirs
@@ -1,2 +1,2 @@
-etc/udev
+etc/udev/rules.d
usr/share/lintian/overrides
diff --git a/debian/libxenomai1.lintian b/debian/libxenomai1.lintian
index 0f6a514..fe0da46 100644
--- a/debian/libxenomai1.lintian
+++ b/debian/libxenomai1.lintian
@@ -1,2 +1,2 @@
# no contained shared library names refer to "xenomai", therefore own name
-libxenomai1: package-name-doesnt-match-sonames libanalogy1 libnative3 libpsos0
libpthread-rt1 librtai0 librtdk0 librtdm1 libuitron0 libvrtx0 libvxworks1
+libxenomai1: package-name-doesnt-match-sonames libanalogy1 libnative3 libpsos0
libpthread-rt1 librtai0 librtdk0 librtdm1 libuitron0 libvrtx0 libvxworks1
libxenomai0
diff --git a/debian/rules b/debian/rules
index fa93f62..a538800 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
dh_install --sourcedir=$(CURDIR)/debian/tmp
@@ -108,8 +108,8 @@ binary-indep: build install
dh_testdir -i
dh_testroot -i
dh_installdocs -i -A CREDITS README.INSTALL TROUBLESHOOTING
- dh_installchangelogs -i
dh_link -i
+ dh_installchangelogs -i
dh_strip -i
dh_compress -i -X.pdf
dh_fixperms -i
@@ -131,8 +131,8 @@ binary-arch: build install
dh_testroot -s
dh_installman -s
dh_installdocs -s -A CREDITS README.INSTALL TROUBLESHOOTING
- dh_installchangelogs -s
dh_link -s
+ dh_installchangelogs -s
dh_strip -s
dh_compress -s
dh_fixperms -s
--
1.5.6.5
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Xenomai-core mailing list Xenomai-core@gna.org https://mail.gna.org/listinfo/xenomai-core
