From d511b6766f2c1a5c05500eeae1ec45a58b271cb3 Mon Sep 17 00:00:00 2001 From: bigbear Date: Thu, 1 Feb 2024 17:55:17 +0100 Subject: [PATCH 1/9] LICENSE changed to GPL2+ for project and source code According to approval from copyright holders - see: https://github.com/lpereira/hardinfo/issues/530 https://github.com/lpereira/hardinfo/issues/707 --- LICENSE | 5 +++-- hardinfo/cpu_util.c | 2 +- hardinfo/dmi_util.c | 2 +- hardinfo/dt_util.c | 2 +- hardinfo/expr.c | 2 +- hardinfo/gpu_util.c | 2 +- hardinfo/hardinfo.c | 2 +- hardinfo/info.c | 2 +- hardinfo/pci_util.c | 2 +- hardinfo/socket.c | 2 +- hardinfo/usb_util.c | 2 +- hardinfo/vendor.c | 2 +- hardinfo/x_util.c | 2 +- includes/alpha/processor-platform.h | 2 +- includes/arm/processor-platform.h | 2 +- includes/callbacks.h | 2 +- includes/computer.h | 2 +- includes/distro_flavors.h | 2 +- includes/dmi_util.h | 2 +- includes/e2k/processor-platform.h | 2 +- includes/expr.h | 2 +- includes/gpu_util.h | 2 +- includes/guibench.h | 2 +- includes/hardinfo.h | 2 +- includes/help-viewer.h | 2 +- includes/ia64/processor-platform.h | 2 +- includes/iconcache.h | 2 +- includes/info.h | 2 +- includes/m68k/processor-platform.h | 2 +- includes/menu.h | 2 +- includes/mips/processor-platform.h | 2 +- includes/parisc/processor-platform.h | 2 +- includes/pci_util.h | 2 +- includes/ppc/processor-platform.h | 2 +- includes/report.h | 2 +- includes/riscv/processor-platform.h | 2 +- includes/s390/processor-platform.h | 2 +- includes/sh/processor-platform.h | 2 +- includes/shell.h | 2 +- includes/socket.h | 2 +- includes/sparc/processor-platform.h | 2 +- includes/stock.h | 2 +- includes/syncmanager.h | 2 +- includes/usb_util.h | 2 +- includes/vendor.h | 2 +- includes/x86/processor-platform.h | 2 +- includes/x_util.h | 2 +- modules/benchmark.c | 4 ++-- modules/benchmark/bench_results.c | 2 +- modules/benchmark/benches.c | 2 +- modules/benchmark/blowfish2.c | 2 +- modules/benchmark/cryptohash.c | 2 +- modules/benchmark/drawing.c | 2 +- modules/benchmark/fft.c | 2 +- modules/benchmark/fib.c | 2 +- modules/benchmark/guibench.c | 2 +- modules/benchmark/raytrace.c | 2 +- modules/benchmark/sysbench.c | 2 +- modules/benchmark/zlib.c | 2 +- modules/computer.c | 5 ++--- modules/computer/alsa.c | 2 +- modules/computer/boots.c | 2 +- modules/computer/display.c | 2 +- modules/computer/environment.c | 2 +- modules/computer/filesystem.c | 2 +- modules/computer/groups.c | 2 +- modules/computer/languages.c | 2 +- modules/computer/loadavg.c | 2 +- modules/computer/memory.c | 2 +- modules/computer/memory_usage.c | 2 +- modules/computer/modules.c | 2 +- modules/computer/os.c | 2 +- modules/computer/ubuntu_flavors.c | 2 +- modules/computer/uptime.c | 2 +- modules/computer/users.c | 2 +- modules/devices.c | 4 ++-- modules/devices/alpha/processor.c | 2 +- modules/devices/arm/processor.c | 2 +- modules/devices/battery.c | 2 +- modules/devices/devicetree.c | 2 +- modules/devices/devicetree/pmac_data.c | 2 +- modules/devices/devicetree/rpi_data.c | 2 +- modules/devices/dmi.c | 2 +- modules/devices/dmi_memory.c | 2 +- modules/devices/e2k/processor.c | 2 +- modules/devices/firmware.c | 2 +- modules/devices/gpu.c | 2 +- modules/devices/ia64/processor.c | 2 +- modules/devices/inputdevices.c | 2 +- modules/devices/loongarch64/processor.c | 2 +- modules/devices/m68k/processor.c | 2 +- modules/devices/mips/processor.c | 2 +- modules/devices/monitors.c | 2 +- modules/devices/parisc/processor.c | 2 +- modules/devices/pci.c | 2 +- modules/devices/ppc/processor.c | 2 +- modules/devices/printers.c | 2 +- modules/devices/resources.c | 2 +- modules/devices/riscv/processor.c | 2 +- modules/devices/s390/processor.c | 2 +- modules/devices/sensors.c | 2 +- modules/devices/sh/processor.c | 2 +- modules/devices/sparc/processor.c | 2 +- modules/devices/storage.c | 2 +- modules/devices/usb.c | 2 +- modules/devices/x86/processor.c | 2 +- modules/network.c | 4 ++-- modules/network/net.c | 2 +- modules/network/nfs.c | 2 +- modules/network/samba.c | 2 +- shell/callbacks.c | 4 ++-- shell/iconcache.c | 2 +- shell/loadgraph.c | 2 +- shell/menu.c | 2 +- shell/report.c | 2 +- shell/shell.c | 2 +- shell/stock.c | 2 +- shell/syncmanager.c | 2 +- 118 files changed, 125 insertions(+), 125 deletions(-) diff --git a/LICENSE b/LICENSE index 21b9363e1..e53df7231 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +Valid-License-Identifier: GPL-2.0+ + + GNU General Public License v2.0 or later Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/hardinfo/cpu_util.c b/hardinfo/cpu_util.c index 8db5f61a5..30e114585 100644 --- a/hardinfo/cpu_util.c +++ b/hardinfo/cpu_util.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/dmi_util.c b/hardinfo/dmi_util.c index 94351ad73..5482c1517 100644 --- a/hardinfo/dmi_util.c +++ b/hardinfo/dmi_util.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/dt_util.c b/hardinfo/dt_util.c index 1f65d9c6c..08b0e3178 100644 --- a/hardinfo/dt_util.c +++ b/hardinfo/dt_util.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/expr.c b/hardinfo/expr.c index 83e1e02c7..26284aee1 100644 --- a/hardinfo/expr.c +++ b/hardinfo/expr.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/gpu_util.c b/hardinfo/gpu_util.c index 29f6c77ef..5d32f9e2d 100644 --- a/hardinfo/gpu_util.c +++ b/hardinfo/gpu_util.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/hardinfo.c b/hardinfo/hardinfo.c index 1488e0a18..2a5bc1fa6 100644 --- a/hardinfo/hardinfo.c +++ b/hardinfo/hardinfo.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/info.c b/hardinfo/info.c index 5e6db7e4d..6fbb0f35d 100644 --- a/hardinfo/info.c +++ b/hardinfo/info.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/pci_util.c b/hardinfo/pci_util.c index ccf4f7c41..c2305363b 100644 --- a/hardinfo/pci_util.c +++ b/hardinfo/pci_util.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/socket.c b/hardinfo/socket.c index 6e3a3f9ed..b94e43c29 100644 --- a/hardinfo/socket.c +++ b/hardinfo/socket.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/usb_util.c b/hardinfo/usb_util.c index 6f9f9ef80..cf3ece407 100644 --- a/hardinfo/usb_util.c +++ b/hardinfo/usb_util.c @@ -7,7 +7,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/vendor.c b/hardinfo/vendor.c index cb9cc9ba6..3f55d987c 100644 --- a/hardinfo/vendor.c +++ b/hardinfo/vendor.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hardinfo/x_util.c b/hardinfo/x_util.c index 2187b2246..2a7febb46 100644 --- a/hardinfo/x_util.c +++ b/hardinfo/x_util.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/alpha/processor-platform.h b/includes/alpha/processor-platform.h index 1b542caf7..7dfdd91cd 100644 --- a/includes/alpha/processor-platform.h +++ b/includes/alpha/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/arm/processor-platform.h b/includes/arm/processor-platform.h index 99c8c2329..a168db687 100644 --- a/includes/arm/processor-platform.h +++ b/includes/arm/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/callbacks.h b/includes/callbacks.h index b853ee774..421cff5e9 100644 --- a/includes/callbacks.h +++ b/includes/callbacks.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/computer.h b/includes/computer.h index 59511d539..492030546 100644 --- a/includes/computer.h +++ b/includes/computer.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/distro_flavors.h b/includes/distro_flavors.h index a7393a45b..c316eeb68 100644 --- a/includes/distro_flavors.h +++ b/includes/distro_flavors.h @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/dmi_util.h b/includes/dmi_util.h index a6ecb11d7..2fec1a040 100644 --- a/includes/dmi_util.h +++ b/includes/dmi_util.h @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/e2k/processor-platform.h b/includes/e2k/processor-platform.h index c63618237..b8d59f779 100644 --- a/includes/e2k/processor-platform.h +++ b/includes/e2k/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/expr.h b/includes/expr.h index f544978f4..18d0cc659 100644 --- a/includes/expr.h +++ b/includes/expr.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/gpu_util.h b/includes/gpu_util.h index 6d5f860eb..c0089ffb9 100644 --- a/includes/gpu_util.h +++ b/includes/gpu_util.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/guibench.h b/includes/guibench.h index 0fdc46e9a..16f342181 100644 --- a/includes/guibench.h +++ b/includes/guibench.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/hardinfo.h b/includes/hardinfo.h index e35cbec39..41e7bd3a7 100644 --- a/includes/hardinfo.h +++ b/includes/hardinfo.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/help-viewer.h b/includes/help-viewer.h index d03de9421..85c78edfa 100644 --- a/includes/help-viewer.h +++ b/includes/help-viewer.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/ia64/processor-platform.h b/includes/ia64/processor-platform.h index 09f5d8fae..d118fe866 100644 --- a/includes/ia64/processor-platform.h +++ b/includes/ia64/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/iconcache.h b/includes/iconcache.h index d19210cab..b71924c37 100644 --- a/includes/iconcache.h +++ b/includes/iconcache.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/info.h b/includes/info.h index 349ab2da8..778945180 100644 --- a/includes/info.h +++ b/includes/info.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/m68k/processor-platform.h b/includes/m68k/processor-platform.h index cbb55d733..5e38bc110 100644 --- a/includes/m68k/processor-platform.h +++ b/includes/m68k/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/menu.h b/includes/menu.h index 50d1a792d..d5e8aeeb2 100644 --- a/includes/menu.h +++ b/includes/menu.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/mips/processor-platform.h b/includes/mips/processor-platform.h index c18d4b32c..394ba99e6 100644 --- a/includes/mips/processor-platform.h +++ b/includes/mips/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/parisc/processor-platform.h b/includes/parisc/processor-platform.h index 3261a2f55..b7485bdaa 100644 --- a/includes/parisc/processor-platform.h +++ b/includes/parisc/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/pci_util.h b/includes/pci_util.h index ceb862fc8..f2d1d6058 100644 --- a/includes/pci_util.h +++ b/includes/pci_util.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/ppc/processor-platform.h b/includes/ppc/processor-platform.h index b0f2e4ef9..df1fcbaa7 100644 --- a/includes/ppc/processor-platform.h +++ b/includes/ppc/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/report.h b/includes/report.h index 203f0a50d..47b510c12 100644 --- a/includes/report.h +++ b/includes/report.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/riscv/processor-platform.h b/includes/riscv/processor-platform.h index 6b1ad8963..b2c1c69ce 100644 --- a/includes/riscv/processor-platform.h +++ b/includes/riscv/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/s390/processor-platform.h b/includes/s390/processor-platform.h index 9a8b489bc..2edee1056 100644 --- a/includes/s390/processor-platform.h +++ b/includes/s390/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/sh/processor-platform.h b/includes/sh/processor-platform.h index be53a6dbd..e8ba76867 100644 --- a/includes/sh/processor-platform.h +++ b/includes/sh/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/shell.h b/includes/shell.h index 45a81bac5..ab39106c7 100644 --- a/includes/shell.h +++ b/includes/shell.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/socket.h b/includes/socket.h index 9f91eb78c..8dd4d4398 100644 --- a/includes/socket.h +++ b/includes/socket.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/sparc/processor-platform.h b/includes/sparc/processor-platform.h index 20de3f02a..c0e6f5cc7 100644 --- a/includes/sparc/processor-platform.h +++ b/includes/sparc/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/stock.h b/includes/stock.h index 25c3f9d69..b79c263eb 100644 --- a/includes/stock.h +++ b/includes/stock.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/syncmanager.h b/includes/syncmanager.h index 9542643e6..3b886b0f1 100644 --- a/includes/syncmanager.h +++ b/includes/syncmanager.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/usb_util.h b/includes/usb_util.h index 363b6c848..736a9237b 100644 --- a/includes/usb_util.h +++ b/includes/usb_util.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/vendor.h b/includes/vendor.h index 17c986cf1..213adaf83 100644 --- a/includes/vendor.h +++ b/includes/vendor.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/x86/processor-platform.h b/includes/x86/processor-platform.h index 488cb5333..0e9a276b7 100644 --- a/includes/x86/processor-platform.h +++ b/includes/x86/processor-platform.h @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/includes/x_util.h b/includes/x_util.h index 0c3f6630d..4d398c94e 100644 --- a/includes/x_util.h +++ b/includes/x_util.h @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark.c b/modules/benchmark.c index 50ba7d2de..c53790fab 100644 --- a/modules/benchmark.c +++ b/modules/benchmark.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -740,7 +740,7 @@ const ModuleAbout *hi_module_get_about(void) .author = "L. A. F. Pereira", .description = N_("Perform tasks and compare with other systems"), .version = VERSION, - .license = "GNU GPL version 2", + .license = "GNU GPL version 2 or later.", }; return &ma; diff --git a/modules/benchmark/bench_results.c b/modules/benchmark/bench_results.c index 5403d9639..e5212c714 100644 --- a/modules/benchmark/bench_results.c +++ b/modules/benchmark/bench_results.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/benches.c b/modules/benchmark/benches.c index ff571548d..26a031591 100644 --- a/modules/benchmark/benches.c +++ b/modules/benchmark/benches.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/blowfish2.c b/modules/benchmark/blowfish2.c index e3602acd8..7426bef91 100644 --- a/modules/benchmark/blowfish2.c +++ b/modules/benchmark/blowfish2.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/cryptohash.c b/modules/benchmark/cryptohash.c index 17159d93f..add7ca035 100644 --- a/modules/benchmark/cryptohash.c +++ b/modules/benchmark/cryptohash.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/drawing.c b/modules/benchmark/drawing.c index eaed934de..e92b9d620 100644 --- a/modules/benchmark/drawing.c +++ b/modules/benchmark/drawing.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/fft.c b/modules/benchmark/fft.c index 89b5d9c3d..b7086e064 100644 --- a/modules/benchmark/fft.c +++ b/modules/benchmark/fft.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/fib.c b/modules/benchmark/fib.c index 7fe950d83..c61a945bf 100644 --- a/modules/benchmark/fib.c +++ b/modules/benchmark/fib.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c index b97baf41d..9ff502104 100644 --- a/modules/benchmark/guibench.c +++ b/modules/benchmark/guibench.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/raytrace.c b/modules/benchmark/raytrace.c index 928af3fa6..a1abfcd5a 100644 --- a/modules/benchmark/raytrace.c +++ b/modules/benchmark/raytrace.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/sysbench.c b/modules/benchmark/sysbench.c index 75b9e9f86..70db03e6c 100644 --- a/modules/benchmark/sysbench.c +++ b/modules/benchmark/sysbench.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/benchmark/zlib.c b/modules/benchmark/zlib.c index 60d57c496..2045969fb 100644 --- a/modules/benchmark/zlib.c +++ b/modules/benchmark/zlib.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer.c b/modules/computer.c index da18b5c2e..a235efc90 100644 --- a/modules/computer.c +++ b/modules/computer.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1083,8 +1083,7 @@ const ModuleAbout *hi_module_get_about(void) .author = "L. A. F. Pereira", .description = N_("Gathers high-level computer information"), .version = VERSION, - .license = "GNU GPL version 2", - }; + .license = "GNU GPL version 2 or later.",}; return &ma; } diff --git a/modules/computer/alsa.c b/modules/computer/alsa.c index d3a6bbcdc..f74d27528 100644 --- a/modules/computer/alsa.c +++ b/modules/computer/alsa.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/boots.c b/modules/computer/boots.c index 3d6492d6f..5621e4e9f 100644 --- a/modules/computer/boots.c +++ b/modules/computer/boots.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/display.c b/modules/computer/display.c index 56b684422..98cb7bf76 100644 --- a/modules/computer/display.c +++ b/modules/computer/display.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/environment.c b/modules/computer/environment.c index 697bf38f5..2f29c861a 100644 --- a/modules/computer/environment.c +++ b/modules/computer/environment.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/filesystem.c b/modules/computer/filesystem.c index db5bbe979..e9c84811f 100644 --- a/modules/computer/filesystem.c +++ b/modules/computer/filesystem.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/groups.c b/modules/computer/groups.c index 75b7f645f..9371e2119 100644 --- a/modules/computer/groups.c +++ b/modules/computer/groups.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/languages.c b/modules/computer/languages.c index 97223dda7..b2d4910f2 100644 --- a/modules/computer/languages.c +++ b/modules/computer/languages.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/loadavg.c b/modules/computer/loadavg.c index c3faaaed2..802ae2aab 100644 --- a/modules/computer/loadavg.c +++ b/modules/computer/loadavg.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/memory.c b/modules/computer/memory.c index add2bafea..994e40402 100644 --- a/modules/computer/memory.c +++ b/modules/computer/memory.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/memory_usage.c b/modules/computer/memory_usage.c index 2693fbd9f..12c62fe7d 100644 --- a/modules/computer/memory_usage.c +++ b/modules/computer/memory_usage.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/modules.c b/modules/computer/modules.c index 451b5c1b8..14028362f 100644 --- a/modules/computer/modules.c +++ b/modules/computer/modules.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/os.c b/modules/computer/os.c index 1a367881a..2e53fd7e5 100644 --- a/modules/computer/os.c +++ b/modules/computer/os.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/ubuntu_flavors.c b/modules/computer/ubuntu_flavors.c index b1ff07589..ac67d665b 100644 --- a/modules/computer/ubuntu_flavors.c +++ b/modules/computer/ubuntu_flavors.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/uptime.c b/modules/computer/uptime.c index 6fd1fe8f7..8aef15307 100644 --- a/modules/computer/uptime.c +++ b/modules/computer/uptime.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/computer/users.c b/modules/computer/users.c index 35291ca5d..75e24f264 100644 --- a/modules/computer/users.c +++ b/modules/computer/users.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices.c b/modules/devices.c index 93063ad4b..a44cdb0c8 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -896,7 +896,7 @@ const ModuleAbout *hi_module_get_about(void) .author = "L. A. F. Pereira", .description = N_("Gathers information about hardware devices"), .version = VERSION, - .license = "GNU GPL version 2", + .license = "GNU GPL version 2 or later.", }; return &ma; diff --git a/modules/devices/alpha/processor.c b/modules/devices/alpha/processor.c index c820a94a4..0e6253167 100644 --- a/modules/devices/alpha/processor.c +++ b/modules/devices/alpha/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c index d3191ebc3..9446108d1 100644 --- a/modules/devices/arm/processor.c +++ b/modules/devices/arm/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/battery.c b/modules/devices/battery.c index bc3f70f8d..3424fa9d1 100644 --- a/modules/devices/battery.c +++ b/modules/devices/battery.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/devicetree.c b/modules/devices/devicetree.c index 6999da3f5..43fc0a506 100644 --- a/modules/devices/devicetree.c +++ b/modules/devices/devicetree.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/devicetree/pmac_data.c b/modules/devices/devicetree/pmac_data.c index 51298a173..8c5471f01 100644 --- a/modules/devices/devicetree/pmac_data.c +++ b/modules/devices/devicetree/pmac_data.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/devicetree/rpi_data.c b/modules/devices/devicetree/rpi_data.c index 4ef729a42..63daa7f30 100644 --- a/modules/devices/devicetree/rpi_data.c +++ b/modules/devices/devicetree/rpi_data.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/dmi.c b/modules/devices/dmi.c index 4fca33c14..c1915638c 100644 --- a/modules/devices/dmi.c +++ b/modules/devices/dmi.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c index 3f99d6502..8d2ecadfa 100644 --- a/modules/devices/dmi_memory.c +++ b/modules/devices/dmi_memory.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/e2k/processor.c b/modules/devices/e2k/processor.c index 744768532..0f9dd8c68 100644 --- a/modules/devices/e2k/processor.c +++ b/modules/devices/e2k/processor.c @@ -4,7 +4,7 @@ * modified by Boris Afonot (2022) * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/firmware.c b/modules/devices/firmware.c index 4f7fb744a..ea6ce5327 100644 --- a/modules/devices/firmware.c +++ b/modules/devices/firmware.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/gpu.c b/modules/devices/gpu.c index eee9ee25b..16267536a 100644 --- a/modules/devices/gpu.c +++ b/modules/devices/gpu.c @@ -6,7 +6,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/ia64/processor.c b/modules/devices/ia64/processor.c index 3cf14d7f9..f31813bc4 100644 --- a/modules/devices/ia64/processor.c +++ b/modules/devices/ia64/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/inputdevices.c b/modules/devices/inputdevices.c index 65f281303..a4b4ac73a 100644 --- a/modules/devices/inputdevices.c +++ b/modules/devices/inputdevices.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/loongarch64/processor.c b/modules/devices/loongarch64/processor.c index b207a9fd6..08f3645ee 100644 --- a/modules/devices/loongarch64/processor.c +++ b/modules/devices/loongarch64/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/m68k/processor.c b/modules/devices/m68k/processor.c index 5dd928675..a9d718359 100644 --- a/modules/devices/m68k/processor.c +++ b/modules/devices/m68k/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/mips/processor.c b/modules/devices/mips/processor.c index 082c72975..112a3c3b4 100644 --- a/modules/devices/mips/processor.c +++ b/modules/devices/mips/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/monitors.c b/modules/devices/monitors.c index dad86d6f0..043c0d3b5 100644 --- a/modules/devices/monitors.c +++ b/modules/devices/monitors.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/parisc/processor.c b/modules/devices/parisc/processor.c index 8493a5caf..c749bc5ab 100644 --- a/modules/devices/parisc/processor.c +++ b/modules/devices/parisc/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/pci.c b/modules/devices/pci.c index 64966b80e..be816c462 100644 --- a/modules/devices/pci.c +++ b/modules/devices/pci.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/ppc/processor.c b/modules/devices/ppc/processor.c index 6e4a964fc..12c575a6d 100644 --- a/modules/devices/ppc/processor.c +++ b/modules/devices/ppc/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/printers.c b/modules/devices/printers.c index bb68a1889..655d73c53 100644 --- a/modules/devices/printers.c +++ b/modules/devices/printers.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/resources.c b/modules/devices/resources.c index 36a413a41..1436192de 100644 --- a/modules/devices/resources.c +++ b/modules/devices/resources.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/riscv/processor.c b/modules/devices/riscv/processor.c index b2191a07b..f2e51c91a 100644 --- a/modules/devices/riscv/processor.c +++ b/modules/devices/riscv/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/s390/processor.c b/modules/devices/s390/processor.c index 58ec6e8b9..e4f2b303a 100644 --- a/modules/devices/s390/processor.c +++ b/modules/devices/s390/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/sensors.c b/modules/devices/sensors.c index 608975ed3..095f0bc42 100644 --- a/modules/devices/sensors.c +++ b/modules/devices/sensors.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/sh/processor.c b/modules/devices/sh/processor.c index 8dc339fbe..a5ce3e0a7 100644 --- a/modules/devices/sh/processor.c +++ b/modules/devices/sh/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/sparc/processor.c b/modules/devices/sparc/processor.c index b0cf385ad..76f4b0e01 100644 --- a/modules/devices/sparc/processor.c +++ b/modules/devices/sparc/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/storage.c b/modules/devices/storage.c index 970558ee1..bbf9b1952 100644 --- a/modules/devices/storage.c +++ b/modules/devices/storage.c @@ -5,7 +5,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/usb.c b/modules/devices/usb.c index 001c347eb..c6a5ab39d 100644 --- a/modules/devices/usb.c +++ b/modules/devices/usb.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c index d9f4780b1..62d32135b 100644 --- a/modules/devices/x86/processor.c +++ b/modules/devices/x86/processor.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/network.c b/modules/network.c index b91d80907..43a91bfee 100644 --- a/modules/network.c +++ b/modules/network.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -440,7 +440,7 @@ const ModuleAbout *hi_module_get_about(void) .description = N_("Gathers information about this computer's network connection"), .version = VERSION, - .license = "GNU GPL version 2", + .license = "GNU GPL version 2 or later", }; return &ma; diff --git a/modules/network/net.c b/modules/network/net.c index 0a71a4c01..535461e4d 100644 --- a/modules/network/net.c +++ b/modules/network/net.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/network/nfs.c b/modules/network/nfs.c index 6d9e4aa3d..67095f926 100644 --- a/modules/network/nfs.c +++ b/modules/network/nfs.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/modules/network/samba.c b/modules/network/samba.c index e75b1ee66..e14742ea0 100644 --- a/modules/network/samba.c +++ b/modules/network/samba.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/callbacks.c b/shell/callbacks.c index 9c281eaab..5a89a83af 100644 --- a/shell/callbacks.c +++ b/shell/callbacks.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -224,7 +224,7 @@ void cb_about() gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about), _("HardInfo 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.\n\n" + "the Free Software Foundation, version 2 or later.\n\n" "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 " diff --git a/shell/iconcache.c b/shell/iconcache.c index dbdbc688a..8a3e6e13d 100644 --- a/shell/iconcache.c +++ b/shell/iconcache.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/loadgraph.c b/shell/loadgraph.c index 0290d1f13..21f620db8 100644 --- a/shell/loadgraph.c +++ b/shell/loadgraph.c @@ -10,7 +10,7 @@ * * The Simple Load Graph is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License, version 2.1, as published by the Free Software Foundation. + * License, version 2 or later, as published by the Free Software Foundation. * * The Simple Load Graph is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/menu.c b/shell/menu.c index ed6a60780..d9946c547 100644 --- a/shell/menu.c +++ b/shell/menu.c @@ -7,7 +7,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/report.c b/shell/report.c index 28abe1a93..6ccfc7d4a 100644 --- a/shell/report.c +++ b/shell/report.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/shell.c b/shell/shell.c index 7c7c88a7f..dd5faa6c2 100644 --- a/shell/shell.c +++ b/shell/shell.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/stock.c b/shell/stock.c index 3f8180ab9..3fe7cbdd7 100644 --- a/shell/stock.c +++ b/shell/stock.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/shell/syncmanager.c b/shell/syncmanager.c index 396bce920..98702ac94 100644 --- a/shell/syncmanager.c +++ b/shell/syncmanager.c @@ -4,7 +4,7 @@ * * 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. + * the Free Software Foundation, version 2 or later. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of From 5525512bb89e45c22c3ad66c30512c168adc19f3 Mon Sep 17 00:00:00 2001 From: bigbear Date: Thu, 1 Feb 2024 18:05:46 +0100 Subject: [PATCH 2/9] MAINTAINER CHANGE - Updated README.md --- README.md | 142 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index f3dc2b77e..121779d61 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +[![Test](https://github.com/hwspeedy/hardinfo/actions/workflows/test.yml/badge.svg)](https://github.com/hwspeedy/hardinfo/actions/workflows/test.yml) +[![GitHub release](https://img.shields.io/github/release/hwspeedy/hardinfo.svg)](https://github.com/hwspeedy/hardinfo/releases) +[![GitHub release](https://img.shields.io/badge/PreRelease-v1.0.1-blue.svg)](https://github.com/hwspeedy/hardinfo/releases/tag/release-1.0.1pre) + HARDINFO ======== @@ -7,74 +11,94 @@ in a simple to use GUI. Features include: - Report generation (in either HTML or plain text) -- Benchmark result synchronization -- Ability to explore the information on remote computers +- Online Benchmarking - compare your machine against other machines Status ------ +- Capabilities: HardInfo currently detects most software and hardware detected by the OS. +- Features: Online database for exchanging benchmark results. +- Development: Currently done by contributors, hwspeedy maintains (Missing OK from previous maintainer!!) -Capabilities: HardInfo currently detects most software and hardware detected by the OS. -Features: The remote sync was disabled due to server loss. -Development: Currently done by contributors, a new dedicated maintainer is needed. - -Server code can be found in the "server" branch: https://github.com/lpereira/hardinfo/tree/server +Server code can be found in the "server" branch: https://github.com/hwspeedy/hardinfo/tree/server -DEPENDENCIES +Dependencies ------------ - -Required: -- GTK+ 2.10 (or newer) -- GLib 2.10 (or newer) -- Zlib (for zlib benchmark) - -Optional (for synchronization/remote): -- Libsoup 2.24 (or newer) - -BUILDING --------- - -Create a build directory and build from there: - -``` bash - hardinfo $ mkdir build - hardinfo $ cd build - build $ cmake .. - build $ make -``` - -There are some variables that can be changed: - - * `CMAKE_BUILD_TYPE`: Can either be ``Release`` or ``Debug``. - * `[Default: Release]` ``Debug`` prints messages to console and is not recommended for general use. - * `CMAKE_INSTALL_PREFIX`: Sets the installation prefix. - * `[Default: /usr/local]`: Distributions usually change this to `/usr`. - * `HARDINFO_NOSYNC`: Disables network synchronization. - * `[Default: 1]`: Disabled by default due to the server being lost. - -To set a variable, use cmake's -D parameter. For example: - -` build $ cmake .. -DCMAKE_BUILD_TYPE=Debug ` - -Network sync is enabled if libsoup is detected. If having trouble building with libsoup, disable it with: - -` build $ cmake -DHARDINFO_NOSYNC=1` - -SETTING UP ----------- - +- GTK3 >=3.00 or GTK2+ >=2.20 - Prefer **GTK3** (GTK2+: cmake -DHARDINFO_GTK3=0 ..) +- GLib >=2.24 +- Zlib +- glib JSON +- Libsoup2.4 >=2.42 or Libsoup-3.0 (EXPERIMENTAL) (LS3: cmake -DHARDINFO_LIBSOUP3=1 ..) + +Building and installing +----------------------- +**Debian/Ubuntu/Mint/PopOS** +- sudo apt install git cmake build-essential gettext +- sudo apt install libjson-glib-dev zlib1g-dev libsoup2.4-dev libgtk-3-dev libglib2.0-dev +- git clone https://github.com/hwspeedy/hardinfo +- cd hardinfo +- mkdir build +- cd build +- cmake .. +- make package (Creates package so you do not polute your distro and it can be updated by distro releases) +- sudo apt install ./hardinfo-VERSION-DISTRO-ARCH.deb (Use reinstall instead of install if already inst.) +- sudo apt install lm-sensors sysbench lsscsi mesa-utils dmidecode udisks2 xdg-utils +- hardinfo + +**Fedore/Centos/RedHat/Rocky/Alma/Oracle** +* NOTE: Centos 7 needs epel-release and cmake3 instead of cmake - use cmake3 instead of cmake +- sudo yum install epel-release (only CentOS 7) +- sudo yum install git cmake gcc gcc-c++ gettext rpmdevtools +- sudo yum install json-glib-devel zlib-devel libsoup-devel gtk3-devel +- git clone https://github.com/hwspeedy/hardinfo +- cd hardinfo +- mkdir build +- cd build +- cmake .. +- make package (Creates package so you do not polute your distro and it can be updated by distro releases) +- sudo yum install ./hardinfo-VERSION-DISTRO-ARCH.rpm (Use reinstall instead of install if already inst.) +- sudo yum install lm_sensors sysbench lsscsi glx-utils dmidecode udisks2 xdg-utils +- hardinfo + +Distro building +--------------- +For distribution in the different distros flavours please use the cmake build system with CPack: +- cmake .. (Add any other defines for your flavour to CMakeLists.txt) +- make package + +Please: Submit your changes to CMakeLists.txt so we have an easy to use package for all distributions, thanx. + + +Setting up addition tools +--------------------------- Most hardware is detected automatically by HardInfo, however, some hardware -needs manual set up. They are: - -### Sensors - -**lm-sensors**: If your computer is compatible with lm-sensors module, use by example the +needs manual set up. + +- **sysbench**: is needed to run standard sysbench benchmarks +- **udisks2**: is needed to provide NVME++ informations. +- **dmi-decode**: is needed to provide DMI informations. +- **mesa-utils**: is needed to provide opengl and run standard sysbench benchmarks +- **lsscsi**: gives information about hard drives +- **lm-sensors**: If your computer is compatible with lm-sensors module, use by example the `sensors-detect` program included with the lm-sensors package of Debian based distros, and be sure to have the detected kernel modules loaded. - -**hddtemp**: To obtain the hard disk drive temperature, be sure to run hddtemp +- **hddtemp**: To obtain the hard disk drive temperature, be sure to run hddtemp in daemon mode, using the default port. +- **eeprom module**: must be loaded to display info about your currently installed memory. +Load with `modprobe eeprom` and refresh the module screen. +- **xdg-utils**: xdg_open is used to open your browser for bugs, homepage & links. -### Memory Speed +License +------ +The Project License has been changed in 2024 from GPL2 to **GPL2 or later** -The module `eeprom` must be loaded to display info about your currently installed memory. -Load with `modprobe eeprom` and refresh the module screen. +Because we use LGPL2.1+ and GPL3 code. To future proof the project, lpereira and other developers has agreed to change license of source code also to GPL2+. (https://github.com/lpereira/hardinfo/issues/530) (https://github.com/lpereira/hardinfo/issues/707). + +It is all about open source and creating together - Read more about GPL license here: https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility + +Privacy Policy +--------------- +When using the Synchronize feature in HardInfo, some information may be stored indefinitely in our servers. + +This information is completely anonymous, and is comprised solely from the machine configuration (e.g. CPU manufacturer and model, number of cores, maximum frequency of cores, GPU manufacturer and model, etc.), version of benchmarking tools used, etc. You can opt out by unticking the "Send benchmark results" entry in the Synchronize window. + +Both the HardInfo client and its server components are open source GPL2 or Later and can be audited. From 8c8d672f9cc464bd73e03fe82f0303ec132a99c5 Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Thu, 1 Feb 2024 18:27:06 +0100 Subject: [PATCH 3/9] Added Workflow test.yml build for README.md page Simple test for GTK3, LIPSOUP2.4 only build --- .github/workflows/test.yml | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..c5e8eb2a6 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,49 @@ +# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you ne\ +ed cross-platform coverage. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml +name: Build + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-b\ +uild-matrix + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Install system dependencies + run: sudo apt install libjson-glib-dev zlib1g-dev libsoup2.4-dev libgtk-3-dev libglib2.0-dev gettext + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configurati\ +on generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build + #--target hardinfo + +#--config ${{env.BUILD_TYPE}} + + #- name: Test + # working-directory: ${{github.workspace}}/build + # # Execute tests defined by the CMake configuration. + # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + # run: ctest -C ${{env.BUILD_TYPE}} + + From 2e8fbe66f2d6ef1fb6c4b7f6f1e6ec34dacde71c Mon Sep 17 00:00:00 2001 From: bigbear Date: Thu, 1 Feb 2024 19:09:41 +0100 Subject: [PATCH 4/9] FIX GTK3 now working, Package system implemented (WIP) --- CMakeLists.txt | 167 ++++++++++++++++++++++++++++++++++++------ modules/computer/os.c | 16 ++-- 2 files changed, 153 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7071909c5..40ffb9755 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,18 @@ -project(HardInfo) -cmake_minimum_required(VERSION 2.6) -cmake_policy(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) +cmake_policy(VERSION 2.8.12) +project(hardinfo) + +set(HARDINFO_VERSION "1.0.1") + +option(HARDINFO_GTK3 "Build for GTK3 (0/off for GTK2)" 1) +option(HARDINFO_LIBSOUP3 "Build for libsoup-3.0(EXPERIMENTAL) (0/off for libsoup-2.4)" 0) -set(HARDINFO_VERSION "0.6-alpha") -option(HARDINFO_GTK3 "Attempt to build for GTK3 (0/off for GTK2)" 0) set(OVRARCH "" CACHE STRING "Override HARDINFO_ARCH value") set(OVRCPUINFO "" CACHE STRING "Specify a different file for /proc/cpuinfo") set(OVRDTRROOT "" CACHE STRING "Specify a different path for /proc/device-tree") -SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ) +set(OVRPACKAGE_FILENAME "" CACHE STRING "Override package filename") + +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(GNUInstallDirs) if(${CMAKE_BUILD_TYPE} MATCHES [Dd]ebug) @@ -51,8 +56,6 @@ elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "sh[3-5]") set(HARDINFO_ARCH "sh") elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "(riscv|riscv32|riscv64)") set(HARDINFO_ARCH "riscv") -elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "e2k") - set(HARDINFO_ARCH "e2k") else() message(FATAL_ERROR "Unsupported architecture: ${CMAKE_HOST_SYSTEM_PROCESSOR}") endif() @@ -74,25 +77,90 @@ message(STATUS "LOCALEDIR = ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}") message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}") add_definitions("-std=gnu89") -add_definitions("-Wno-deprecated-declarations") +#add_definitions("-Wno-deprecated-declarations") +#add_definitions("-Wextra") +#add_definitions("-Wno-missing-field-initializers") add_definitions("-Wformat") add_definitions("-Wformat-security") +set(PACKAGE_LIBSOUP2_MINVERSION 2.42) +#Actually needed for save settings, steal_pointer - FIXME +set(PACKAGE_LIBGLIB2_MINVERSION 2.44) +#set(PACKAGE_LIBGLIB2_MINVERSION 2.28) + +###################################DISTRO CHANGES############################### +#Please add all distro relates stuff here +SET(PACKAGE_MANPAGES 1) +set(RPM 0) +file(STRINGS /etc/os-release distro REGEX "^NAME=") +string(REGEX REPLACE "NAME=" "" distro "${distro}") +string(REGEX REPLACE "\"" "" distro "${distro}") +file(STRINGS /etc/os-release disversion REGEX "^VERSION_ID=") +string(REGEX REPLACE "VERSION_ID=" "" disversion "${disversion}") +string(REGEX REPLACE "\"" "" disversion "${disversion}") +string(REPLACE "/" "_" CPACK_SYSTEM_NAME ${distro}-${disversion}.${CMAKE_HOST_SYSTEM_PROCESSOR}) +string(REPLACE " " "_" CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}) +message("-- Found Package Target ${CPACK_SYSTEM_NAME}") +if(OVRPACKAGE_FILENAME) + set(CPACK_SYSTEM_NAME ${OVRPACKAGE_FILENAME}) +endif() + +#flavour output +set(HARDINFO_OS ${distro}) + +# currently all RPM flavours uses libsoup-2.4 +if(${distro} MATCHES "Alma*" OR ${distro} MATCHES "Rocky*" OR ${distro} MATCHES "Fedora*" OR ${distro} MATCHES "Red*" OR ${distro} MATCHES "CentOS*" OR ${distro} MATCHES "Oracle*") + set(RPM 1) + set(HARDINFO_LIBSOUP3 0) +endif() + +#oracle 6 +if(${distro}${disversion} MATCHES "Oracle6*") + set(HARDINFO_LIBSOUP3 0) + set(HARDINFO_GTK3 0) + #old deprecated version - but ok + set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3) + #save settings disabled, steal_pointer disabled + set(PACKAGE_LIBGLIB2_MINVERSION 2.28.8) + message("-- Low GLIB2 version 2.28.0 - FIXME") +endif() + +#ubuntu 20.04 +if(${distro}${disversion} MATCHES "Ubuntu20.04") + set(HARDINFO_LIBSOUP3 0) +endif() + +#Debian 11 +if(${distro}${disversion} MATCHES "Debian GNU/Linux11") + set(HARDINFO_LIBSOUP3 0) +endif() + +#Fedora 39 - bug with man pages - probably needs upgrade.. +if(${distro}${disversion} MATCHES "Fedora Linux39") + set(PACKAGE_MANPAGES 0) +endif() + +################################################################################ add_subdirectory(po) + include(FindPkgConfig) if (HARDINFO_GTK3) - message(STATUS "Building for GTK3 (experimental!)") - pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.0 cairo>=1.0 cairo-png>=1.0 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) - add_definitions(-DGTK_DISABLE_SINGLE_INCLUDES) + message(STATUS "Building for GTK3") + pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.0 cairo>=1.0 cairo-png>=1.0 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) + add_definitions(-DGTK_DISABLE_SINGLE_INCLUDES) else() - message(STATUS "Building for GTK2") - pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) + message(STATUS "Building for GTK2") + pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10) endif() -pkg_check_modules(LIBSOUP libsoup-2.4>=2.42) -pkg_check_modules(JSON_GLIB REQUIRED json-glib-1.0) - +if (HARDINFO_LIBSOUP3) + pkg_check_modules(LIBSOUP REQUIRED libsoup-3.0>=3.00) +else() + pkg_check_modules(LIBSOUP REQUIRED libsoup-2.4>=${PACKAGE_LIBSOUP2_MINVERSION}) +endif() +pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${PACKAGE_LIBGLIB2_MINVERSION}) +pkg_check_modules(JSON_GLIB REQUIRED json-glib-1.0>=0.14.2) pkg_check_modules(X11 REQUIRED x11) include(FindZLIB REQUIRED) @@ -136,11 +204,11 @@ set(HARDINFO_RESOURCES "data/pci.ids.min" "data/kernel-module-icons.json" ) - +if(${PACKAGE_MANPAGES}) set(HARDINFO_MANPAGES "hardinfo.1" ) - +endif() set(MODULE_computer_SOURCES modules/computer.c modules/computer/alsa.c @@ -391,11 +459,11 @@ install(DIRECTORY pixmaps PATTERN "*.{png,svg}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -install(DIRECTORY doc - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hardinfo - PATTERN "*.{hlp,png}" - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -) +#install(DIRECTORY doc +# DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hardinfo +# PATTERN "*.{hlp,png}" +# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +#) install(FILES ${HARDINFO_MANPAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ @@ -404,3 +472,54 @@ install(FILES pixmaps/hardinfo.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) + +########################PACKAGE BUILDING FOR DISTROS########################### +#Please update here for building packages + +SET(CPACK_PACKAGE_VERSION ${HARDINFO_VERSION}) +SET(CPACK_PACKAGE_HOMEPAGE_URL "https://hardinfo.bigbear.dk") +if(${RPM}) + SET(CPACK_GENERATOR "RPM") +else() + SET(CPACK_GENERATOR "DEB") +endif() + +#RPM +SET(CPACK_RPM_PACKAGE_MAINTAINER "hwspeedy ") +SET(CPACK_RPM_PACKAGE_DESCRIPTION "HardInfo is a small application that displays information about your hardware and operating system. It has online benchmarking to check your machine performance against other machines.") +SET(CPACK_RPM_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils") +SET(CPACK_RPM_PACKAGE_LICENSE "GPL2+") +SET(CPACK_RPM_PACKAGE_HOMEPAGE "https://github.com/hwspeedy/hardinfo") +if(HARDINFO_LIBSOUP3) + SET(PACKAGE_LS "libsoup (>=3.0)") +else() + SET(PACKAGE_LS "libsoup (>=${PACKAGE_LIBSOUP2_MINVERSION})") +endif() +if(HARDINFO_GTK3) + SET(PACKAGE_GTK "libgtk-3-0 (>=3.0)") +else() + SET(PACKAGE_GTK "libgtk-2-0 (>=2.20)") +endif() +SET(CPACK_RPM_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib, ${PACKAGE_LS}, ${PACKAGE_GTK}, libglib2.0-0 (>=2.10)") + +#DEB +SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "hwspeedy ") +SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "HardInfo is a small application that displays information about your hardware and operating system. It has online benchmarking to check your machine performance against other machines.") +SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils") +SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/hwspeedy/hardinfo") +if(HARDINFO_LIBSOUP3) + SET(PACKAGE_LS "libsoup-3.0.0 (>=3.0)") +else() + SET(PACKAGE_LS "libsoup2.4-1 (>=${PACKAGE_LIBSOUP2_MINVERSION})") + if(${distro}${disversion} MATCHES "Debian GNU/Linux11") + SET(PACKAGE_LS "libsoup2.4-0 (>=2.42)") + endif() +endif() +if(HARDINFO_GTK3) + SET(PACKAGE_GTK "libgtk-3-0 (>=3.0)") +else() + SET(PACKAGE_GTK "libgtk-2-0 (>=2.20)") +endif() +SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib1g, ${PACKAGE_LS}, ${PACKAGE_GTK}") + +INCLUDE(CPack) diff --git a/modules/computer/os.c b/modules/computer/os.c index 2e53fd7e5..e2ef597bc 100644 --- a/modules/computer/os.c +++ b/modules/computer/os.c @@ -157,14 +157,18 @@ detect_mate_version(void) static gchar * detect_window_manager(void) { - GdkScreen *screen = gdk_screen_get_default(); - const gchar *windowman; - const gchar *curdesktop; - if (!screen || !GDK_IS_SCREEN(screen)) - return NULL; + const gchar *curdesktop; + const gchar* windowman; + GdkScreen *screen = gdk_screen_get_default(); - windowman = gdk_x11_screen_get_window_manager_name(screen); +#if GTK_CHECK_VERSION(3,0,0) + if (GDK_IS_X11_SCREEN(screen)) { +#else + if (screen && GDK_IS_SCREEN(screen)) { +#endif + windowman = gdk_x11_screen_get_window_manager_name(screen); + } else return g_strdup("Not X11"); if (g_str_equal(windowman, "Xfwm4")) return g_strdup("XFCE 4"); From d338694617ad134055acbd06df92b143e74664a2 Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Thu, 1 Feb 2024 19:16:38 +0100 Subject: [PATCH 5/9] FIX workflow line breaks --- .github/workflows/test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c5e8eb2a6..c160fbbb9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,4 @@ -# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you ne\ -ed cross-platform coverage. +# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml name: Build @@ -17,8 +16,7 @@ jobs: build: # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. # You can convert this to a matrix build if you need cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-b\ -uild-matrix + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix runs-on: ubuntu-latest steps: @@ -28,8 +26,7 @@ uild-matrix run: sudo apt install libjson-glib-dev zlib1g-dev libsoup2.4-dev libgtk-3-dev libglib2.0-dev gettext - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configurati\ -on generator such as make. + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} From dcb9ba38f34c4b8c9a3e0001b4d13e732b355956 Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Thu, 1 Feb 2024 19:24:29 +0100 Subject: [PATCH 6/9] Workflow - updated to v4 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c160fbbb9..fbee3bc6c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install system dependencies run: sudo apt install libjson-glib-dev zlib1g-dev libsoup2.4-dev libgtk-3-dev libglib2.0-dev gettext From 196bf90e156a149d8f83b60f75285a9bcefb3cc9 Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Thu, 1 Feb 2024 19:28:41 +0100 Subject: [PATCH 7/9] Workflow - Updated codeql v4 and GTK3 - GTK2 is removed on buildserver --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3a6425ec0..e7894d910 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,8 +36,8 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 - - name: Install dependencies - run: sudo apt-get install cmake libffi-dev libgtk2.0-dev liblzma-dev libselinux1-dev libsoup2.4-dev pciutils libjson-glib-dev + - name: Install system dependencies + run: sudo apt install libjson-glib-dev zlib1g-dev libsoup2.4-dev libgtk-3-dev libglib2.0-dev gettext # If this run was triggered by a pull request event, then checkout # the head of the pull request instead of the merge commit. From aeacb71251d4f6cda3622e6f766c9aa87310ff83 Mon Sep 17 00:00:00 2001 From: bigbear Date: Thu, 1 Feb 2024 20:49:01 +0100 Subject: [PATCH 8/9] FIX removed E2K due to missing answer on license change --- includes/e2k/processor-platform.h | 72 ----- modules/devices/e2k/processor.c | 420 ------------------------------ 2 files changed, 492 deletions(-) delete mode 100644 includes/e2k/processor-platform.h delete mode 100644 modules/devices/e2k/processor.c diff --git a/includes/e2k/processor-platform.h b/includes/e2k/processor-platform.h deleted file mode 100644 index b8d59f779..000000000 --- a/includes/e2k/processor-platform.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * HardInfo - Displays System Information - * Copyright (C) 2020 EntityFX and MCST Elbrus Team - * - * 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 or later. - * - * 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 - */ - -#ifndef __PROCESSOR_PLATFORM_H__ -#define __PROCESSOR_PLATFORM_H__ - -#include "cpu_util.h" - -/* - -E2K /proc/cpuinfo: - - -processor : 0 -vendor_id : E8C-SWTX -cpu family : 4 -model : 7 -model name : E8C -revision : 2 -cpu MHz : 1299.912740 -cache0 : level=1 type=Instruction scope=Private size=128K line_size=256 associativity=4 -cache1 : level=1 type=Data scope=Private size=64K line_size=32 associativity=4 -cache2 : level=2 type=Unified scope=Private size=512K line_size=64 associativity=4 -cache3 : level=3 type=Unified scope=Private size=16384K line_size=64 associativity=16 -bogomips : 2600.68 - -*/ - - -typedef struct _ProcessorCache ProcessorCache; - -struct _ProcessorCache { - gint level; - gint number_of_sets; - gint physical_line_partition; - gint size; - gchar *type; - gint ways_of_associativity; - gint uid; /* uid is unique among caches with the same (type, level) */ - gchar *shared_cpu_list; /* some kernel's don't give a uid, so try shared_cpu_list */ - gint phy_sock; -}; - -//e2k processor structure -struct _Processor { - gint id; - gfloat cpu_mhz; - gchar *model_name; - gchar *vendor_id; - gfloat bogomips; - - gint model, family, revision; - - GSList *cache; -}; - -#endif /* __PROCESSOR_PLATFORM_H__ */ diff --git a/modules/devices/e2k/processor.c b/modules/devices/e2k/processor.c deleted file mode 100644 index 0f9dd8c68..000000000 --- a/modules/devices/e2k/processor.c +++ /dev/null @@ -1,420 +0,0 @@ -/* - * HardInfo - Displays System Information - * Copyright (C) 2020 EntityFX and MCST Elbrus Team - * modified by Boris Afonot (2022) - * 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 or later. - * - * 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 - */ - -#include "hardinfo.h" -#include "devices.h" -#include "cpu_util.h" - -static gchar *__cache_get_info_as_string(Processor *processor) -{ - gchar *result = g_strdup(""); - GSList *cache_list; - ProcessorCache *cache; - - if (!processor->cache) { - return g_strdup(_("Cache information not available=\n")); - } - - for (cache_list = processor->cache; cache_list; cache_list = cache_list->next) { - cache = (ProcessorCache *)cache_list->data; - - result = h_strdup_cprintf(_("Level %d (%s)=%d-way set-associative, %d sets, %dKB size\n"), - result, - cache->level, - C_("cache-type", cache->type), - cache->ways_of_associativity, - cache->number_of_sets, - cache->size); - } - - return result; -} - -/* This is not used directly, but creates translatable strings for - * the type string returned from /sys/.../cache */ -static const char* cache_types[] = { - NC_("cache-type", /*/cache type, as appears in: Level 1 (Data)*/ "Data"), - NC_("cache-type", /*/cache type, as appears in: Level 1 (Instruction)*/ "Instruction"), - NC_("cache-type", /*/cache type, as appears in: Level 2 (Unified)*/ "Unified") -}; - -static void __cache_obtain_info(Processor *processor) -{ - ProcessorCache *cache; - gchar *endpoint, *entry, *index; - gchar *uref = NULL; - gint i; - gint processor_number = processor->id; - - endpoint = g_strdup_printf("/sys/devices/system/cpu/cpu%d/cache", processor_number); - - for (i = 0; ; i++) { - cache = g_new0(ProcessorCache, 1); - - index = g_strdup_printf("index%d/", i); - - entry = g_strconcat(index, "type", NULL); - cache->type = h_sysfs_read_string(endpoint, entry); - g_free(entry); - - if (!cache->type) { - g_free(cache); - g_free(index); - goto fail; - } - - entry = g_strconcat(index, "level", NULL); - cache->level = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - entry = g_strconcat(index, "number_of_sets", NULL); - cache->number_of_sets = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - entry = g_strconcat(index, "physical_line_partition", NULL); - cache->physical_line_partition = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - entry = g_strconcat(index, "size", NULL); - cache->size = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - entry = g_strconcat(index, "ways_of_associativity", NULL); - cache->ways_of_associativity = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - /* unique cache references: id is nice, but share_cpu_list can be - * used if it is not available. */ - entry = g_strconcat(index, "id", NULL); - uref = h_sysfs_read_string(endpoint, entry); - g_free(entry); - if (uref != NULL && *uref != 0 ) - cache->uid = atoi(uref); - else - cache->uid = -1; - g_free(uref); - entry = g_strconcat(index, "shared_cpu_list", NULL); - cache->shared_cpu_list = h_sysfs_read_string(endpoint, entry); - g_free(entry); - - /* reacharound */ - entry = g_strconcat(index, "../../topology/physical_package_id", NULL); - cache->phy_sock = h_sysfs_read_int(endpoint, entry); - g_free(entry); - - g_free(index); - - processor->cache = g_slist_append(processor->cache, cache); - } - -fail: - g_free(endpoint); -} - -#define cmp_cache_test(f) if (a->f < b->f) return -1; if (a->f > b->f) return 1; - -static gint cmp_cache(ProcessorCache *a, ProcessorCache *b) { - gint i = 0; - cmp_cache_test(phy_sock); - i = g_strcmp0(a->type, b->type); if (i!=0) return i; - cmp_cache_test(level); - cmp_cache_test(size); - cmp_cache_test(uid); /* uid is unique among caches with the same (type, level) */ - if (a->uid == -1) { - /* if id wasn't available, use shared_cpu_list as a unique ref */ - i = g_strcmp0(a->shared_cpu_list, b->shared_cpu_list); if (i!=0) - return i; - } - return 0; -} - -static gint cmp_cache_ignore_id(ProcessorCache *a, ProcessorCache *b) { - gint i = 0; - cmp_cache_test(phy_sock); - i = g_strcmp0(a->type, b->type); if (i!=0) return i; - cmp_cache_test(level); - cmp_cache_test(size); - return 0; -} - -gchar *caches_summary(GSList * processors) -{ - gchar *ret = g_strdup_printf("[%s]\n", _("Caches")); - GSList *all_cache = NULL, *uniq_cache = NULL; - GSList *tmp, *l; - Processor *p; - ProcessorCache *c, *cur = NULL; - gint cur_count = 0, i = 0; - - /* create list of all cache references */ - for (l = processors; l; l = l->next) { - p = (Processor*)l->data; - if (p->cache) { - tmp = g_slist_copy(p->cache); - if (all_cache) { - all_cache = g_slist_concat(all_cache, tmp); - } else { - all_cache = tmp; - } - } - } - - if (g_slist_length(all_cache) == 0) { - ret = h_strdup_cprintf("%s=\n", ret, _("(Not Available)") ); - g_slist_free(all_cache); - return ret; - } - - /* ignore duplicate references */ - all_cache = g_slist_sort(all_cache, (GCompareFunc)cmp_cache); - for (l = all_cache; l; l = l->next) { - c = (ProcessorCache*)l->data; - if (!cur) { - cur = c; - } else { - if (cmp_cache(cur, c) != 0) { - uniq_cache = g_slist_prepend(uniq_cache, cur); - cur = c; - } - } - } - uniq_cache = g_slist_prepend(uniq_cache, cur); - uniq_cache = g_slist_reverse(uniq_cache); - cur = 0, cur_count = 0; - - /* count and list caches */ - for (l = uniq_cache; l; l = l->next) { - c = (ProcessorCache*)l->data; - if (!cur) { - cur = c; - cur_count = 1; - } else { - if (cmp_cache_ignore_id(cur, c) != 0) { - ret = h_strdup_cprintf(_("Level %d (%s)#%d=%dx %dKB (%dKB), %d-way set-associative, %d sets\n"), - ret, - cur->level, - C_("cache-type", cur->type), - cur->phy_sock, - cur_count, - cur->size, - cur->size * cur_count, - cur->ways_of_associativity, - cur->number_of_sets); - cur = c; - cur_count = 1; - } else { - cur_count++; - } - } - } - ret = h_strdup_cprintf(_("Level %d (%s)#%d=%dx %dKB (%dKB), %d-way set-associative, %d sets\n"), - ret, - cur->level, - C_("cache-type", cur->type), - cur->phy_sock, - cur_count, - cur->size, - cur->size * cur_count, - cur->ways_of_associativity, - cur->number_of_sets); - - g_slist_free(all_cache); - g_slist_free(uniq_cache); - return ret; -} - -static gchar *processor_get_full_name(const gchar *model_name) -{ - if(g_strcmp0(model_name ,"E2S") == 0) - return "Elbrus-4C"; - else if(g_strcmp0(model_name ,"E1C+") == 0) - return "Elbrus-1C+"; - else if(g_strcmp0(model_name ,"E2C+DSP") == 0) - return "Elbrus-2C+"; - else if(g_strcmp0(model_name ,"E8C") == 0) - return "Elbrus-8C"; - else if(g_strcmp0(model_name ,"E8C2") == 0) - return "Elbrus-8CB"; - else if(g_strcmp0(model_name ,"E12C") == 0) - return "Elbrus-12C"; - else if(g_strcmp0(model_name ,"E16C") == 0) - return "Elbrus-16C"; - else if(g_strcmp0(model_name ,"E2C3") == 0) - return "Elbrus-2C3"; - else - return (gchar *)model_name; -} - -GSList *processor_scan(void) -{ - GSList *procs = NULL, *l = NULL; - Processor *processor = NULL; - FILE *cpuinfo; - gchar buffer[1024]; - - cpuinfo = fopen(PROC_CPUINFO, "r"); - if (!cpuinfo) - return NULL; - - while (fgets(buffer, 1024, cpuinfo)) { - gchar **tmp = g_strsplit(buffer, ":", 2); - if (!tmp[1] || !tmp[0]) { - g_strfreev(tmp); - continue; - } - - tmp[0] = g_strstrip(tmp[0]); - tmp[1] = g_strstrip(tmp[1]); - - if (g_str_has_prefix(tmp[0], "processor")) { - /* finish previous */ - if (processor) - procs = g_slist_append(procs, processor); - - /* start next */ - processor = g_new0(Processor, 1); - processor->id = atol(tmp[1]); - g_strfreev(tmp); - continue; - } - - if (processor) { - if (g_str_has_prefix(tmp[0], "model name")) { - const gchar *model_name = processor_get_full_name(tmp[1]); - processor->model_name = g_strdup(model_name); - g_strfreev(tmp); - continue; - } - - get_str("vendor_id", processor->vendor_id); - get_int("cpu family", processor->family); - get_int("model", processor->model); - get_int("revision", processor->revision); - - get_float("cpu MHz", processor->cpu_mhz); - get_float("bogomips", processor->bogomips); - } - - //populate processor structure - g_strfreev(tmp); - } - - //appent to the list - if (processor) - procs = g_slist_append(procs, processor); - - for (l = procs; l; l = l->next) { - processor = (Processor *) l->data; - __cache_obtain_info(processor); - } - - fclose(cpuinfo); - - return procs; -} - -gchar *processor_name(GSList * processors) { - return processor_name_default(processors); -} - -gchar *processor_describe(GSList * processors) { - return processor_describe_default(processors); -} - -gchar * -processor_get_detailed_info(Processor *processor) -{ - gchar *ret; - gchar *cache_info; - cache_info = __cache_get_info_as_string(processor); - - ret = g_strdup_printf("[%s]\n" - "$^$%s=%s\n" /* name */ - "$^$%s=%s\n" /* vendor */ - "%s=%d\n" /* family */ - "%s=%d\n" /* model */ - "%s=%d\n" /* revision */ - "%s=%.2f %s\n" /* frequency */ - "%s=%.2f\n" /* bogomips */ - "%s=%s\n" /* byte order */ - "[%s]\n" /* cache */ - "%s\n", - _("Processor"), - _("Name"), processor->model_name, - _("Vendor"), processor->vendor_id, - _("Family"), processor->family, - _("Model"), processor->model, - _("Revision"), processor->revision, - _("Frequency"), processor->cpu_mhz, _("MHz"), - _("BogoMips"), processor->bogomips, - _("Byte Order"), byte_order_str(), - _("Cache"), cache_info - ); - g_free(cache_info); - return ret; -} - -//prepare processor info for all cpus -gchar *processor_get_info(GSList * processors) -{ - Processor *processor; - - gchar *ret, *tmp, *hashkey; - GSList *l; - - tmp = g_strdup(""); - - for (l = processors; l; l = l->next) { - processor = (Processor *) l->data; - gchar *model_name = g_strdup_printf("MCST %s", processor->model_name); - - /* change vendor id of 8CB processor for correct parse from vendor.ids */ - if (!g_strcmp0(processor->vendor_id, "E8C")) { - gchar *orig_vendor_id = processor->vendor_id; - processor->vendor_id = g_strdup_printf("%s-SWTX", orig_vendor_id); - free(orig_vendor_id); - } - - const Vendor *v = vendor_match(processor->vendor_id, NULL); - if (v) - tag_vendor(&model_name, 0, v->name_short ? v->name_short : v->name, v->ansi_color, params.fmt_opts); - - tmp = g_strdup_printf("%s$CPU%d$cpu%d=%.2f %s|%s\n", - tmp, processor->id, - processor->id, - processor->cpu_mhz, _("MHz"), - model_name); - - hashkey = g_strdup_printf("CPU%d", processor->id); - moreinfo_add_with_prefix("DEV", hashkey, - processor_get_detailed_info(processor)); - g_free(hashkey); - } - - ret = g_strdup_printf("[$ShellParam$]\n" - "ViewType=1\n" - "ColumnTitle$TextValue=%s\n" - "ColumnTitle$Value=%s\n" - "ColumnTitle$Extra1=%s\n" - "ShowColumnHeaders=true\n" - "[Processors]\n" - "%s", _("Device"), _("Frequency"), _("Model"), tmp); - g_free(tmp); - - return ret; -} From 6d9608d99018a9faf74ed65fe987d9db8af4ef1e Mon Sep 17 00:00:00 2001 From: hwspeedy Date: Wed, 7 Feb 2024 01:41:07 +0100 Subject: [PATCH 9/9] LICENSE - Reverted LGPL 2.1 file. --- shell/loadgraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/loadgraph.c b/shell/loadgraph.c index 21f620db8..0290d1f13 100644 --- a/shell/loadgraph.c +++ b/shell/loadgraph.c @@ -10,7 +10,7 @@ * * The Simple Load Graph is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License, version 2 or later, as published by the Free Software Foundation. + * License, version 2.1, as published by the Free Software Foundation. * * The Simple Load Graph is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of