Applied patch from Debian package maintainer (Agney Lopes Roth Ferraz <agney@debian.org>).

Add support for IA64, S390 and Alpha.
Fixes zlib path.

50 files changed, 268 insertions, 3 deletions

diff --git a/hardinfo2/arch/common/zlib.h b/hardinfo2/arch/common/zlib.h
index 3fb7fd17..0e93be47 100644
--- a/hardinfo2/arch/common/zlib.h
+++ b/hardinfo2/arch/common/zlib.h
@@ -27,7 +27,7 @@ benchmark_zlib(void)
     if (!(compress && compressBound)) {
 	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
 	if (!libz) {
-            libz = g_module_open("/lib/libz.so", G_MODULE_BIND_LAZY);
+            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
             if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return g_strdup("[Error]\n"
diff --git a/hardinfo2/arch/linux/alpha/alsa.h b/hardinfo2/arch/linux/alpha/alsa.h
new file mode 120000
index 00000000..ede8a364
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/alsa.h
@@ -0,0 +1 @@
+../../../arch/linux/common/alsa.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/filesystem.h b/hardinfo2/arch/linux/alpha/filesystem.h
new file mode 120000
index 00000000..d884bcd0
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/filesystem.h
@@ -0,0 +1 @@
+../../../arch/linux/common/filesystem.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/inputdevices.h b/hardinfo2/arch/linux/alpha/inputdevices.h
new file mode 120000
index 00000000..0f594231
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/inputdevices.h
@@ -0,0 +1 @@
+../../../arch/linux/common/inputdevices.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/loadavg.h b/hardinfo2/arch/linux/alpha/loadavg.h
new file mode 120000
index 00000000..1f64e107
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/loadavg.h
@@ -0,0 +1 @@
+../../../arch/linux/common/loadavg.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/memory.h b/hardinfo2/arch/linux/alpha/memory.h
new file mode 120000
index 00000000..64c6e0ed
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/memory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/memory.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/modules.h b/hardinfo2/arch/linux/alpha/modules.h
new file mode 120000
index 00000000..d21c9a20
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/modules.h
@@ -0,0 +1 @@
+../../../arch/linux/common/modules.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/net.h b/hardinfo2/arch/linux/alpha/net.h
new file mode 120000
index 00000000..488b5ae3
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/net.h
@@ -0,0 +1 @@
+../../../arch/linux/common/net.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/nfs.h b/hardinfo2/arch/linux/alpha/nfs.h
new file mode 120000
index 00000000..73e0b8c9
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/nfs.h
@@ -0,0 +1 @@
+../../../arch/linux/common/nfs.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/os.h b/hardinfo2/arch/linux/alpha/os.h
new file mode 120000
index 00000000..44051626
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/os.h
@@ -0,0 +1 @@
+../../../arch/linux/common/os.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/pci.h b/hardinfo2/arch/linux/alpha/pci.h
new file mode 120000
index 00000000..8df04a0e
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/pci.h
@@ -0,0 +1 @@
+../../../arch/linux/common/pci.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/processor.h b/hardinfo2/arch/linux/alpha/processor.h
new file mode 100644
index 00000000..fa02ea05
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/processor.h
@@ -0,0 +1,71 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("cpu model", processor->model_name);
+	    get_float("BogoMIPS", processor->bogomips);
+	    get_str("platform string", processor->strmodel);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL);
+    g_free(processor->model_name);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor] %s\n"
+	                       "Plataform String=%s\n"
+	                       "BogoMips=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->strmodel,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/hardinfo2/arch/linux/alpha/samba.h b/hardinfo2/arch/linux/alpha/samba.h
new file mode 120000
index 00000000..ebab9b11
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/samba.h
@@ -0,0 +1 @@
+../../../arch/linux/common/samba.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/sensors.h b/hardinfo2/arch/linux/alpha/sensors.h
new file mode 120000
index 00000000..3b799377
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/sensors.h
@@ -0,0 +1 @@
+../../../arch/linux/common/sensors.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/storage.h b/hardinfo2/arch/linux/alpha/storage.h
new file mode 120000
index 00000000..3ea886ce
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/storage.h
@@ -0,0 +1 @@
+../../../arch/linux/common/storage.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/uptime.h b/hardinfo2/arch/linux/alpha/uptime.h
new file mode 120000
index 00000000..a5bac980
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/uptime.h
@@ -0,0 +1 @@
+../../../arch/linux/common/uptime.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/alpha/usb.h b/hardinfo2/arch/linux/alpha/usb.h
new file mode 120000
index 00000000..aee3046c
--- /dev/null
+++ b/hardinfo2/arch/linux/alpha/usb.h
@@ -0,0 +1 @@
+../../../arch/linux/common/usb.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/alsa.h b/hardinfo2/arch/linux/ia64/alsa.h
new file mode 120000
index 00000000..ede8a364
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/alsa.h
@@ -0,0 +1 @@
+../../../arch/linux/common/alsa.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/filesystem.h b/hardinfo2/arch/linux/ia64/filesystem.h
new file mode 120000
index 00000000..d884bcd0
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/filesystem.h
@@ -0,0 +1 @@
+../../../arch/linux/common/filesystem.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/inputdevices.h b/hardinfo2/arch/linux/ia64/inputdevices.h
new file mode 120000
index 00000000..0f594231
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/inputdevices.h
@@ -0,0 +1 @@
+../../../arch/linux/common/inputdevices.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/loadavg.h b/hardinfo2/arch/linux/ia64/loadavg.h
new file mode 120000
index 00000000..1f64e107
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/loadavg.h
@@ -0,0 +1 @@
+../../../arch/linux/common/loadavg.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/memory.h b/hardinfo2/arch/linux/ia64/memory.h
new file mode 120000
index 00000000..64c6e0ed
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/memory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/memory.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/modules.h b/hardinfo2/arch/linux/ia64/modules.h
new file mode 120000
index 00000000..d21c9a20
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/modules.h
@@ -0,0 +1 @@
+../../../arch/linux/common/modules.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/net.h b/hardinfo2/arch/linux/ia64/net.h
new file mode 120000
index 00000000..488b5ae3
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/net.h
@@ -0,0 +1 @@
+../../../arch/linux/common/net.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/nfs.h b/hardinfo2/arch/linux/ia64/nfs.h
new file mode 120000
index 00000000..73e0b8c9
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/nfs.h
@@ -0,0 +1 @@
+../../../arch/linux/common/nfs.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/os.h b/hardinfo2/arch/linux/ia64/os.h
new file mode 120000
index 00000000..44051626
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/os.h
@@ -0,0 +1 @@
+../../../arch/linux/common/os.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/pci.h b/hardinfo2/arch/linux/ia64/pci.h
new file mode 120000
index 00000000..8df04a0e
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/pci.h
@@ -0,0 +1 @@
+../../../arch/linux/common/pci.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/processor.h b/hardinfo2/arch/linux/ia64/processor.h
new file mode 100644
index 00000000..9cad3b24
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/processor.h
@@ -0,0 +1,70 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("vendor", processor->model_name);
+	    get_str("arch", processor->vendor_id);
+	    get_str("family", processor->strmodel);
+	    get_float("BogoMIPS", processor->bogomips);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor] %s\n"
+	                       "Arch=%s\n"
+	                       "Family=%sMHz\n"
+			       "BogoMips=%s\n"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->vendor_id,
+			       processor->strmodel,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/hardinfo2/arch/linux/ia64/samba.h b/hardinfo2/arch/linux/ia64/samba.h
new file mode 120000
index 00000000..ebab9b11
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/samba.h
@@ -0,0 +1 @@
+../../../arch/linux/common/samba.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/sensors.h b/hardinfo2/arch/linux/ia64/sensors.h
new file mode 120000
index 00000000..3b799377
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/sensors.h
@@ -0,0 +1 @@
+../../../arch/linux/common/sensors.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/storage.h b/hardinfo2/arch/linux/ia64/storage.h
new file mode 120000
index 00000000..3ea886ce
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/storage.h
@@ -0,0 +1 @@
+../../../arch/linux/common/storage.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/uptime.h b/hardinfo2/arch/linux/ia64/uptime.h
new file mode 120000
index 00000000..a5bac980
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/uptime.h
@@ -0,0 +1 @@
+../../../arch/linux/common/uptime.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/ia64/usb.h b/hardinfo2/arch/linux/ia64/usb.h
new file mode 120000
index 00000000..aee3046c
--- /dev/null
+++ b/hardinfo2/arch/linux/ia64/usb.h
@@ -0,0 +1 @@
+../../../arch/linux/common/usb.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/alsa.h b/hardinfo2/arch/linux/s390/alsa.h
new file mode 120000
index 00000000..ede8a364
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/alsa.h
@@ -0,0 +1 @@
+../../../arch/linux/common/alsa.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/filesystem.h b/hardinfo2/arch/linux/s390/filesystem.h
new file mode 120000
index 00000000..d884bcd0
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/filesystem.h
@@ -0,0 +1 @@
+../../../arch/linux/common/filesystem.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/inputdevices.h b/hardinfo2/arch/linux/s390/inputdevices.h
new file mode 120000
index 00000000..0f594231
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/inputdevices.h
@@ -0,0 +1 @@
+../../../arch/linux/common/inputdevices.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/loadavg.h b/hardinfo2/arch/linux/s390/loadavg.h
new file mode 120000
index 00000000..1f64e107
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/loadavg.h
@@ -0,0 +1 @@
+../../../arch/linux/common/loadavg.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/memory.h b/hardinfo2/arch/linux/s390/memory.h
new file mode 120000
index 00000000..64c6e0ed
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/memory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/memory.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/modules.h b/hardinfo2/arch/linux/s390/modules.h
new file mode 120000
index 00000000..d21c9a20
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/modules.h
@@ -0,0 +1 @@
+../../../arch/linux/common/modules.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/net.h b/hardinfo2/arch/linux/s390/net.h
new file mode 120000
index 00000000..488b5ae3
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/net.h
@@ -0,0 +1 @@
+../../../arch/linux/common/net.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/nfs.h b/hardinfo2/arch/linux/s390/nfs.h
new file mode 120000
index 00000000..73e0b8c9
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/nfs.h
@@ -0,0 +1 @@
+../../../arch/linux/common/nfs.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/os.h b/hardinfo2/arch/linux/s390/os.h
new file mode 120000
index 00000000..44051626
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/os.h
@@ -0,0 +1 @@
+../../../arch/linux/common/os.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/pci.h b/hardinfo2/arch/linux/s390/pci.h
new file mode 120000
index 00000000..8df04a0e
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/pci.h
@@ -0,0 +1 @@
+../../../arch/linux/common/pci.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/processor.h b/hardinfo2/arch/linux/s390/processor.h
new file mode 100644
index 00000000..604b3514
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/processor.h
@@ -0,0 +1,70 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("vendor_id", processor->vendor_id);
+	    get_float("# processors", processor->processors);
+	    get_int("bogomips per cpu", processor->bogomips);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat("S390 ", processor->vendor_id, NULL);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor]\n"
+	                       "Processors=%d\n"
+	                       "BogoMips per CPU=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->processors,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/hardinfo2/arch/linux/s390/samba.h b/hardinfo2/arch/linux/s390/samba.h
new file mode 120000
index 00000000..ebab9b11
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/samba.h
@@ -0,0 +1 @@
+../../../arch/linux/common/samba.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/sensors.h b/hardinfo2/arch/linux/s390/sensors.h
new file mode 120000
index 00000000..3b799377
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/sensors.h
@@ -0,0 +1 @@
+../../../arch/linux/common/sensors.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/storage.h b/hardinfo2/arch/linux/s390/storage.h
new file mode 120000
index 00000000..3ea886ce
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/storage.h
@@ -0,0 +1 @@
+../../../arch/linux/common/storage.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/uptime.h b/hardinfo2/arch/linux/s390/uptime.h
new file mode 120000
index 00000000..a5bac980
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/uptime.h
@@ -0,0 +1 @@
+../../../arch/linux/common/uptime.h
\ No newline at end of file
diff --git a/hardinfo2/arch/linux/s390/usb.h b/hardinfo2/arch/linux/s390/usb.h
new file mode 120000
index 00000000..aee3046c
--- /dev/null
+++ b/hardinfo2/arch/linux/s390/usb.h
@@ -0,0 +1 @@
+../../../arch/linux/common/usb.h
\ No newline at end of file
diff --git a/hardinfo2/configure b/hardinfo2/configure
index f254de5a..978b476c 100755
--- a/hardinfo2/configure
+++ b/hardinfo2/configure
@@ -40,7 +40,7 @@ case $OS in
 	Linux)
 		;;
 	*)
-		echo " (not supported, yet!)"
+		echo "$OS (not supported, yet!)"
 		exit ;;
 esac	
 
@@ -64,9 +64,18 @@ case $PROC in
 	sparc*)
 		ln -sf linux/sparc arch/this
 		ARCH="ARCH_SPARC" ;;
-	armv4l)
+	armv*)
 		ln -sf linux/armv4l arch/this
 		ARCH="ARCH_ARMV4L" ;;
+        ia64)
+                ln -sf linux/ia64  arch/this
+                ARCH="ARCH_IA64" ;;
+        alpha)
+                ln -sf linux/alpha  arch/this
+                ARCH="ARCH_ALPHA" ;;
+        s390)
+                ln -sf linux/s390  arch/this
+                ARCH="ARCH_S390" ;;
 	*)
 		# uname -m on m68k doesn't return anything useful :/
 		grep "680?0" /proc/cpuinfo > /dev/null