diff --git a/Makefile b/Makefile index 9be7d76..2aa4667 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,8 @@ $(MPITSTDIR)/% : test/mpi/%.cu $(TSTDEP) #### PACKAGING #### CUDA_VERSION ?= $(shell ls $(CUDA_LIB)/libcudart.so.* | head -1 | rev | cut -d "." -f -2 | rev) - +CUDA_MAJOR = $(shell echo $(CUDA_VERSION) | cut -d "." -f 1) +CUDA_MINOR = $(shell echo $(CUDA_VERSION) | cut -d "." -f 2) DEB_GEN_IN := $(shell ls debian/*.in) DEB_GEN := $(DEB_GEN_IN:.in=) @@ -194,7 +195,8 @@ debian/% : debian/%.in sed -e "s/\$${nccl:Major}/$(VER_MAJOR)/g" \ -e "s/\$${nccl:Minor}/$(VER_MINOR)/g" \ -e "s/\$${nccl:Patch}/$(VER_PATCH)/g" \ - -e "s/\$${nccl:Cuda}/$(CUDA_VERSION)/g" \ + -e "s/\$${cuda:Major}/$(CUDA_MAJOR)/g" \ + -e "s/\$${cuda:Minor}/$(CUDA_MINOR)/g" \ -e "s/\$${nccl:Debian}/$(DEB_REVISION)/g" \ -e "s/\$${nccl:Timestamp}/$(DEB_TIMESTAMP)/g" \ $< > $@ diff --git a/debian/changelog.in b/debian/changelog.in index a86dd8d..76ecfd1 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,4 +1,4 @@ -nccl (${nccl:Major}.${nccl:Minor}.${nccl:Patch}-${nccl:Debian}+cuda${nccl:Cuda}) trusty; urgency=medium +nccl (${nccl:Major}.${nccl:Minor}.${nccl:Patch}-${nccl:Debian}+cuda${cuda:Major}.${cuda:Minor}) trusty; urgency=medium * Automatic Debian package from build diff --git a/debian/shlibs.local b/debian/shlibs.local deleted file mode 100644 index 12eb04d..0000000 --- a/debian/shlibs.local +++ /dev/null @@ -1 +0,0 @@ -libcudart 7.5 cuda-cudart-7-5 diff --git a/debian/shlibs.local.in b/debian/shlibs.local.in new file mode 100644 index 0000000..82505da --- /dev/null +++ b/debian/shlibs.local.in @@ -0,0 +1 @@ +libcudart ${cuda:Major}.${cuda:Minor} cuda-cudart-${cuda:Major}-${cuda:Minor}