Add revision to pfring-dkms version (#724)

kernel/Makefile.dkms.in

@@ -12,33 +12,33 @@ endif
 all: install
 
 add: remove
-	\/bin/rm -rf /usr/src/pfring-@VERS@
-	mkdir /usr/src/pfring-@VERS@
-	cp -r Makefile dkms.conf pf_ring.c linux/ /usr/src/pfring-@VERS@
-	cat Makefile | sed -e "s/GIT_REV:=$$/GIT_REV:=${GIT_REV}/" > /usr/src/pfring-@VERS@/Makefile
-	dkms add -m pfring -v @VERS@
+	\/bin/rm -rf /usr/src/pfring-@VERS@.@REVISION@
+	mkdir /usr/src/pfring-@VERS@.@REVISION@
+	cp -r Makefile dkms.conf pf_ring.c linux/ /usr/src/pfring-@VERS@.@REVISION@
+	cat Makefile | sed -e "s/GIT_REV:=$$/GIT_REV:=${GIT_REV}/" > /usr/src/pfring-@VERS@.@REVISION@/Makefile
+	dkms add -m pfring -v @VERS@.@REVISION@
 
 build: add
-	dkms build -m pfring -v @VERS@
+	dkms build -m pfring -v @VERS@.@REVISION@
 
 install: build
-	dkms install --force -m pfring -v @VERS@
+	dkms install --force -m pfring -v @VERS@.@REVISION@
 
 deb: add add_deb install
-	dkms mkdeb -m pfring -v @VERS@ --source-only
+	dkms mkdeb -m pfring -v @VERS@.@REVISION@ --source-only
 
 rpm: add add_rpm install
-	dkms mkrpm -m pfring -v @VERS@ --source-only
+	dkms mkrpm -m pfring -v @VERS@.@REVISION@ --source-only
 
 add_rpm:
-	cp -r pfring-dkms-*.spec /usr/src/pfring-@VERS@/
+	cp -r pfring-dkms-*.spec /usr/src/pfring-@VERS@.@REVISION@/
 
 add_deb:
-	cp -r pfring-dkms-mkdeb /usr/src/pfring-@VERS@/
+	cp -r pfring-dkms-mkdeb /usr/src/pfring-@VERS@.@REVISION@/
 
 remove:
-	-dkms remove -m pfring -v @VERS@ --all
+	-dkms remove -m pfring -v @VERS@.@REVISION@ --all
 
 veryclean: remove
-	\/bin/rm -fr /usr/src/pfring-@VERS@
+	\/bin/rm -fr /usr/src/pfring-@VERS@.@REVISION@
 	

kernel/configure

@@ -584,7 +584,7 @@ PACKAGE_URL=''
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 KERNEL_HEADERS
-GIT_RELEASE
+REVISION
 GIT_HASH
 GIT_BRANCH
 GIT_COMMIT_COUNT
@@ -608,7 +608,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -673,7 +672,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -926,15 +924,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1072,7 +1061,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1225,7 +1214,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1684,7 +1672,7 @@ GIT_COMMIT_COUNT=`../package/version.sh --revision`
 GIT_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
 GIT_HASH=`../package/version.sh --hash`
 VERS=`../package/version.sh --release`
-GIT_RELEASE=`../package/version.sh --revision`
+REVISION=`../package/version.sh --revision`
 
 KERNEL_HEADERS="linux-headers-generic"
 if test -f "/usr/bin/lsb_release"; then

kernel/configure.in

@@ -4,7 +4,7 @@ GIT_COMMIT_COUNT=`../package/version.sh --revision`
 GIT_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
 GIT_HASH=`../package/version.sh --hash`
 VERS=`../package/version.sh --release`
-GIT_RELEASE=`../package/version.sh --revision`
+REVISION=`../package/version.sh --revision`
 
 KERNEL_HEADERS="linux-headers-generic"
 if test -f "/usr/bin/lsb_release"; then
@@ -18,7 +18,7 @@ AC_SUBST(VERS)
 AC_SUBST(GIT_COMMIT_COUNT)
 AC_SUBST(GIT_BRANCH)
 AC_SUBST(GIT_HASH)
-AC_SUBST(GIT_RELEASE)
+AC_SUBST(REVISION)
 AC_SUBST(KERNEL_HEADERS)
 
 AC_CONFIG_FILES(Makefile.dkms)

kernel/pfring-dkms-mkdeb/debian/control.in

@@ -7,6 +7,6 @@ Standards-Version: 3.8.1
 
 Package: DEBIAN_PACKAGE-dkms
 Architecture: all
-Depends: pfring (=@VERS@-@GIT_RELEASE@), dkms (>= 1.95), @KERNEL_HEADERS@, ${misc:Depends}
+Depends: pfring (=@VERS@-@REVISION@), dkms (>= 1.95), @KERNEL_HEADERS@, ${misc:Depends}
 Description: PF_RING driver in DKMS format. GIT info: @GIT_BRANCH@:@GIT_HASH@