Merge pull request #133 from pakmarkthub/dev-issue-131

fixes #131 i.e. no-source bug in gdrdrv-dkms.deb
NVIDIA · Aug 13, 2020 · 36e7db5 · 36e7db5
2 parents af1f77b + ea0ec79
commit 36e7db5
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 29 deletions.
diff --git a/packages/build-deb-packages.sh b/packages/build-deb-packages.sh
@@ -42,55 +42,65 @@ fi
 FULL_VERSION="${VERSION}-${DEBIAN_VERSION}"
 
 tmpdir=`mktemp -d /tmp/gdr.XXXXXX`
-if [ ! -d "$tmpdir" ]; then
+if [ ! -d "${tmpdir}" ]; then
     echo "Failed to create a temp directory!" >&2
     exit 1
 fi
 
 echo "Building gdrcopy debian packages version ${FULL_VERSION} ..."
 
-echo "Working in $tmpdir ..."
+echo "Working in ${tmpdir} ..."
 
 ex cd ${TOP_DIR_PATH}
 
-ex mkdir -p $tmpdir/gdrcopy
-ex rm -rf $tmpdir/gdrcopy/*
-ex cp -r Makefile README.md include src tests LICENSE config_arch packages/debian $tmpdir/gdrcopy/
-ex cp README.md $tmpdir/gdrcopy/debian/README.Debian
-ex cp README.md $tmpdir/gdrcopy/debian/README.source
-ex rm -f $tmpdir/gdrcopy_${VERSION}.orig.tar.gz
+ex mkdir -p ${tmpdir}/gdrcopy
+ex rm -rf ${tmpdir}/gdrcopy/*
+ex cp -r Makefile README.md include src tests LICENSE config_arch packages/debian ${tmpdir}/gdrcopy/
+ex cp README.md ${tmpdir}/gdrcopy/debian/README.Debian
+ex cp README.md ${tmpdir}/gdrcopy/debian/README.source
+ex rm -f ${tmpdir}/gdrcopy_${VERSION}.orig.tar.gz
 
-ex cd $tmpdir/gdrcopy
-ex find . -type f -exec sed -i "s/@VERSION@/${FULL_VERSION}/g" {} +
+ex cd ${tmpdir}/gdrcopy
+ex find . -type f -exec sed -i "s/@FULL_VERSION@/${FULL_VERSION}/g" {} +
+ex find . -type f -exec sed -i "s/@VERSION@/${VERSION}/g" {} +
 
-ex cd $tmpdir
+ex cd ${tmpdir}
 ex mv gdrcopy gdrcopy-${VERSION}
 ex tar czvf gdrcopy_${VERSION}.orig.tar.gz gdrcopy-${VERSION}
 
-ex cd $tmpdir/gdrcopy-${VERSION}
+ex cd ${tmpdir}/gdrcopy-${VERSION}
 ex debuild --set-envvar=CUDA=${CUDA} --set-envvar=PKG_CONFIG_PATH=${PKG_CONFIG_PATH} -us -uc
 
 echo
 echo "Building dkms module ..."
-ex cd $tmpdir/gdrcopy-${VERSION}/src/gdrdrv
+ex cd ${tmpdir}/gdrcopy-${VERSION}/src/gdrdrv
 ex make clean
 
-ex mkdir -p $tmpdir/gdrdrv-dkms-${VERSION}/
-ex cp -r $tmpdir/gdrcopy-${VERSION}/src/gdrdrv $tmpdir/gdrdrv-dkms-${VERSION}/gdrdrv-${VERSION}
-ex cp ${SCRIPT_DIR_PATH}/dkms.conf $tmpdir/gdrdrv-dkms-${VERSION}/gdrdrv-${VERSION}/
-ex cd $tmpdir/gdrdrv-dkms-${VERSION}/
+dkmsdir="${tmpdir}/gdrdrv-dkms-${VERSION}"
+ex mkdir -p ${dkmsdir}
+ex cp -r ${tmpdir}/gdrcopy-${VERSION}/src/gdrdrv ${dkmsdir}/gdrdrv-${VERSION}
+ex cp ${SCRIPT_DIR_PATH}/dkms.conf ${dkmsdir}/gdrdrv-${VERSION}/
+ex cd ${dkmsdir}
 ex cp -r ${SCRIPT_DIR_PATH}/dkms/* .
-ex find . -type f -exec sed -i "s/@VERSION@/${FULL_VERSION}/g" {} +
+ex find . -type f -exec sed -i "s/@FULL_VERSION@/${FULL_VERSION}/g" {} +
+ex find . -type f -exec sed -i "s/@VERSION@/${VERSION}/g" {} +
 ex find . -type f -exec sed -i "s/@MODULE_LOCATION@/${MODULE_SUBDIR//\//\\/}/g" {} +
 
-ex dpkg-buildpackage -S -us -uc
-ex dpkg-buildpackage -rfakeroot -d -b -us -uc
+ex cd ${tmpdir}
+ex tar czvf gdrdrv-dkms_${VERSION}.orig.tar.gz gdrdrv-dkms-${VERSION}
+
+ex cd ${dkmsdir}
+ex dpkg-buildpackage -rfakeroot -d -F -us -uc
 
 echo
 echo "Copying *.deb and supplementary files to the current working directory ..."
 
 ex cd ${CWD}
-ex cp $tmpdir/*.deb .
-ex cp $tmpdir/*.tar.* .
-ex cp $tmpdir/*.dsc .
+ex cp ${tmpdir}/*.deb .
+ex cp ${tmpdir}/*.tar.* .
+ex cp ${tmpdir}/*.dsc .
+
+echo
+echo "Cleaning up ..."
 
+ex rm -rf ${tmpdir}
diff --git a/packages/debian/changelog b/packages/debian/changelog
@@ -1,4 +1,4 @@
-gdrcopy (@VERSION@) unstable; urgency=low
+gdrcopy (@FULL_VERSION@) unstable; urgency=low
 
   * fix build problem on RHL8 kernels
   * relax checks in gdrdrv to support multi-threading use cases

diff --git a/packages/debian/control b/packages/debian/control
@@ -2,7 +2,7 @@ Source: gdrcopy
 Priority: optional
 Maintainer: Davide Rossetti <[email protected]>
 Build-Depends: debhelper (>= 10), check, libsubunit-dev
-Standards-Version: @VERSION@
+Standards-Version: @FULL_VERSION@
 Section: libs
 Homepage: https://github.com/NVIDIA/gdrcopy
 #Vcs-Git: https://anonscm.debian.org/git/collab-maint/gdrcopy.git
@@ -11,6 +11,6 @@ Homepage: https://github.com/NVIDIA/gdrcopy
 Package: gdrcopy
 Architecture: any
 Multi-Arch: same
-Depends: gdrdrv-dkms (>= @VERSION@), ${shlibs:Depends}, ${misc:Depends}
+Depends: gdrdrv-dkms (>= @FULL_VERSION@), ${shlibs:Depends}, ${misc:Depends}
 Description: A low-latency GPU memory copy library 
  A low-latency GPU memory copy library based on NVIDIA GPUDirect RDMA technology.
diff --git a/packages/dkms.conf b/packages/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="gdrdrv"
-PACKAGE_VERSION="@VERSION@"
+PACKAGE_VERSION="@FULL_VERSION@"
 BUILT_MODULE_NAME[0]="gdrdrv"
 DEST_MODULE_LOCATION[0]="@MODULE_LOCATION@"
 AUTOINSTALL="yes"
diff --git a/packages/dkms/debian/changelog b/packages/dkms/debian/changelog
@@ -1,4 +1,4 @@
-gdrdrv-dkms (@VERSION@) unstable; urgency=low
+gdrdrv-dkms (@FULL_VERSION@) unstable; urgency=low
 
   * Change the package maintainer to Davide Rossetti.
 

diff --git a/packages/dkms/debian/control b/packages/dkms/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Davide Rossetti <[email protected]>
 Build-Depends: debhelper (>= 10), dkms
-Standards-Version: @VERSION@
+Standards-Version: @FULL_VERSION@
 
 Package: gdrdrv-dkms
 Architecture: any

diff --git a/packages/dkms/debian/source/format b/packages/dkms/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)