Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [OMPI svn] svn:open-mpi r29615 - in trunk: . contrib contrib/dist/linux debian debian/source
From: Dave Goodell (dgoodell) (dgoodell_at_[hidden])
Date: 2013-11-06 12:35:21


Mike,

Why not put these packaging files in "/contrib/dist/..." in SVN and then symlink them to "/debian" as a step in your build script? Top level names are (somewhat) precious and should not be added casually.

-Dave

On Nov 6, 2013, at 4:50 AM, svn-commit-mailer_at_[hidden] wrote:

> Author: miked (Mike Dubman)
> Date: 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013)
> New Revision: 29615
> URL: https://svn.open-mpi.org/trac/ompi/changeset/29615
>
> Log:
> packaging: add support for debian + example
> unfortunately the debian packaging files should reside in the root folder
> and cannot be placed under contrib/dist/... tree.
> developed by Aleksey, reviewed by miked
> cmr=v1.7.4:reviewer=ompi-gk1.7
>
> Added:
> trunk/contrib/dist/linux/compile_debian_mlnx_example.in
> trunk/debian/
> trunk/debian/changelog.in
> trunk/debian/compat
> trunk/debian/control.in
> trunk/debian/rules.in
> trunk/debian/source/
> trunk/debian/source/format
> Text files modified:
> trunk/Makefile.am | 2 +-
> trunk/configure.ac | 11 ++++++++++-
> trunk/contrib/Makefile.am | 1 +
> trunk/contrib/dist/linux/compile_debian_mlnx_example.in | 27 +++++++++++++++++++++++++++
> trunk/debian/changelog.in | 5 +++++
> trunk/debian/compat | 1 +
> trunk/debian/control.in | 18 ++++++++++++++++++
> trunk/debian/rules.in | 17 +++++++++++++++++
> trunk/debian/source/format | 1 +
> 9 files changed, 81 insertions(+), 2 deletions(-)
>
> Modified: trunk/Makefile.am
> ==============================================================================
> --- trunk/Makefile.am Wed Nov 6 01:19:03 2013 (r29614)
> +++ trunk/Makefile.am 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -20,7 +20,7 @@
>
> SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
> EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl autogen.sh \
> - README.JAVA.txt
> + README.JAVA.txt debian
>
> include examples/Makefile.include
>
>
> Modified: trunk/configure.ac
> ==============================================================================
> --- trunk/configure.ac Wed Nov 6 01:19:03 2013 (r29614)
> +++ trunk/configure.ac 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -1341,6 +1341,11 @@
> config/Makefile
>
> contrib/Makefile
> + contrib/dist/linux/compile_debian_mlnx_example
> +
> + debian/changelog
> + debian/rules
> + debian/control
>
> test/Makefile
> test/event/Makefile
> @@ -1350,7 +1355,11 @@
> test/support/Makefile
> test/threads/Makefile
> test/util/Makefile
> -])
> +],[
> + chmod +x debian/rules
> + chmod +x contrib/dist/linux/compile_debian_mlnx_example
> + cp LICENSE debian/copyright
> + ])
>
> OPAL_CONFIG_FILES
> m4_ifdef([project_orte], [ORTE_CONFIG_FILES])
>
> Modified: trunk/contrib/Makefile.am
> ==============================================================================
> --- trunk/contrib/Makefile.am Wed Nov 6 01:19:03 2013 (r29614)
> +++ trunk/contrib/Makefile.am 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -33,6 +33,7 @@
> EXTRA_DIST = \
> dist/make_dist_tarball \
> dist/linux/openmpi.spec \
> + dist/linux/compile_debian_mlnx_example.in \
> dist/macosx-pkg/buildpackage.sh \
> dist/macosx-pkg/ReadMe.rtf \
> platform/optimized \
>
> Added: trunk/contrib/dist/linux/compile_debian_mlnx_example.in
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/contrib/dist/linux/compile_debian_mlnx_example.in 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1,27 @@
> +INSTALL_DIR=${INSTALL_DIR:-/usr/mpi/gcc}
> +PREFIX=${INSTALL_DIR}/openmpi-_at_OMPI_MAJOR_VERSION_at_.@OMPI_MINOR_VERSION_at_.@OMPI_RELEASE_VERSION@
> +
> +MAINTEINER=${MAINTEINER:-"Mellanox Ltd. <support_at_[hidden]>"}
> +UPLOADER=${UPLOADER:-"$MAINTEINER"}
> +
> +MXM_PATH=${MXM_PATH:-/opt/mellanox/mxm}
> +FCA_PATH=${FCA_PATH:-/opt/mellanox/fca}
> +KNEM_PATH=${KNEM_PATH:-/opt/knem-1.0.90mlnx2}
> +
> +[ -d $MXM_PATH ] && WITH_MXM="--with-mxm=$MXM_PATH"
> +[ -d $FCA_PATH ] && WITH_FCA="--with-fca=$FCA_PATH"
> +[ -d $KNEM_PATH ] && WITH_KNEM="--with-knem=$KNEM_PATH"
> +
> +CONFIG_ARGS=${CONFIG_ARGS:-"--prefix=$PREFIX
> + --libdir=$OMPI_PREFIX/lib64 \
> + --localstatedir=/var
> + --sharedstatedir=/var/lib
> + --infodir=/usr/share/info \
> + --with-platform=contrib/platform/mellanox/optimized \
> + $WITH_MXM \
> + $WITH_FCA \
> + $WITH_KNEM \
> + "}
> +sed -ie "s/XXXMAINTEINERXXX/$MAINTEINER/; s/XXXUPLOADERXXX/$UPLOADER/" debian/control
> +export CONFIG_ARGS
> +dpkg-buildpackage -us -uc
>
> Added: trunk/debian/changelog.in
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/debian/changelog.in 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1,5 @@
> +openmpi (@OMPI_MAJOR_VERSION_at_.@OMPI_MINOR_VERSION_at_.@OMPI_RELEASE_VERSION@) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Aleksey Senin <alekseys_at_[hidden]> Thu, 02 May 2013 10:55:55 +0300
>
> Added: trunk/debian/compat
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/debian/compat 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1 @@
> +8
>
> Added: trunk/debian/control.in
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/debian/control.in 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1,18 @@
> +Source: openmpi
> +Section: net
> +Priority: extra
> +Homepage: http://www.open-mpi.org/
> +Maintainer: XXXMAINTEINERXXX
> +Uploaders: XXXUPLOADERXXX
> +Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel armhf i386 powerpc], autoconf (>= 2.59), automake, libtool, libltdl-dev
> +Standards-Version: 3.9.3
> +
> +Package: openmpi
> +Depends: ${shlibs:Depends}, ${misc:Depends}
> +Architecture: amd64
> +Description: Open MPI
> + Open MPI is a project combining technologies and resources from
> + several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in
> + order to build the best MPI library available.
> + This package contains all the tools necessary to compile, link, and run
> + Open MPI jobs.
>
> Added: trunk/debian/rules.in
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/debian/rules.in 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1,17 @@
> +#!/usr/bin/make -f
> +
> +# export DH_VERBOSE=1
> +
> +DPKG_EXPORT_BUILDFLAGS = 1
> +include /usr/share/dpkg/buildflags.mk
> +
> +%:
> + dh $@ --parallel
> +
> +override_dh_auto_clean:
> +
> +override_dh_auto_configure:
> + ./configure $(CONFIG_ARGS)
> +
> +override_dh_auto_test:
> +
>
> Added: trunk/debian/source/format
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/debian/source/format 2013-11-06 07:50:28 EST (Wed, 06 Nov 2013) (r29615)
> @@ -0,0 +1 @@
> +3.0 (native)
> _______________________________________________
> svn mailing list
> svn_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn