Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2018-07-04 23:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Wed Jul 4 23:52:17 2018 rev:161 rq:619529 version:21.56 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2018-06-15 14:33:58.251346688 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2018-07-04 23:53:33.407996362 +0200 @@ -1,0 +2,7 @@ +Thu Jun 28 07:12:46 UTC 2018 - sch...@suse.de + +- merge gh#openSUSE/hwinfo#66 +- Add support for RISC-V +- 21.56 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.55.tar.xz New: ---- hwinfo-21.56.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.oFMDQG/_old 2018-07-04 23:53:34.499995156 +0200 +++ /var/tmp/diff_new_pack.oFMDQG/_new 2018-07-04 23:53:34.499995156 +0200 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.55 +Version: 21.56 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.55.tar.xz -> hwinfo-21.56.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/VERSION new/hwinfo-21.56/VERSION --- old/hwinfo-21.55/VERSION 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/VERSION 2018-06-28 09:12:46.000000000 +0200 @@ -1 +1 @@ -21.55 +21.56 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/changelog new/hwinfo-21.56/changelog --- old/hwinfo-21.55/changelog 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/changelog 2018-06-28 09:12:46.000000000 +0200 @@ -1,3 +1,6 @@ +2018-06-26: 21.56 + - Add support for RISC-V + 2018-06-08: 21.55 - try a more agressive way to catch all usb platform controllers (bsc #1072450) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/src/hd/cpu.c new/hwinfo-21.56/src/hd/cpu.c --- old/hwinfo-21.55/src/hd/cpu.c 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/src/hd/cpu.c 2018-06-28 09:12:46.000000000 +0200 @@ -149,6 +149,11 @@ double bogo; #endif +#ifdef __riscv + char hart[32], isa[32], mmu[32]; + char uarch[80]; +#endif + hd_data->cpu = read_file(PROC_CPUINFO, 0, 0); if((hd_data->debug & HD_DEB_CPU)) dump_cpu_data(hd_data); if(!hd_data->cpu) return; @@ -682,6 +687,34 @@ hd->detail->cpu.data = ct; } #endif /* __m68k__ */ + +#ifdef __riscv + *isa = *mmu = *uarch = 0; + cpus = 0; + + for (sl = hd_data->cpu; sl; sl = sl->next) { + if (sscanf(sl->str, "isa : %31[^\n]", isa) == 1); + if (sscanf(sl->str, "mmu : %31[^\n]", mmu) == 1); + if (sscanf(sl->str, "uarch : %79[^\n]", uarch) == 1); + + if(strstr(sl->str, "hart") == sl->str || !sl->next) { /* EOF */ + if (*isa || *mmu || *uarch) { /* at least one of those */ + ct = new_mem(sizeof *ct); + ct->architecture = arch_riscv; + if (*isa) ct->model_name = new_str(isa); + if (*uarch) ct->vend_name = new_str(uarch); + + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->base_class.id = bc_internal; + hd->sub_class.id = sc_int_cpu; + hd->slot = cpus; + hd->detail = new_mem(sizeof *hd->detail); + hd->detail->type = hd_detail_cpu; + hd->detail->cpu.data = ct; + } + } + } +#endif /* __riscv */ } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/src/hd/hd.c new/hwinfo-21.56/src/hd/hd.c --- old/hwinfo-21.55/src/hd/hd.c 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/src/hd/hd.c 2018-06-28 09:12:46.000000000 +0200 @@ -152,6 +152,10 @@ #define HD_ARCH "68k" #endif +#ifdef __riscv +#define HD_ARCH "riscv" +#endif + typedef struct disk_s { struct disk_s *next; unsigned crc; @@ -3072,6 +3076,8 @@ return arch_aarch64; #elif defined __m68k__ return arch_68k; +#elif defined __riscv + return arch_riscv; #else return arch_unknown; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/src/hd/hd.h new/hwinfo-21.56/src/hd/hd.h --- old/hwinfo-21.55/src/hd/hd.h 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/src/hd/hd.h 2018-06-28 09:12:46.000000000 +0200 @@ -20,7 +20,7 @@ /** Interface version */ #define HD_VERSION 21 -#define HD_MINOR_VERSION 55 +#define HD_MINOR_VERSION 56 #define HD_FULL_VERSION (HD_VERSION * 1000 + HD_MINOR_VERSION) /** @@ -1446,7 +1446,8 @@ arch_arm, arch_mips, arch_x86_64, - arch_aarch64 + arch_aarch64, + arch_riscv } hd_cpu_arch_t; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.55/src/hd/hdp.c new/hwinfo-21.56/src/hd/hdp.c --- old/hwinfo-21.55/src/hd/hdp.c 2018-06-08 14:54:19.000000000 +0200 +++ new/hwinfo-21.56/src/hd/hdp.c 2018-06-28 09:12:46.000000000 +0200 @@ -1117,6 +1117,9 @@ case arch_aarch64: dump_line0 ("AArch64\n"); break; + case arch_riscv: + dump_line0 ("RISC-V\n"); + break; default: dump_line0 ("**UNKNWON**\n"); break;
