Module: xenomai-2.5
Branch: master
Commit: c52ae571014010a73e17ad741e64790b9b3faf59
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=c52ae571014010a73e17ad741e64790b9b3faf59
Author: Stefan Kisdaroczi <ki...@hispeed.ch>
Date: Mon May 3 10:37:09 2010 +0200
debian: sync with 2.5.2-2 from debian.org
---
debian/changelog | 17 +++++++++++++++++
debian/libxenomai1.dirs | 1 +
debian/libxenomai1.lintian | 7 ++++++-
debian/libxenomai1.modprobe | 3 +++
debian/libxenomai1.postinst | 20 ++++++++++++++++++--
debian/libxenomai1.xenomai.init | 1 -
debian/rules | 2 ++
debian/xenomai-runtime.install | 1 +
8 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d2d3cf..9f001a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xenomai (2.5.2-2) unstable; urgency=low
+
+ * Added patch from Stefan Kisdaroczi <ki...@hispeed.ch>:
+ - Create group xenomai on install
+ - Added a init-script which sets /sys/.../xenomai_gid if
+ /sys/.../xenomai_gid exists
+ - Added a modprobe-script that adds the xenomai_gid parameter if the user
+ did call modprobe without xenomai_gid=
+
+ -- Roland Stigge <sti...@antcom.de> Sun, 02 May 2010 17:06:14 +0200
+
+xenomai (2.5.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Roland Stigge <sti...@antcom.de> Mon, 29 Mar 2010 20:51:07 +0200
+
xenomai (2.5.1-4) unstable; urgency=low
* Added patches by Stefan Kisdaroczi <ki...@hispeed.ch>:
diff --git a/debian/libxenomai1.dirs b/debian/libxenomai1.dirs
index 1737ea1..35f4b51 100644
--- a/debian/libxenomai1.dirs
+++ b/debian/libxenomai1.dirs
@@ -1,2 +1,3 @@
+etc/modprobe.d
etc/udev/rules.d
usr/share/lintian/overrides
diff --git a/debian/libxenomai1.lintian b/debian/libxenomai1.lintian
index fe0da46..f5694a3 100644
--- a/debian/libxenomai1.lintian
+++ b/debian/libxenomai1.lintian
@@ -1,2 +1,7 @@
-# no contained shared library names refer to "xenomai", therefore own name
+# The package libxenomai1 first didn't contain a library called *xenomai*.
+# Therefore, I called it libxenomai1. Now, upstream introduced libxenomai0 in
+# the package. I'm leaving the package name libxenomai1 for now since
+# downgrading the number in the package name is probably a bad idea, and
+# synchronizing the package name with the SO version number isn't easily
+# possible anyway since the package contains several libraries.
libxenomai1: package-name-doesnt-match-sonames libanalogy1 libnative3 libpsos0
libpthread-rt1 librtai0 librtdk0 librtdm1 libuitron0 libvrtx0 libvxworks1
libxenomai0
diff --git a/debian/libxenomai1.modprobe b/debian/libxenomai1.modprobe
new file mode 100644
index 0000000..1953854
--- /dev/null
+++ b/debian/libxenomai1.modprobe
@@ -0,0 +1,3 @@
+install xeno_nucleus /sbin/modprobe --ignore-install xeno_nucleus
$CMDLINE_OPTS \
+ $(/usr/bin/test $(/bin/echo -n '$CMDLINE_OPTS' | /bin/grep xenomai_gid) \
+ || /usr/bin/getent group xenomai | /usr/bin/cut -d: -f3 | /bin/sed -e
's/^/xenomai_gid\=/')
diff --git a/debian/libxenomai1.postinst b/debian/libxenomai1.postinst
index 8afc6fc..97c3476 100644
--- a/debian/libxenomai1.postinst
+++ b/debian/libxenomai1.postinst
@@ -1,6 +1,22 @@
#!/bin/sh -e
-rm -f /etc/udev/rules.d/xenomai.rules
-ln -sf ../xenomai.rules /etc/udev/rules.d/xenomai.rules
+case "$1" in
+ configure)
+ # Add the xenomai group unless it's already there
+ if ! getent group xenomai >/dev/null; then
+ addgroup --quiet --system xenomai || true
+ fi
+ rm -f /etc/udev/rules.d/xenomai.rules
+ ln -sf ../xenomai.rules /etc/udev/rules.d/xenomai.rules
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
#DEBHELPER#
diff --git a/debian/libxenomai1.xenomai.init b/debian/libxenomai1.xenomai.init
index ebb5092..e243b5e 100644
--- a/debian/libxenomai1.xenomai.init
+++ b/debian/libxenomai1.xenomai.init
@@ -24,7 +24,6 @@ case "$1" in
echo "-1" > $FILENAME
;;
restart|force-reload)
- $0 stop
$0 start
;;
*)
diff --git a/debian/rules b/debian/rules
index 4cb53a3..e39977d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ endif
CONFIG_OPTS += --prefix=/usr \
--includedir=/usr/include/xenomai \
--mandir=/usr/share/man \
+ --with-testdir=/usr/lib/xenomai
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CONFIG_OPTS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
@@ -97,6 +98,7 @@ install: build
for f in $(CURDIR)/ksrc/nucleus/udev/*.rules ; do \
cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \
done
+ install -m 644 debian/libxenomai1.modprobe
$(CURDIR)/debian/libxenomai1/etc/modprobe.d/xenomai.conf
# remove empty directory
rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps
cp debian/libxenomai1.lintian
$(CURDIR)/debian/libxenomai1/usr/share/lintian/overrides/libxenomai1
diff --git a/debian/xenomai-runtime.install b/debian/xenomai-runtime.install
index c9eee75..d1dbe13 100644
--- a/debian/xenomai-runtime.install
+++ b/debian/xenomai-runtime.install
@@ -2,3 +2,4 @@ usr/bin
usr/sbin
usr/share/man
usr/share/xenomai
+usr/lib/xenomai
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
