Imported Upstream version 0.6.5.6

diff --git a/META b/META
index cd930474156b5d653788497d843aa57d29f090b1..912f9a5f697a82ef6e49f47dc17b246cb4242132 100644 (file)
--- a/META
+++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
-Version:      0.6.5.5
+Version:      0.6.5.6
 Release:      1
 Release-Tags: relext
 License:      GPL

diff --git a/configure b/configure
index 7fd772db5bc65666cb9cac57526e1455d810ee2f..7956fa6d7b418f7dbe7fa8812b242156e89dbda6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for spl 0.6.5.5.
+# Generated by GNU Autoconf 2.68 for spl 0.6.5.6.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='spl'
 PACKAGE_TARNAME='spl'
-PACKAGE_VERSION='0.6.5.5'
-PACKAGE_STRING='spl 0.6.5.5'
+PACKAGE_VERSION='0.6.5.6'
+PACKAGE_STRING='spl 0.6.5.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures spl 0.6.5.5 to adapt to many kinds of systems.
+\`configure' configures spl 0.6.5.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of spl 0.6.5.5:";;
+     short | recursive ) echo "Configuration of spl 0.6.5.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1545,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-spl configure 0.6.5.5
+spl configure 0.6.5.6
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1823,7 +1823,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by spl $as_me 0.6.5.5, which was
+It was created by spl $as_me 0.6.5.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2947,7 +2947,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='spl'
- VERSION='0.6.5.5'
+ VERSION='0.6.5.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17462,7 +17462,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by spl $as_me 0.6.5.5, which was
+This file was extended by spl $as_me 0.6.5.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17528,7 +17528,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-spl config.status 0.6.5.5
+spl config.status 0.6.5.6
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/include/sys/isa_defs.h b/include/sys/isa_defs.h
index 7e15b93211444e99a4fcee54592cbb17394716ef..3d474872cb0b846353972d520ab6f70919c05efb 100644 (file)
--- a/include/sys/isa_defs.h
+++ b/include/sys/isa_defs.h
@@ -131,7 +131,21 @@
 #define _BIG_ENDIAN
 #define _SUNOS_VTOC_16
 
-#else /* Currently x86_64, i386, arm, powerpc, and sparc are supported */
+/* s390 arch specific defines */
+#elif defined(__s390__)
+#if defined(__s390x__)
+#if !defined(_LP64)
+#define        _LP64
+#endif
+#else
+#if !defined(_ILP32)
+#define        _ILP32
+#endif
+#endif
+
+#define        _BIG_ENDIAN
+
+#else /* Currently x86_64, i386, arm, powerpc, s390, and sparc are supported */
 #error "Unsupported ISA type"
 #endif
 

diff --git a/module/spl/spl.mod.c b/module/spl/spl.mod.c
new file mode 100644 (file)
index 0000000..9145049
--- /dev/null
+++ b/module/spl/spl.mod.c
@@ -0,0 +1,173 @@
+#include <linux/module.h>
+#include <linux/vermagic.h>
+#include <linux/compiler.h>
+
+MODULE_INFO(vermagic, VERMAGIC_STRING);
+
+struct module __this_module
+__attribute__((section(".gnu.linkonce.this_module"))) = {
+ .name = KBUILD_MODNAME,
+ .init = init_module,
+#ifdef CONFIG_MODULE_UNLOAD
+ .exit = cleanup_module,
+#endif
+ .arch = MODULE_ARCH_INIT,
+};
+
+static const struct modversion_info ____versions[]
+__used
+__attribute__((section("__versions"))) = {
+       { 0x51198477, "module_layout" },
+       { 0x6a5fa363, "sigprocmask" },
+       { 0xdc9e0715, "kmem_cache_destroy" },
+       { 0xc816dc2d, "kmalloc_caches" },
+       { 0x5a34a45c, "__kmalloc" },
+       { 0x5aeb145f, "complete_and_exit" },
+       { 0x77ecac9f, "zlib_inflateEnd" },
+       { 0xf5893abf, "up_read" },
+       { 0x4c4fef19, "kernel_stack" },
+       { 0xadaabe1b, "pv_lock_ops" },
+       { 0xc163599a, "register_sysctl_table" },
+       { 0x287f10e3, "inode_permission" },
+       { 0x3ec8886f, "param_ops_int" },
+       { 0xa0fbac79, "wake_up_bit" },
+       { 0x25ec1b28, "strlen" },
+       { 0xf6221cbb, "seq_open" },
+       { 0xc8b57c27, "autoremove_wake_function" },
+       { 0xbd100793, "cpu_online_mask" },
+       { 0xb5dcab5b, "remove_wait_queue" },
+       { 0xd0bd878, "seq_puts" },
+       { 0xc8bbd666, "proc_dointvec" },
+       { 0x20000329, "simple_strtoul" },
+       { 0xc0a3d105, "find_next_bit" },
+       { 0xace09de5, "dput" },
+       { 0x21a7d814, "seq_printf" },
+       { 0x7406e576, "remove_proc_entry" },
+       { 0xc3784385, "filp_close" },
+       { 0xebebe14, "groups_free" },
+       { 0xfb0e29f, "init_timer_key" },
+       { 0xf8983de7, "prepare_to_wait_exclusive" },
+       { 0xba2adaf, "mutex_unlock" },
+       { 0x8581d631, "vfs_fsync" },
+       { 0x999e8297, "vfree" },
+       { 0x47c7b0d2, "cpu_number" },
+       { 0x84000109, "path_get" },
+       { 0x79fd81ae, "seq_read" },
+       { 0xd3b65d9d, "kthread_create_on_node" },
+       { 0x7d11c268, "jiffies" },
+       { 0x57a6ccd0, "down_read" },
+       { 0x393fb80d, "unlock_rename" },
+       { 0x76ac54ea, "kthread_bind" },
+       { 0x6395be94, "__init_waitqueue_head" },
+       { 0x4f8b5ddb, "_copy_to_user" },
+       { 0xffd5a395, "default_wake_function" },
+       { 0xfe7c4287, "nr_cpu_ids" },
+       { 0x72aa82c6, "param_ops_charp" },
+       { 0xa69289f4, "vfs_read" },
+       { 0xd5f2172f, "del_timer_sync" },
+       { 0xaba3870c, "kern_path" },
+       { 0xde0bdcff, "memset" },
+       { 0xc5661c2c, "proc_mkdir" },
+       { 0x11089ac7, "_ctype" },
+       { 0x8f64aa4, "_raw_spin_unlock_irqrestore" },
+       { 0x69371301, "current_task" },
+       { 0x87ebeb76, "__mutex_init" },
+       { 0x27e1a049, "printk" },
+       { 0xe15f42bb, "_raw_spin_trylock" },
+       { 0x4ebec927, "kthread_stop" },
+       { 0x2fa5a500, "memcmp" },
+       { 0xa1c76e0a, "_cond_resched" },
+       { 0xc0580937, "rb_erase" },
+       { 0x7ec9bfbc, "strncpy" },
+       { 0xd38eccd0, "proc_doulongvec_minmax" },
+       { 0xb4390f9a, "mcount" },
+       { 0xce5ac24f, "zlib_inflate_workspacesize" },
+       { 0x85abc85f, "strncmp" },
+       { 0x672144bd, "strlcpy" },
+       { 0xde31469e, "kmem_cache_free" },
+       { 0x93a6e0b2, "io_schedule" },
+       { 0xc2fadba6, "lock_rename" },
+       { 0xafe1db9d, "mutex_lock" },
+       { 0x1e6d26a8, "strstr" },
+       { 0xbe2c0274, "add_timer" },
+       { 0xf0f1246c, "kvasprintf" },
+       { 0xc740c64a, "memchr" },
+       { 0x315c65fd, "zlib_deflateInit2" },
+       { 0x3b4ceb4a, "up_write" },
+       { 0xe6e3b875, "down_write" },
+       { 0x4d839a9e, "fput" },
+       { 0x3d66107e, "proc_dostring" },
+       { 0xcde0a3b6, "flush_signals" },
+       { 0x881039d0, "zlib_inflate" },
+       { 0x9f984513, "strrchr" },
+       { 0xafd3be90, "kmem_cache_alloc" },
+       { 0x78764f4e, "pv_irq_ops" },
+       { 0x618911fc, "numa_node" },
+       { 0xc50bab05, "unregister_shrinker" },
+       { 0xcc07af75, "strnlen" },
+       { 0x12a38747, "usleep_range" },
+       { 0x457df5c7, "unregister_sysctl_table" },
+       { 0x93fca811, "__get_free_pages" },
+       { 0xe9f7149c, "zlib_deflate_workspacesize" },
+       { 0xf0fdf6cb, "__stack_chk_fail" },
+       { 0xb9249d16, "cpu_possible_mask" },
+       { 0xd62c833f, "schedule_timeout" },
+       { 0x1000e51, "schedule" },
+       { 0x79a38e61, "___ratelimit" },
+       { 0x6b2dc060, "dump_stack" },
+       { 0xcfa37f55, "wake_up_process" },
+       { 0xa9f5a57b, "__put_cred" },
+       { 0xcdd61e06, "user_path_at" },
+       { 0x82384b7, "path_put" },
+       { 0x54b130a8, "kmem_cache_alloc_trace" },
+       { 0xd52bf1ce, "_raw_spin_lock" },
+       { 0x3928efe9, "__per_cpu_offset" },
+       { 0x9327f5ce, "_raw_spin_lock_irqsave" },
+       { 0xa6dcc773, "rb_insert_color" },
+       { 0x5a642ebb, "vfs_unlink" },
+       { 0x83acad80, "kmem_cache_create" },
+       { 0x4211c3c1, "zlib_inflateInit2" },
+       { 0xaf64ad0d, "zlib_deflate" },
+       { 0x10f2eb76, "vsnprintf" },
+       { 0x4302d0eb, "free_pages" },
+       { 0xcf21d241, "__wake_up" },
+       { 0xd2965f6f, "kthread_should_stop" },
+       { 0xa0ceef51, "out_of_line_wait_on_bit" },
+       { 0x1711d684, "proc_create_data" },
+       { 0x2de278c4, "seq_lseek" },
+       { 0x506746b6, "getrawmonotonic" },
+       { 0x5c5fd5f1, "iput" },
+       { 0xa9bd2676, "__vmalloc" },
+       { 0x37a0cba, "kfree" },
+       { 0x236c8c64, "memcpy" },
+       { 0x5c8b5ce8, "prepare_to_wait" },
+       { 0x9518b623, "register_shrinker" },
+       { 0xcd2549e0, "set_user_nice" },
+       { 0xee46885d, "add_wait_queue_exclusive" },
+       { 0x3340f4bd, "fget" },
+       { 0xf741c793, "zlib_deflateEnd" },
+       { 0xfa66f77c, "finish_wait" },
+       { 0x4cbbd171, "__bitmap_weight" },
+       { 0xe8116e08, "__kmalloc_node" },
+       { 0x50720c5f, "snprintf" },
+       { 0x1649bb51, "seq_release" },
+       { 0xa3a5be95, "memmove" },
+       { 0x2258d378, "lookup_one_len" },
+       { 0xcc025652, "vfs_rename" },
+       { 0x5541ea93, "on_each_cpu" },
+       { 0x7a97c742, "vfs_getattr" },
+       { 0x4f6b400b, "_copy_from_user" },
+       { 0xa2c56c31, "param_ops_ulong" },
+       { 0xc3fe87c8, "param_ops_uint" },
+       { 0x2a6e6109, "__init_rwsem" },
+       { 0x3ddcc090, "vfs_write" },
+       { 0x3312bd6c, "filp_open" },
+};
+
+static const char __module_depends[]
+__used
+__attribute__((section(".modinfo"))) =
+"depends=zlib_deflate";
+
+
+MODULE_INFO(srcversion, "9E7B4A7108A949885C986BF");

diff --git a/module/splat/splat.mod.c b/module/splat/splat.mod.c
new file mode 100644 (file)
index 0000000..d20b6a5
--- /dev/null
+++ b/module/splat/splat.mod.c
@@ -0,0 +1,174 @@
+#include <linux/module.h>
+#include <linux/vermagic.h>
+#include <linux/compiler.h>
+
+MODULE_INFO(vermagic, VERMAGIC_STRING);
+
+struct module __this_module
+__attribute__((section(".gnu.linkonce.this_module"))) = {
+ .name = KBUILD_MODNAME,
+ .init = init_module,
+#ifdef CONFIG_MODULE_UNLOAD
+ .exit = cleanup_module,
+#endif
+ .arch = MODULE_ARCH_INIT,
+};
+
+static const struct modversion_info ____versions[]
+__used
+__attribute__((section("__versions"))) = {
+       { 0x51198477, "module_layout" },
+       { 0xdd4acab1, "vn_fsync" },
+       { 0xc816dc2d, "kmalloc_caches" },
+       { 0x5a34a45c, "__kmalloc" },
+       { 0xf9a482f9, "msleep" },
+       { 0x8d8996ce, "z_uncompress" },
+       { 0x26b64321, "call_usermodehelper_setfns" },
+       { 0xd670e116, "spl_kmem_alloc_warn" },
+       { 0xf5893abf, "up_read" },
+       { 0x1c1af916, "set_normalized_timespec" },
+       { 0xdb347c7a, "call_usermodehelper_exec" },
+       { 0xd6ee688f, "vmalloc" },
+       { 0xadaabe1b, "pv_lock_ops" },
+       { 0x25ec1b28, "strlen" },
+       { 0x8205f265, "crhold" },
+       { 0x1efe1f66, "vn_close" },
+       { 0x4ff1c9bc, "populate_rootfs_wait" },
+       { 0x19295e53, "taskq_create" },
+       { 0x3f38bd50, "crgetruid" },
+       { 0xc8b57c27, "autoremove_wake_function" },
+       { 0xd14a7eb5, "vn_getattr" },
+       { 0xbd100793, "cpu_online_mask" },
+       { 0x79aa04a2, "get_random_bytes" },
+       { 0xab140103, "spl_kmem_alloc" },
+       { 0x80c478fd, "rootdir" },
+       { 0x52760ca9, "getnstimeofday" },
+       { 0x73a78bc4, "downgrade_write" },
+       { 0xffff91e3, "taskq_init_ent" },
+       { 0xefc4da17, "kobj_close_file" },
+       { 0xc0a3d105, "find_next_bit" },
+       { 0xf7fb002a, "kobj_get_filesize" },
+       { 0x63bdf5f0, "crgetngroups" },
+       { 0xf7756b61, "vn_rename" },
+       { 0x8e4c2658, "crgetgroups" },
+       { 0xebebe14, "groups_free" },
+       { 0xba2adaf, "mutex_unlock" },
+       { 0x4704f678, "vn_rdwr" },
+       { 0x999e8297, "vfree" },
+       { 0xda8ebb70, "crgetsuid" },
+       { 0x91715312, "sprintf" },
+       { 0x8eb0a41f, "tsd_destroy" },
+       { 0xb8e71471, "spl_kmem_cache_free" },
+       { 0x53c639a, "ddi_strtoul" },
+       { 0xbc32eee7, "spl_panic" },
+       { 0x7d11c268, "jiffies" },
+       { 0x31eb4278, "mutex_trylock" },
+       { 0x57a6ccd0, "down_read" },
+       { 0x30e8b295, "spl_kthread_create" },
+       { 0x35225ea3, "down_write_trylock" },
+       { 0xde9360ba, "totalram_pages" },
+       { 0x786ba98a, "crgetuid" },
+       { 0x6395be94, "__init_waitqueue_head" },
+       { 0x4f8b5ddb, "_copy_to_user" },
+       { 0xfe7c4287, "nr_cpu_ids" },
+       { 0x106b6ba8, "taskq_destroy" },
+       { 0x114258fb, "misc_register" },
+       { 0xde0bdcff, "memset" },
+       { 0x8b78128, "spl_kmem_cache_destroy" },
+       { 0xbc9dddde, "taskq_wait_id" },
+       { 0x8f64aa4, "_raw_spin_unlock_irqrestore" },
+       { 0x69371301, "current_task" },
+       { 0x143fcac6, "__cv_signal" },
+       { 0x87ebeb76, "__mutex_init" },
+       { 0x27e1a049, "printk" },
+       { 0x4ebec927, "kthread_stop" },
+       { 0x8bb0527b, "crgetrgid" },
+       { 0x2fa5a500, "memcmp" },
+       { 0x856dab93, "set_current_groups" },
+       { 0xa1c76e0a, "_cond_resched" },
+       { 0xb940ee11, "taskq_wait" },
+       { 0x7ec9bfbc, "strncpy" },
+       { 0xb4390f9a, "mcount" },
+       { 0x676335fa, "__cv_timedwait" },
+       { 0x85abc85f, "strncmp" },
+       { 0xafe1db9d, "mutex_lock" },
+       { 0xa340453c, "system_taskq" },
+       { 0x13401075, "taskq_dispatch" },
+       { 0x5bb6ad4b, "spl_vmem_zalloc" },
+       { 0x6e06545b, "crgetsgid" },
+       { 0x3b4ceb4a, "up_write" },
+       { 0xe6e3b875, "down_write" },
+       { 0x6d601403, "crgetgid" },
+       { 0x1b7b5809, "__cv_broadcast" },
+       { 0x3323ccb1, "tsd_get" },
+       { 0x53bddca5, "taskq_dispatch_ent" },
+       { 0x9d271bf, "spl_kmem_cache_expire" },
+       { 0x31eaf145, "init_task" },
+       { 0xfd07bd40, "spl_kmem_alloc_max" },
+       { 0x351c2576, "z_compress_level" },
+       { 0x81376bfd, "vn_remove" },
+       { 0xc50bab05, "unregister_shrinker" },
+       { 0x6ae07d22, "__cv_wait" },
+       { 0x17980bc5, "crfree" },
+       { 0x93fca811, "__get_free_pages" },
+       { 0xf0fdf6cb, "__stack_chk_fail" },
+       { 0xd62c833f, "schedule_timeout" },
+       { 0x1000e51, "schedule" },
+       { 0x4b5814ef, "kmalloc_order_trace" },
+       { 0x958b84e3, "tsd_create" },
+       { 0x667ba081, "spl_kmem_cache_create" },
+       { 0x20173f35, "taskq_wait_outstanding" },
+       { 0xaebbec7c, "kobj_read_file" },
+       { 0xdae80439, "spl_vmem_alloc" },
+       { 0xcfa37f55, "wake_up_process" },
+       { 0xd22ed5e2, "spl_kmem_cache_alloc" },
+       { 0xa3a77c69, "down_read_trylock" },
+       { 0x54b130a8, "kmem_cache_alloc_trace" },
+       { 0x360e492b, "__cv_init" },
+       { 0xd52bf1ce, "_raw_spin_lock" },
+       { 0x9327f5ce, "_raw_spin_lock_irqsave" },
+       { 0x4302d0eb, "free_pages" },
+       { 0xcf21d241, "__wake_up" },
+       { 0x659a64d0, "call_usermodehelper_setup" },
+       { 0xd2965f6f, "kthread_should_stop" },
+       { 0x2c0fbe10, "vn_open" },
+       { 0x31ec560e, "groups_alloc" },
+       { 0x506746b6, "getrawmonotonic" },
+       { 0x1285cb78, "tsd_set" },
+       { 0x3896a905, "__thread_exit" },
+       { 0x37a0cba, "kfree" },
+       { 0x82fe53e1, "ddi_strtol" },
+       { 0x236c8c64, "memcpy" },
+       { 0x5c8b5ce8, "prepare_to_wait" },
+       { 0x9518b623, "register_shrinker" },
+       { 0xf68905fd, "ddi_strtoull" },
+       { 0xd9ace09, "ddi_strtoll" },
+       { 0xfa66f77c, "finish_wait" },
+       { 0x4cbbd171, "__bitmap_weight" },
+       { 0x9f46de9, "kobj_open_file" },
+       { 0x185936d6, "groupmember" },
+       { 0x401c592f, "spl_version" },
+       { 0x50720c5f, "snprintf" },
+       { 0x80c3f220, "spl_kmem_free" },
+       { 0x7466fa85, "spl_kmem_cache_reap_now" },
+       { 0x1500ba78, "__thread_create" },
+       { 0x4f6b400b, "_copy_from_user" },
+       { 0x778a305, "spl_vmem_free" },
+       { 0xb3e56341, "taskq_cancel_id" },
+       { 0xdfb0b5e5, "misc_deregister" },
+       { 0x2a6e6109, "__init_rwsem" },
+       { 0xec031267, "taskq_dispatch_delay" },
+       { 0x85524b8b, "p0" },
+       { 0x59fe72f0, "__cv_destroy" },
+       { 0x2e1cae5a, "vn_openat" },
+       { 0x9dcb88fc, "spl_kmem_zalloc" },
+       { 0xdb7958d9, "taskq_empty_ent" },
+};
+
+static const char __module_depends[]
+__used
+__attribute__((section(".modinfo"))) =
+"depends=spl";
+
+
+MODULE_INFO(srcversion, "EFD5F56EF2E9E5A7BCED0BE");

diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
index 90632e2039071fe789f4514e3f4b27a3e23b08c2..f2efbcf51796add472848eff36712c71cd4efd65 100644 (file)
--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
@@ -162,6 +162,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar 22 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.6-1
+- Remove artificial architecture restrictions in packaging
+- Add support for s390[x] zfsonlinux/spl#537
 * Wed Mar 9 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.5-1
 - Linux 4.5 compatibility zfsonlinux/spl#524
 - Create working debuginfo packages on Red Hat zfsonlinux/zfs#4224

diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
index 701035677f7984e066b5229bae8c462901e0ea6b..ac8b8d2f3bf45698eb08f7088f18c12cbd7e6723 100644 (file)
--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
@@ -8,11 +8,6 @@ License:        GPLv2+
 URL:            http://zfsonlinux.org/
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  i386 i686 x86_64
-
-# May build but untested on ppc/ppc64
-ExcludeArch:    ppc ppc64
-
 Requires:       %{name}-kmod = %{version}
 Provides:       %{name}-kmod-common = %{version}
 
@@ -38,6 +33,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Tue Mar 22 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.6-1
+- Remove artificial architecture restrictions in packaging
+- Add support for s390[x] zfsonlinux/spl#537
 * Wed Mar 9 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.5-1
 - Linux 4.5 compatibility zfsonlinux/spl#524
 - Create working debuginfo packages on Red Hat zfsonlinux/zfs#4224

diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in
index 701035677f7984e066b5229bae8c462901e0ea6b..ac8b8d2f3bf45698eb08f7088f18c12cbd7e6723 100644 (file)
--- a/rpm/redhat/spl.spec.in
+++ b/rpm/redhat/spl.spec.in
@@ -8,11 +8,6 @@ License:        GPLv2+
 URL:            http://zfsonlinux.org/
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  i386 i686 x86_64
-
-# May build but untested on ppc/ppc64
-ExcludeArch:    ppc ppc64
-
 Requires:       %{name}-kmod = %{version}
 Provides:       %{name}-kmod-common = %{version}
 
@@ -38,6 +33,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Tue Mar 22 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.6-1
+- Remove artificial architecture restrictions in packaging
+- Add support for s390[x] zfsonlinux/spl#537
 * Wed Mar 9 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.5-1
 - Linux 4.5 compatibility zfsonlinux/spl#524
 - Create working debuginfo packages on Red Hat zfsonlinux/zfs#4224