Module: xenomai-forge Branch: next Commit: a3a8249023652bc31238db554ec5a788b5016b46 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=a3a8249023652bc31238db554ec5a788b5016b46
Author: Gernot Hillier <gernot.hill...@siemens.com> Date: Fri Nov 8 10:34:17 2013 +0100 debian: forward port packaging rules from 2.6 --- debian/changelog | 18 ++++++++ debian/compat | 2 +- debian/control | 32 +++++++------- debian/libxenomai-dev.install | 2 +- debian/linux-patch-xenomai.README.Debian | 17 -------- debian/linux-patch-xenomai.kpatches.in | 3 -- debian/rules | 65 +++++++--------------------- debian/xenomai-kernel-source.README.Debian | 20 +++++++++ debian/xenomai-runtime.install | 1 - scripts/bootstrap | 2 +- scripts/wrap-link.sh | 4 ++ 11 files changed, 77 insertions(+), 89 deletions(-) diff --git a/debian/changelog b/debian/changelog index c69851e..666b446 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +xenomai (2.99.0) UNRELEASED; urgency=low + + * Prepare Debian packaging for Xenomai-forge + + -- Xenomai <xeno...@xenomai.org> Wed, 20 Nov 2013 09:33:50 +0200 + +xenomai (2.6.3) unstable; urgency=low + + * New release + + -- Xenomai <xeno...@xenomai.org> Fri, 30 Aug 2013 22:34:50 +0200 + +xenomai (2.6.1) unstable; urgency=low + + * New release, integrated with debian/ subdir + + -- Roland Stigge <sti...@antcom.de> Fri, 03 Aug 2012 14:49:57 +0200 + xenomai (2.5.3) unstable; urgency=low * Switch to dpkg-source 3.0 (native) format diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 3c744ca..1da7238 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: xenomai Section: devel Priority: extra -Maintainer: Roland Stigge <sti...@antcom.de> -Build-Depends: debhelper (>= 7), dh-kpatches, findutils (>= 4.2.28) -Standards-Version: 3.9.1 +Maintainer: Xenomai <xeno...@xenomai.org> +Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, libtool +Standards-Version: 3.9.3 Homepage: http://www.xenomai.org/ Package: xenomai-runtime Section: devel Architecture: amd64 arm armeb armel i386 powerpc Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: linux-patch-xenomai, xenomai-doc +Suggests: xenomai-kernel-source, xenomai-doc Replaces: xenomai Conflicts: xenomai Description: Xenomai runtime utilities @@ -24,12 +24,12 @@ Description: Xenomai runtime utilities This package contains the runtime programs and the testsuite for the Xenomai realtime system. -Package: linux-patch-xenomai +Package: xenomai-kernel-source Section: kernel Architecture: all -Depends: ${kpatch:Depends}, ${misc:Depends} -Suggests: xenomai, linux-source-2.6, kernel-package -Description: Linux kernel patches for Xenomai +Depends: ${misc:Depends} +Suggests: xenomai, linux-source, kernel-package +Description: Source for Xenomai kernel-space support Xenomai is a real-time development framework cooperating with the Linux kernel in order to provide a pervasive, interface-agnostic, hard real-time support to user-space applications, seamlessly integrated into the GNU/Linux @@ -37,19 +37,19 @@ Description: Linux kernel patches for Xenomai make migration from other RTOS easier. Examples are: pSOS+, VxWorks, VRTX, uiTRON, POSIX. . - This package contains patches for 2.6 series kernels - These are intended for - use with kernel-package and a virgin Linux source tree. Note: These patches - include the base adeos-ipipe patch along with all the additional material - normally added by the prepare-kernel.sh script. - . - This package contains the following patches: + This package contains sources for Xenomai kernel-space support - + These are intended for use with kernel-package and a virgin Linux + source tree. . + Note: These sources are included with the prepare-kernel.sh script + which should be run to patch the Linux kernel sources with Xenomai + kernel-space support. Package: libxenomai1 Section: libs Architecture: amd64 arm armeb armel i386 powerpc Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: linux-patch-xenomai, xenomai-doc +Suggests: xenomai-kernel-source, xenomai-doc Replaces: xenomai Conflicts: xenomai Description: Shared libraries for Xenomai @@ -66,7 +66,7 @@ Package: libxenomai-dev Section: libdevel Architecture: amd64 arm armeb armel i386 powerpc Depends: libxenomai1 (= ${binary:Version}), ${misc:Depends} -Suggests: linux-patch-xenomai, xenomai-doc +Suggests: xenomai-kernel-source, xenomai-doc Replaces: xenomai Conflicts: xenomai Description: Headers and static libs for Xenomai diff --git a/debian/libxenomai-dev.install b/debian/libxenomai-dev.install index 0fbe55b..40ae57d 100644 --- a/debian/libxenomai-dev.install +++ b/debian/libxenomai-dev.install @@ -4,5 +4,5 @@ usr/lib/*.la usr/lib/*.a usr/lib/*.so usr/lib/cobalt.wrappers +usr/lib/dynlist.ld usr/share/man/man1/xeno-config.1 -../../examples usr/share/libxenomai-dev diff --git a/debian/linux-patch-xenomai.README.Debian b/debian/linux-patch-xenomai.README.Debian deleted file mode 100644 index 3304bf5..0000000 --- a/debian/linux-patch-xenomai.README.Debian +++ /dev/null @@ -1,17 +0,0 @@ -Xenomai kernel patches in Debian -================================ - -With this package, you can patch and build kernels suitable for usage with -Xenomai. This can be done with, e.g.: - -# cd /usr/src/linux-source-2.6.32 -# /usr/src/kernel-patches/i386/apply/xenomai -# make config -# make-kpkg --rootcmd fakeroot --initrd kernel_image - -This is intended for vanilla and Debian kernel sources. - -NOTE: In the kernel config, PARAVIRT should be turned off for Xenomai kernels - to compile successfully. - - -- Roland Stigge <sti...@antcom.de>, Sun, 14 Feb 2010 15:14:40 +0100 diff --git a/debian/linux-patch-xenomai.kpatches.in b/debian/linux-patch-xenomai.kpatches.in deleted file mode 100644 index 7348a5a..0000000 --- a/debian/linux-patch-xenomai.kpatches.in +++ /dev/null @@ -1,3 +0,0 @@ -Patch-name: Xenomai realtime kernel patches -Patch-id: xenomai -Architecture: all diff --git a/debian/rules b/debian/rules index de5827f..46a89b1 100755 --- a/debian/rules +++ b/debian/rules @@ -6,39 +6,17 @@ #export DH_VERBOSE=1 +export DEB_BUILD_HARDENING=1 + DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_HOST_ARCH), i386) -# Note: Would like to use --includedir=/usr/include/xenomai, but -# there appears to be a `make install` problem. - CONFIG_OPTS = \ - --enable-x86-tsc -endif -ifeq ($(DEB_HOST_ARCH), amd64) - CONFIG_OPTS = \ - --enable-smp \ - --enable-x86-tsc \ - --enable-x86-sep -endif -ifeq ($(DEB_HOST_ARCH), powerpc) - CONFIG_OPTS = -endif -ifeq ($(DEB_HOST_ARCH), armeb) - CONFIG_OPTS = --enable-arm-mach=generic --enable-arm-eabi -endif -ifeq ($(DEB_HOST_ARCH), armel) - CONFIG_OPTS = --enable-arm-mach=generic --enable-arm-eabi -endif -ifeq ($(DEB_HOST_ARCH), arm) - CONFIG_OPTS = --enable-arm-mach=generic -endif - CONFIG_OPTS += --prefix=/usr \ - --includedir=/usr/include/xenomai \ - --mandir=/usr/share/man \ - --with-testdir=/usr/lib/xenomai +CONFIG_OPTS = --prefix=/usr \ + --includedir=/usr/include/xenomai \ + --mandir=/usr/share/man \ + --with-testdir=/usr/lib/xenomai/testsuite ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CONFIG_OPTS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) @@ -49,7 +27,7 @@ endif build: build-arch build-indep build-arch: build-arch-stamp -build-arch-stamp: config.status patch-stamp +build-arch-stamp: config.status dh_testdir $(MAKE) touch build-arch-stamp @@ -59,31 +37,24 @@ build-indep-stamp: config.status dh_testdir touch build-indep-stamp -patch-stamp: - dh_testdir - cp debian/linux-patch-xenomai.kpatches.in debian/linux-patch-xenomai.kpatches - for i in arm i386 powerpc x86_64 x86 ; do \ - bash $(CURDIR)/scripts/prepare-patch.sh $$i ; \ - done - touch patch-stamp - config.status: configure-stamp configure-stamp: dh_testdir + autoreconf -fi ./configure $(CONFIG_OPTS) touch configure-stamp clean: dh_testdir dh_testroot - rm -f *-stamp - dh_clean - if test -f Makefile ; then \ + rm -f configure-stamp build-indep-stamp build-arch-stamp + -if test -f Makefile ; then \ $(MAKE) distclean ; \ fi + dh_clean rm -fR $(CURDIR)/tmp rm -f $(CURDIR)/*.patch - rm -f $(CURDIR)/debian/*.kpatches + -rm -f configure install: build dh_testdir @@ -103,13 +74,14 @@ install: build rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps cp debian/libxenomai1.lintian $(CURDIR)/debian/libxenomai1/usr/share/lintian/overrides/libxenomai1 cp debian/libxenomai-dev.lintian $(CURDIR)/debian/libxenomai-dev/usr/share/lintian/overrides/libxenomai-dev - dh_installkpatches + mkdir -p $(CURDIR)/debian/xenomai-kernel-source/usr/src/xenomai-kernel-source $(CURDIR)/debian/xenomai-kernel-source/usr/share/doc/xenomai-kernel-source + cp -a kernel include scripts $(CURDIR)/debian/xenomai-kernel-source/usr/src/xenomai-kernel-source # Build architecture-independent files here. binary-indep: build install dh_testdir -i dh_testroot -i - dh_installdocs -i -A CREDITS README.INSTALL TROUBLESHOOTING + dh_installdocs -i -A README.INSTALL TROUBLESHOOTING dh_link -i dh_installchangelogs -i dh_strip -i @@ -119,11 +91,6 @@ binary-indep: build install dh_installdeb -i dh_shlibdeps -i dh_gencontrol -i -# Here follows a little hackery to insert the patch list -# into the control file for linux-patch-xenomai - cat $(CURDIR)/debian/linux-patch-xenomai.kpatches | \ - sed -e 's/^$$/./;s/^/ /' >> \ - $(CURDIR)/debian/linux-patch-xenomai/DEBIAN/control dh_md5sums -i dh_builddeb -i @@ -133,7 +100,7 @@ binary-arch: build install dh_testroot -s dh_installinit -s --name=xenomai dh_installman -s - dh_installdocs -s -A CREDITS README.INSTALL TROUBLESHOOTING + dh_installdocs -s -A README.INSTALL TROUBLESHOOTING dh_link -s dh_installchangelogs -s dh_strip -s diff --git a/debian/xenomai-kernel-source.README.Debian b/debian/xenomai-kernel-source.README.Debian new file mode 100644 index 0000000..e82fade --- /dev/null +++ b/debian/xenomai-kernel-source.README.Debian @@ -0,0 +1,20 @@ +Xenomai kernel sources in Debian +================================ + +With this package, you can patch and build kernels suitable for usage with +Xenomai. This can be done with, e.g.: + +# cd /usr/src/linux-3.8.13 +# /usr/src/xenomai-kernel-source/scripts/prepare-kernel.sh --linux=. +# make config +# make-kpkg --rootcmd fakeroot --initrd kernel_image + +For help about preparing and installing a Xenomai-enabled kernel see: +http://www.xenomai.org/documentation/xenomai-2.6/html/README.INSTALL/#prepare-kernel + +For help about configuring a Linux kernel for use with Xenomai and in +particular about the options which should not be enabled see: +http://www.xenomai.org/index.php/Configuring_x86_kernels + +You can also get help on the Xenomai mailing list. Subscribe here: +http://www.xenomai.org/mailman/listinfo/xenomai diff --git a/debian/xenomai-runtime.install b/debian/xenomai-runtime.install index d1dbe13..e5f1cd6 100644 --- a/debian/xenomai-runtime.install +++ b/debian/xenomai-runtime.install @@ -1,5 +1,4 @@ usr/bin usr/sbin usr/share/man -usr/share/xenomai usr/lib/xenomai diff --git a/scripts/bootstrap b/scripts/bootstrap index c7c49b6..e7b8536 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -1,3 +1,3 @@ #!/bin/sh -autoreconf --force -i +autoreconf -fi diff --git a/scripts/wrap-link.sh b/scripts/wrap-link.sh index 9bd2434..a16f2da 100755 --- a/scripts/wrap-link.sh +++ b/scripts/wrap-link.sh @@ -180,6 +180,10 @@ while test $# -gt 0; do stage1_args="$stage1_args $arg" ;; + -pie) + stage2_args="$stage2_args $arg" + ;; + *) if test -e "$arg"; then add_linker_obj $arg _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
