Remove redundant ARCH

diff --git a/debian/control.modules.in b/debian/control.modules.in
index c0ef481cbfb035701e738340fd6ffff982c89ff8..a02be7c83160d804f3ee3f51a6223b70f4d1cd2c 100644 (file)
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -10,13 +10,13 @@ Build-Depends: autotools-dev,
  dkms (>> 2.1.1.2-5),
  libtool,
  linux-headers-_KVERS_-common,
- linux-headers-_KVERS_-_ARCH_
+ linux-headers-_KVERS_
 Standards-Version: 3.8.4
 Homepage: http://www.zfsonlinux.org/
 Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 
-Package: zfs-modules-_KVERS_-_ARCH_
+Package: zfs-modules-_KVERS_
 Architecture: _ARCH_
 Provides: zfs-modules
 Description: Native ZFS filesystem kernel modules for Linux (kernel _KVERS_)
@@ -33,7 +33,7 @@ Description: Native ZFS filesystem kernel modules for Linux (kernel _KVERS_)
  provided for use with the Debian kernel-package utility to produce a 
  version of zfs-module for your kernel.
 
-Package: zfs-modules-_KVERS_-_ARCH_-di
+Package: zfs-modules-_KVERS_-di
 Package-Type: udeb
 Section: debian-installer
 Architecture: _ARCH_

diff --git a/debian/rules b/debian/rules
index a768db4431e7292759c4424873bd35efd563091b..88b8048288e2ba6026b966a1004fe66e5632429a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ endif
 
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
-pmodules = $(PACKAGE)-modules-$(non_epoch_version)-$(DEB_HOST_ARCH)
+pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 
 %:
        dh $@ --with dkms

diff --git a/debian/zfs-modules-_KVERS_-_ARCH_-di.dirs.in b/debian/zfs-modules-_KVERS_-_ARCH_-di.dirs.in
deleted file mode 100644 (file)
index 3943c04..0000000
--- a/debian/zfs-modules-_KVERS_-_ARCH_-di.dirs.in
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/_KVERS_-_ARCH_/extra/zcommon
-lib/modules/_KVERS_-_ARCH_/extra/zfs
-lib/modules/_KVERS_-_ARCH_/extra/avl
-lib/modules/_KVERS_-_ARCH_/extra/unicode
-lib/modules/_KVERS_-_ARCH_/extra/zpios
-lib/modules/_KVERS_-_ARCH_/extra/nvpari

diff --git a/debian/zfs-modules-_KVERS_-_ARCH_-di.install.in b/debian/zfs-modules-_KVERS_-_ARCH_-di.install.in
deleted file mode 100644 (file)
index 2b5b847..0000000
--- a/debian/zfs-modules-_KVERS_-_ARCH_-di.install.in
+++ /dev/null
@@ -1,6 +0,0 @@
-module/zcommon/zcommon.ko      lib/modules/_KVERS_-_ARCH_/extra/zcommon/
-module/zfs/zfs.ko              lib/modules/_KVERS_-_ARCH_/extra/zfs/
-module/avl/zavl.ko             lib/modules/_KVERS_-_ARCH_/extra/avl/
-module/unicode/zunicode.ko     lib/modules/_KVERS_-_ARCH_/extra/unicode/
-module/zpios/zpios.ko          lib/modules/_KVERS_-_ARCH_/extra/zpios/
-module/nvpair/znvpair.ko       lib/modules/_KVERS_-_ARCH_/extra/nvpari/

diff --git a/debian/zfs-modules-_KVERS_-_ARCH_.dirs.in b/debian/zfs-modules-_KVERS_-_ARCH_.dirs.in
deleted file mode 100644 (file)
index 3943c04..0000000
--- a/debian/zfs-modules-_KVERS_-_ARCH_.dirs.in
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/_KVERS_-_ARCH_/extra/zcommon
-lib/modules/_KVERS_-_ARCH_/extra/zfs
-lib/modules/_KVERS_-_ARCH_/extra/avl
-lib/modules/_KVERS_-_ARCH_/extra/unicode
-lib/modules/_KVERS_-_ARCH_/extra/zpios
-lib/modules/_KVERS_-_ARCH_/extra/nvpari

