Module: xenomai-2.6 Branch: master Commit: 9445b03a144d1c21eb5f0a62182820bec56439bb URL: http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=9445b03a144d1c21eb5f0a62182820bec56439bb
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Sun May 5 17:21:02 2013 +0200 debian: revert spurious commit --- debian/rules | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index be7a9cc..b7a072b 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CONFIG_OPTS = --prefix=/usr \ --includedir=/usr/include/xenomai \ --mandir=/usr/share/man \ - --with-testdir=/usr/lib/xenomai/testsuite + --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) @@ -25,7 +25,7 @@ endif build: build-arch build-indep build-arch: build-arch-stamp -build-arch-stamp: config.status +build-arch-stamp: config.status xenomai-patch-stamp dh_testdir $(MAKE) touch build-arch-stamp @@ -35,17 +35,24 @@ build-indep-stamp: config.status dh_testdir touch build-indep-stamp +xenomai-patch-stamp: + dh_testdir + for i in arm i386 powerpc x86_64 x86 ; do \ + bash $(CURDIR)/scripts/prepare-patch.sh $$i ; \ + done + touch xenomai-patch-stamp + config.status: configure-stamp configure-stamp: dh_testdir autoreconf -fi - ./configure $(CONFIG_OPTS) + ./configure $(CONFIG_OPTS) --with-testdir=/usr/lib/xenomai/testsuite touch configure-stamp clean: dh_testdir dh_testroot - rm -f configure-stamp build-indep-stamp build-arch-stamp + rm -f configure-stamp xenomai-patch-stamp build-indep-stamp build-arch-stamp -if test -f Makefile ; then \ $(MAKE) distclean ; \ fi @@ -62,14 +69,8 @@ install: build $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ dh_install --sourcedir=$(CURDIR)/debian/tmp # Patch collection: - mkdir -p \ - $(CURDIR)/debian/linux-patch-xenomai/usr/share/linux-patch-xenomai/ \ - $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/all/apply \ - $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/all/unpatch - cp -a include ksrc scripts/prepare-kernel.sh $(CURDIR)/debian/linux-patch-xenomai/usr/share/linux-patch-xenomai/ -# cp debian/linux-patch-xenomai.apply $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/all/apply/xenomai -# cp debian/linux-patch-xenomai.unpatch $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/all/unpatch/xenomai - + mkdir -p $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai + cp *ipipe-*.patch $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai # xeno-config should be only in libxenomai-dev rm -f $(CURDIR)/debian/xenomai-runtime/usr/bin/xeno-config rm -f $(CURDIR)/debian/xenomai-runtime/usr/share/man/man1/xeno-config.1 @@ -81,6 +82,8 @@ 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 + # remove *.la files + rm $(CURDIR)/debian/libxenomai-dev/usr/lib/*.la # Build architecture-independent files here. binary-indep: build install @@ -90,7 +93,7 @@ binary-indep: build install dh_link -i dh_installchangelogs -i dh_strip -i - dh_compress -i -X.pdf + dh_compress -i -X.pdf $(CURDIR)/debian/linux-patch-xenomai/usr/src/kernel-patches/diffs/xenomai/* dh_fixperms -i dh_makeshlibs -i dh_installdeb -i _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git