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-06-24 08:45:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Fri Jun 24 08:45:06 2022 rev:186 rq:984691 version:21.82 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2022-04-16 00:14:03.757634150 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.1548/hwinfo.changes 2022-06-24 08:45:17.579137997 +0200 @@ -1,0 +2,8 @@ +Thu Jun 23 09:16:55 UTC 2022 - [email protected] + +- merge gh#openSUSE/hwinfo#113 +- Keep NVMe's namespace output consistency when + nvme_core.multipath=1 (bsc#1199948) +- 21.82 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.81.tar.xz New: ---- hwinfo-21.82.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.1udRri/_old 2022-06-24 08:45:18.127138610 +0200 +++ /var/tmp/diff_new_pack.1udRri/_new 2022-06-24 08:45:18.127138610 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.81 +Version: 21.82 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.81.tar.xz -> hwinfo-21.82.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.81/VERSION new/hwinfo-21.82/VERSION --- old/hwinfo-21.81/VERSION 2022-04-13 09:20:43.000000000 +0200 +++ new/hwinfo-21.82/VERSION 2022-06-23 11:16:55.000000000 +0200 @@ -1 +1 @@ -21.81 +21.82 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.81/changelog new/hwinfo-21.82/changelog --- old/hwinfo-21.81/changelog 2022-04-13 09:20:43.000000000 +0200 +++ new/hwinfo-21.82/changelog 2022-06-23 11:16:55.000000000 +0200 @@ -1,3 +1,8 @@ +2022-06-23: 21.82 + - merge gh#openSUSE/hwinfo#113 + - Keep NVMe's namespace output consistency when + nvme_core.multipath=1 (bsc#1199948) + 2022-04-13: 21.81 - merge gh#openSUSE/hwinfo#112 - fix bug in determining serial console device name (bsc#1198043) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.81/src/hd/block.c new/hwinfo-21.82/src/hd/block.c --- old/hwinfo-21.81/src/hd/block.c 2022-04-13 09:20:43.000000000 +0200 +++ new/hwinfo-21.82/src/hd/block.c 2022-06-23 11:16:55.000000000 +0200 @@ -169,6 +169,25 @@ } sf_dev = new_str(hd_read_sysfs_link(sf_cdev, "device")); + + bus_name = NULL; + if( + (s = hd_read_sysfs_link(sf_dev, "subsystem")) || + (s = hd_read_sysfs_link(sf_dev, "bus")) + ) { + bus_name = strrchr(s, '/'); + if(bus_name) bus_name++; + bus_name = new_str(bus_name); + /* if bus_name is nvme-subsystem reconsider sf_dev value */ + if(!strcmp(bus_name, "nvme-subsystem")) { + for(sl = read_dir(sf_dev, 'l'); sl; sl = sl->next) { + if(!strncmp(sl->str, "nvme", 4)) { + sf_dev = new_str(hd_read_sysfs_link(sf_dev, sl->str)); + } + } + } + } + sf_drv_name = NULL; sf_drv = hd_read_sysfs_link(sf_dev, "driver"); if(!sf_drv) { @@ -185,15 +204,6 @@ bus_id = sf_dev ? strrchr(sf_dev, '/') : NULL; if(bus_id) bus_id++; - bus_name = NULL; - if( - (s = hd_read_sysfs_link(sf_dev, "subsystem")) || - (s = hd_read_sysfs_link(sf_dev, "bus")) - ) { - bus_name = strrchr(s, '/'); - if(bus_name) bus_name++; - bus_name = new_str(bus_name); - } if(sf_dev) { ADD2LOG( @@ -275,6 +285,7 @@ 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; } hd->sysfs_bus_id = new_str(bus_id);
