Cleanup, removing unnecessary version from the i40e-dkms folder name

The unnecessary version was removed from the i40e-dkms folder name.
The debian/postinstall script was changed in order to process the
MOS package name correctly (without the version).
Neither the sources nor the package version were changed by this commit.

Change-Id: I778a7a007ad8af1a4d24782742dc99b733104ce3

diff --git a/debian/changelog b/debian/changelog
index 644e0f0288b605bb204b93e91a126cf2ec933d71..257663cfdf7b7e2c0b40de835999f9373c371c60 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i40e-dkms (1.3.47-1~u14.04+mos2) MOS 9.0; urgency=low
+
+  * Cleanup, removing unnecessary version from the i40e-dkms folder name
+
+ -- Mirantis Openstack Linux Team <mos-linux@mirantis.com>  Fri, 25 February 2016 16:57:42 +0200
+
 i40e-dkms (1.3.47-1~u14.04+mos1) MOS 9.0; urgency=low
 
   * Update the driver i40e version up to 1.3.47

diff --git a/debian/postinst b/debian/postinst
index 80bb73dc74528d502b75a9cc2b5cde655ffed653..c70881a6f6b3339f26380e486ff230ad27b3a757 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,12 +4,20 @@
 # Copyright (C) 2007 Mario Limonciello
 # Copyright (C) 2009 Alberto Milone
 
+# MOS packages has a suffix in its name
+# separated by the '~', which is actually
+# recognized as a part of the package version.
+# That's wrong and follows to DKMS fall during
+# the installation the package.
+# To fix it the CVERSION was extended with
+# the string "| cut -d\~ -f1" cutting the suffix
+
 set -e
 
 NAME=i40e
 PACKAGE_NAME=$NAME-dkms
 DEB_NAME=$(echo $PACKAGE_NAME | sed 's,_,-,')
-CVERSION=`dpkg-query -W -f='${Version}' $DEB_NAME | awk -F "-" '{print $1}' | cut -d\: -f2`
+CVERSION=`dpkg-query -W -f='${Version}' $DEB_NAME | awk -F "-" '{print $1}' | cut -d\: -f2 | cut -d\~ -f1`
 ARCH=`dpkg --print-architecture`
 
 dkms_configure () {

diff --git a/i40e-dkms-1.3.47/Makefile b/i40e-dkms/Makefile
similarity index 100%
rename from i40e-dkms-1.3.47/Makefile
rename to i40e-dkms/Makefile

diff --git a/i40e-dkms-1.3.47/common.postinst b/i40e-dkms/common.postinst
similarity index 100%
rename from i40e-dkms-1.3.47/common.postinst
rename to i40e-dkms/common.postinst

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/COPYING b/i40e-dkms/i40e-1.3.47/COPYING
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/COPYING
rename to i40e-dkms/i40e-1.3.47/COPYING

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/README b/i40e-dkms/i40e-1.3.47/README
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/README
rename to i40e-dkms/i40e-1.3.47/README

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/SUMS b/i40e-dkms/i40e-1.3.47/SUMS
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/SUMS
rename to i40e-dkms/i40e-1.3.47/SUMS

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/dkms.conf b/i40e-dkms/i40e-1.3.47/dkms.conf
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/dkms.conf
rename to i40e-dkms/i40e-1.3.47/dkms.conf

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/i40e.7 b/i40e-dkms/i40e-1.3.47/i40e.7
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/i40e.7
rename to i40e-dkms/i40e-1.3.47/i40e.7

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/i40e.spec b/i40e-dkms/i40e-1.3.47/i40e.spec
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/i40e.spec
rename to i40e-dkms/i40e-1.3.47/i40e.spec

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/pci.updates b/i40e-dkms/i40e-1.3.47/pci.updates
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/pci.updates
rename to i40e-dkms/i40e-1.3.47/pci.updates

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/scripts/dump_tables b/i40e-dkms/i40e-1.3.47/scripts/dump_tables
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/scripts/dump_tables
rename to i40e-dkms/i40e-1.3.47/scripts/dump_tables

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/scripts/set_irq_affinity b/i40e-dkms/i40e-1.3.47/scripts/set_irq_affinity
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/scripts/set_irq_affinity
rename to i40e-dkms/i40e-1.3.47/scripts/set_irq_affinity

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/Makefile b/i40e-dkms/i40e-1.3.47/src/Makefile
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/Makefile
rename to i40e-dkms/i40e-1.3.47/src/Makefile

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/Kbuild b/i40e-dkms/i40e-1.3.47/src/i40e/Kbuild
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/Kbuild
rename to i40e-dkms/i40e-1.3.47/src/i40e/Kbuild

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/Module.supported b/i40e-dkms/i40e-1.3.47/src/i40e/Module.supported
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/Module.supported
rename to i40e-dkms/i40e-1.3.47/src/i40e/Module.supported

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq_cmd.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq_cmd.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_adminq_cmd.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_adminq_cmd.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_alloc.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_alloc.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_alloc.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_alloc.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_common.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_common.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_common.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_common.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_configfs.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_configfs.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_configfs.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_configfs.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb_nl.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb_nl.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_dcb_nl.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_dcb_nl.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_debugfs.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_debugfs.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_debugfs.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_debugfs.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_devids.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_devids.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_devids.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_devids.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_diag.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_diag.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_diag.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_diag.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_diag.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_diag.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_diag.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_diag.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_ethtool.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_ethtool.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_ethtool.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_ethtool.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_fcoe.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_fcoe.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_fcoe.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_fcoe.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_fcoe.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_fcoe.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_fcoe.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_fcoe.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_helper.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_helper.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_helper.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_helper.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_hmc.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_hmc.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_hmc.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_hmc.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_hmc.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_hmc.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_hmc.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_hmc.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_lan_hmc.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_lan_hmc.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_lan_hmc.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_lan_hmc.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_lan_hmc.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_lan_hmc.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_lan_hmc.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_lan_hmc.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_main.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_main.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_main.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_main.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_nvm.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_nvm.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_nvm.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_nvm.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_osdep.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_osdep.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_osdep.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_osdep.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_prototype.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_prototype.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_prototype.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_prototype.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_ptp.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_ptp.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_ptp.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_ptp.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_register.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_register.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_register.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_register.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_status.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_status.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_status.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_status.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_txrx.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_txrx.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_txrx.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_txrx.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_txrx.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_txrx.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_txrx.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_txrx.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_type.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_type.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_type.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_type.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.c b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.h b/i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/i40e_virtchnl_pf.h

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/kcompat.c b/i40e-dkms/i40e-1.3.47/src/i40e/kcompat.c
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/kcompat.c
rename to i40e-dkms/i40e-1.3.47/src/i40e/kcompat.c

diff --git a/i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/kcompat.h b/i40e-dkms/i40e-1.3.47/src/i40e/kcompat.h
similarity index 100%
rename from i40e-dkms-1.3.47/i40e-1.3.47/src/i40e/kcompat.h
rename to i40e-dkms/i40e-1.3.47/src/i40e/kcompat.h