diff --git a/debian/zfs-modules-_KVERS_-_ARCH_.install.in b/debian/zfs-modules-_KVERS_-_ARCH_.install.in
deleted file mode 100644 (file)
index 2b5b847..0000000
--- a/debian/zfs-modules-_KVERS_-_ARCH_.install.in
+++ /dev/null
@@ -1,6 +0,0 @@
-module/zcommon/zcommon.ko      lib/modules/_KVERS_-_ARCH_/extra/zcommon/
-module/zfs/zfs.ko              lib/modules/_KVERS_-_ARCH_/extra/zfs/
-module/avl/zavl.ko             lib/modules/_KVERS_-_ARCH_/extra/avl/
-module/unicode/zunicode.ko     lib/modules/_KVERS_-_ARCH_/extra/unicode/
-module/zpios/zpios.ko          lib/modules/_KVERS_-_ARCH_/extra/zpios/
-module/nvpair/znvpair.ko       lib/modules/_KVERS_-_ARCH_/extra/nvpari/

diff --git a/debian/zfs-modules-_KVERS_-di.dirs.in b/debian/zfs-modules-_KVERS_-di.dirs.in
new file mode 100644 (file)
index 0000000..3943c04
--- /dev/null
+++ b/debian/zfs-modules-_KVERS_-di.dirs.in
@@ -0,0 +1,6 @@
+lib/modules/_KVERS_-_ARCH_/extra/zcommon
+lib/modules/_KVERS_-_ARCH_/extra/zfs
+lib/modules/_KVERS_-_ARCH_/extra/avl
+lib/modules/_KVERS_-_ARCH_/extra/unicode
+lib/modules/_KVERS_-_ARCH_/extra/zpios
+lib/modules/_KVERS_-_ARCH_/extra/nvpari

diff --git a/debian/zfs-modules-_KVERS_-di.install.in b/debian/zfs-modules-_KVERS_-di.install.in
new file mode 100644 (file)
index 0000000..a0284a5
--- /dev/null
+++ b/debian/zfs-modules-_KVERS_-di.install.in
@@ -0,0 +1,6 @@
+module/zcommon/zcommon.ko      lib/modules/_KVERS_/extra/zcommon/
+module/zfs/zfs.ko              lib/modules/_KVERS_/extra/zfs/
+module/avl/zavl.ko             lib/modules/_KVERS_/extra/avl/
+module/unicode/zunicode.ko     lib/modules/_KVERS_/extra/unicode/
+module/zpios/zpios.ko          lib/modules/_KVERS_/extra/zpios/
+module/nvpair/znvpair.ko       lib/modules/_KVERS_/extra/nvpari/

diff --git a/debian/zfs-modules-_KVERS_.dirs.in b/debian/zfs-modules-_KVERS_.dirs.in
new file mode 100644 (file)
index 0000000..3943c04
--- /dev/null
+++ b/debian/zfs-modules-_KVERS_.dirs.in
@@ -0,0 +1,6 @@
+lib/modules/_KVERS_-_ARCH_/extra/zcommon
+lib/modules/_KVERS_-_ARCH_/extra/zfs
+lib/modules/_KVERS_-_ARCH_/extra/avl
+lib/modules/_KVERS_-_ARCH_/extra/unicode
+lib/modules/_KVERS_-_ARCH_/extra/zpios
+lib/modules/_KVERS_-_ARCH_/extra/nvpari

diff --git a/debian/zfs-modules-_KVERS_.install.in b/debian/zfs-modules-_KVERS_.install.in
new file mode 100644 (file)
index 0000000..a0284a5
--- /dev/null
+++ b/debian/zfs-modules-_KVERS_.install.in
@@ -0,0 +1,6 @@
+module/zcommon/zcommon.ko      lib/modules/_KVERS_/extra/zcommon/
+module/zfs/zfs.ko              lib/modules/_KVERS_/extra/zfs/
+module/avl/zavl.ko             lib/modules/_KVERS_/extra/avl/
+module/unicode/zunicode.ko     lib/modules/_KVERS_/extra/unicode/
+module/zpios/zpios.ko          lib/modules/_KVERS_/extra/zpios/
+module/nvpair/znvpair.ko       lib/modules/_KVERS_/extra/nvpari/