Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2022-08-07 18:33:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Sun Aug 7 18:33:46 2022 rev:187 rq:993251 version:22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2022-06-24 08:45:17.579137997 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.1521/hwinfo.changes 2022-08-07 18:33:49.449134427 +0200 @@ -1,0 +2,9 @@ +Fri Aug 5 07:56:03 UTC 2022 - [email protected] + +- merge gh#openSUSE/hwinfo#114 +- improve treatment of NVME devices (bsc#1200975) +- add new NVME hardware class and support it in hwinfo +- fix compiler warnings +- 22.0 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.82.tar.xz New: ---- hwinfo-22.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.BDCRhg/_old 2022-08-07 18:33:51.081139171 +0200 +++ /var/tmp/diff_new_pack.BDCRhg/_new 2022-08-07 18:33:51.093139206 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.82 +Version: 22.0 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.82.tar.xz -> hwinfo-22.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/VERSION new/hwinfo-22.0/VERSION --- old/hwinfo-21.82/VERSION 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/VERSION 2022-08-05 09:56:03.000000000 +0200 @@ -1 +1 @@ -21.82 +22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/changelog new/hwinfo-22.0/changelog --- old/hwinfo-21.82/changelog 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/changelog 2022-08-05 09:56:03.000000000 +0200 @@ -1,3 +1,9 @@ +2022-08-05: 22.0 + - merge gh#openSUSE/hwinfo#114 + - improve treatment of NVME devices (bsc#1200975) + - add new NVME hardware class and support it in hwinfo + - fix compiler warnings + 2022-06-23: 21.82 - merge gh#openSUSE/hwinfo#113 - Keep NVMe's namespace output consistency when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/hwinfo.c new/hwinfo-22.0/hwinfo.c --- old/hwinfo-21.82/hwinfo.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/hwinfo.c 2022-08-05 09:56:03.000000000 +0200 @@ -144,6 +144,7 @@ { "pci", 0, NULL, 1000 + hw_pci }, { "isapnp", 0, NULL, 1000 + hw_isapnp }, { "scsi", 0, NULL, 1000 + hw_scsi }, + { "nvme", 0, NULL, 1000 + hw_nvme }, { "ide", 0, NULL, 1000 + hw_ide }, { "bridge", 0, NULL, 1000 + hw_bridge }, { "hub", 0, NULL, 1000 + hw_hub }, @@ -815,8 +816,8 @@ " all, arch, bios, block, bluetooth, braille, bridge, camera,\n" " cdrom, chipcard, cpu, disk, dsl, dvb, fingerprint, floppy,\n" " framebuffer, gfxcard, hub, ide, isapnp, isdn, joystick, keyboard,\n" - " memory, mmc-ctrl, modem, monitor, mouse, netcard, network, partition,\n" - " pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd,\n" + " memory, mmc-ctrl, modem, monitor, mouse, netcard, network, nvme,\n" + " partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd,\n" " reallyall, scanner, scsi, smp, sound, storage-ctrl, sys, tape,\n" " tv, uml, usb, usb-ctrl, vbe, wlan, xen, zip\n" " --short\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/block.c new/hwinfo-22.0/src/hd/block.c --- old/hwinfo-21.82/src/hd/block.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/block.c 2022-08-05 09:56:03.000000000 +0200 @@ -284,11 +284,35 @@ if(!strcmp(bus_name, "ide")) hd->bus.id = bus_ide; else if(!strcmp(bus_name, "scsi")) hd->bus.id = bus_scsi; else if(!strcmp(bus_name, "pci")) hd->bus.id = bus_pci; - else if(!strcmp(bus_name, "nvme")) hd->bus.id = bus_pci; - else if(!strcmp(bus_name, "nvme-subsystem")) hd->bus.id = bus_pci; + else if(!strcmp(bus_name, "nvme")) hd->bus.id = bus_nvme; + else if(!strcmp(bus_name, "nvme-subsystem")) hd->bus.id = bus_nvme; } hd->sysfs_bus_id = new_str(bus_id); + // add model name, if available + if((s = get_sysfs_attr_by_path(sf_dev, "model"))) { + char *cs = canon_str(s, strlen(s)); + ADD2LOG(" model = %s\n", cs); + if(*cs) { + hd->device.name = cs; + } + else { + free_mem(cs); + } + } + + // add serial, if available + if((s = get_sysfs_attr_by_path(sf_dev, "serial"))) { + char *cs = canon_str(s, strlen(s)); + ADD2LOG(" serial = %s\n", cs); + if(*cs) { + hd->serial = cs; + } + else { + free_mem(cs); + } + } + if((s = hd_sysfs_id(sf_dev))) { /* parent has longest matching sysfs id */ @@ -343,7 +367,7 @@ if(hd->bus.id == bus_ide) { add_ide_sysfs_info(hd_data, hd); } - else if(hd->bus.id == bus_scsi || hd->bus.id == bus_pci) { + else if(hd->bus.id == bus_scsi || hd->bus.id == bus_pci || hd->bus.id == bus_nvme) { /* * In case there's no data in the 'device' subdir but in * 'device/device', try one level deeper (for some capricious @@ -758,7 +782,12 @@ hd->func = u3; } - if(hd->bus.id == bus_pci) { + if(hd->sysfs_bus_id && sscanf(hd->sysfs_bus_id, "nvme%u", &u0) == 1) { + hd->slot = u0; + } + + // Looks like PCI device? + if(get_sysfs_attr_by_path(sf_dev, "subsystem_vendor")) { if(hd_attr_uint(get_sysfs_attr_by_path(sf_dev, "vendor"), &ul0, 0)) { ADD2LOG(" vendor = 0x%x\n", (unsigned) ul0); hd->vendor.id = MAKE_ID(TAG_PCI, ul0 & 0xffff); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/hd.c new/hwinfo-22.0/src/hd/hd.c --- old/hwinfo-21.82/src/hd/hd.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/hd.c 2022-08-05 09:56:03.000000000 +0200 @@ -910,6 +910,7 @@ break; case hw_scsi: + case hw_nvme: case hw_tape: hd_set_probe_feature(hd_data, pr_pci); hd_set_probe_feature(hd_data, pr_block); @@ -4739,6 +4740,7 @@ case hw_pci: case hw_isapnp: case hw_scsi: + case hw_nvme: case hw_ide: case hw_pcmcia: /* special */ @@ -4805,6 +4807,9 @@ else if(hd->bus.id == bus_scsi) { hd_set_hw_class(hd, hw_scsi); } + else if(hd->bus.id == bus_nvme) { + hd_set_hw_class(hd, hw_nvme); + } else if(hd->bus.id == bus_ide) { hd_set_hw_class(hd, hw_ide); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/hd.h new/hwinfo-22.0/src/hd/hd.h --- old/hwinfo-21.82/src/hd/hd.h 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/hd.h 2022-08-05 09:56:03.000000000 +0200 @@ -145,7 +145,7 @@ hw_isapnp, hw_bridge, hw_hub, hw_scsi, hw_ide, hw_memory, hw_dvb, hw_pcmcia, hw_pcmcia_ctrl, hw_ieee1394, hw_ieee1394_ctrl, hw_hotplug, hw_hotplug_ctrl, hw_zip, hw_pppoe, hw_wlan, hw_redasd, hw_dsl, hw_block, - hw_tape, hw_vbe, hw_bluetooth, hw_fingerprint, hw_mmc_ctrl, + hw_tape, hw_vbe, hw_bluetooth, hw_fingerprint, hw_mmc_ctrl, hw_nvme, /** append new entries here */ hw_unknown, hw_all /**< hw_all must be last */ } hd_hw_item_t; @@ -300,7 +300,8 @@ /** outside the range of the PCI values */ bus_ps2 = 0x80, bus_serial, bus_parallel, bus_floppy, bus_scsi, bus_ide, bus_usb, bus_adb, bus_raid, bus_sbus, bus_i2o, bus_vio, bus_ccw, bus_iucv, bus_ps3_system_bus, - bus_virtio, bus_ibmebus, bus_gameport, bus_uisvirtpci, bus_mmc, bus_sdio, bus_nd + bus_virtio, bus_ibmebus, bus_gameport, bus_uisvirtpci, bus_mmc, bus_sdio, bus_nd, + bus_nvme, } hd_bus_types_t; /** @} */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/hwclass_names.h new/hwinfo-22.0/src/hd/hwclass_names.h --- old/hwinfo-21.82/src/hd/hwclass_names.h 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/hwclass_names.h 2022-08-05 09:56:03.000000000 +0200 @@ -59,6 +59,7 @@ { hw_tape, "tape" }, { hw_vbe, "vesa bios" }, { hw_bluetooth, "bluetooth" }, + { hw_nvme, "nvme" }, { hw_unknown, "unknown" }, { 0, NULL } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/int.c new/hwinfo-22.0/src/hd/int.c --- old/hwinfo-21.82/src/hd/int.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/int.c 2022-08-05 09:56:03.000000000 +0200 @@ -1230,8 +1230,6 @@ char *s; edd_info_t *ei; - if(!hd_data->edd) return; - for(hd = hd_data->hd; hd; hd = hd->next) { if( hd->base_class.id == bc_storage_device && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/net.c new/hwinfo-22.0/src/hd/net.c --- old/hwinfo-21.82/src/hd/net.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/net.c 2022-08-05 09:56:03.000000000 +0200 @@ -619,7 +619,7 @@ addr[3 * i - 1] = 0; } - ADD2LOG(" %s: ethtool permanent hw address[%d]: %s\n", hd->unix_dev_name, phwaddr->size, addr); + ADD2LOG(" %s: ethtool permanent hw address[%d]: %s\n", hd->unix_dev_name, phwaddr->size, addr ?: ""); if(addr && strspn(addr, "0:") != strlen(addr)) { res = new_mem(sizeof *res); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/hd/pci.c new/hwinfo-22.0/src/hd/pci.c --- old/hwinfo-21.82/src/hd/pci.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/hd/pci.c 2022-08-05 09:56:03.000000000 +0200 @@ -1612,7 +1612,7 @@ if(drv_name) drv_name++; } - ADD2LOG(" driver = \"%s\"\n", drv_name); + ADD2LOG(" driver = \"%s\"\n", drv_name ?: ""); if( drv_name && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/ids/check_hd.c new/hwinfo-22.0/src/ids/check_hd.c --- old/hwinfo-21.82/src/ids/check_hd.c 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/ids/check_hd.c 2022-08-05 09:56:03.000000000 +0200 @@ -19,7 +19,7 @@ hw_isapnp, hw_bridge, hw_hub, hw_scsi, hw_ide, hw_memory, hw_dvb, hw_pcmcia, hw_pcmcia_ctrl, hw_ieee1394, hw_ieee1394_ctrl, hw_hotplug, hw_hotplug_ctrl, hw_zip, hw_pppoe, hw_wlan, hw_redasd, hw_dsl, hw_block, - hw_tape, hw_vbe, hw_bluetooth, + hw_tape, hw_vbe, hw_bluetooth, hw_nvme, /* append new entries here */ hw_unknown, hw_all /* hw_all must be last */ } hd_hw_item_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.82/src/ids/src/bus new/hwinfo-22.0/src/ids/src/bus --- old/hwinfo-21.82/src/ids/src/bus 2022-06-23 11:16:55.000000000 +0200 +++ new/hwinfo-22.0/src/ids/src/bus 2022-08-05 09:56:03.000000000 +0200 @@ -100,3 +100,5 @@ bus.id 0x95 +bus.name ND + bus.id 0x96 ++bus.name NVME
