1
1

revert r29615, will stick to Dave suggestion and put everything under contrib/dist/linux/debian

Refs: #3887

This commit was SVN r29632.

The following SVN revision numbers were found above:
  r29615 --> open-mpi/ompi@c356bdeeae
Этот коммит содержится в:
Mike Dubman 2013-11-07 09:28:43 +00:00
родитель 82db913490
Коммит d8a24692b0
9 изменённых файлов: 2 добавлений и 81 удалений

Просмотреть файл

@ -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 debian
README.JAVA.txt
include examples/Makefile.include

Просмотреть файл

@ -1341,11 +1341,6 @@ AC_CONFIG_FILES([
config/Makefile
contrib/Makefile
contrib/dist/linux/compile_debian_mlnx_example
debian/changelog
debian/rules
debian/control
test/Makefile
test/event/Makefile
@ -1355,11 +1350,7 @@ AC_CONFIG_FILES([
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])

Просмотреть файл

@ -33,7 +33,6 @@ endif # WANT_FT_CR
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 \

Просмотреть файл

@ -1,27 +0,0 @@
INSTALL_DIR=${INSTALL_DIR:-/usr/mpi/gcc}
PREFIX=${INSTALL_DIR}/openmpi-@OMPI_MAJOR_VERSION@.@OMPI_MINOR_VERSION@.@OMPI_RELEASE_VERSION@
MAINTEINER=${MAINTEINER:-"Mellanox Ltd. <support@mellanox.com>"}
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

5
debian/changelog.in поставляемый
Просмотреть файл

@ -1,5 +0,0 @@
openmpi (@OMPI_MAJOR_VERSION@.@OMPI_MINOR_VERSION@.@OMPI_RELEASE_VERSION@) unstable; urgency=low
* Initial release.
-- Aleksey Senin <alekseys@mellanox.com> Thu, 02 May 2013 10:55:55 +0300

1
debian/compat поставляемый
Просмотреть файл

@ -1 +0,0 @@
8

18
debian/control.in поставляемый
Просмотреть файл

@ -1,18 +0,0 @@
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.

17
debian/rules.in поставляемый
Просмотреть файл

@ -1,17 +0,0 @@
#!/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:

1
debian/source/format поставляемый
Просмотреть файл

@ -1 +0,0 @@
3.0 (native)