Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2019-07-23 22:33:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Tue Jul 23 22:33:12 2019 rev:169 rq:717098 version:21.67 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2019-05-25 13:34:28.788009907 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.4126/hwinfo.changes 2019-07-23 22:33:14.343022630 +0200 @@ -1,0 +2,8 @@ +Fri Jul 19 13:56:55 UTC 2019 - [email protected] + +- merge gh#openSUSE/hwinfo#81 +- fix DASD detection (bsc#1136475) +- don't include bcache devices +- 21.67 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.66.tar.xz New: ---- hwinfo-21.67.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.ZJFgRS/_old 2019-07-23 22:33:14.847022526 +0200 +++ /var/tmp/diff_new_pack.ZJFgRS/_new 2019-07-23 22:33:14.847022526 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.66 +Version: 21.67 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.66.tar.xz -> hwinfo-21.67.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.66/VERSION new/hwinfo-21.67/VERSION --- old/hwinfo-21.66/VERSION 2019-05-23 15:32:53.000000000 +0200 +++ new/hwinfo-21.67/VERSION 2019-07-19 15:56:55.000000000 +0200 @@ -1 +1 @@ -21.66 +21.67 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.66/changelog new/hwinfo-21.67/changelog --- old/hwinfo-21.66/changelog 2019-05-23 15:32:53.000000000 +0200 +++ new/hwinfo-21.67/changelog 2019-07-19 15:56:55.000000000 +0200 @@ -1,3 +1,8 @@ +2019-07-19: 21.67 + - merge gh#openSUSE/hwinfo#81 + - fix DASD detection (bsc#1136475) + - don't include bcache devices + 2019-05-23: 21.66 - merge gh#openSUSE/hwinfo#80 - fix Makefile and allow building for old distros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.66/src/hd/block.c new/hwinfo-21.67/src/hd/block.c --- old/hwinfo-21.66/src/hd/block.c 2019-05-23 15:32:53.000000000 +0200 +++ new/hwinfo-21.67/src/hd/block.c 2019-07-19 15:56:55.000000000 +0200 @@ -525,36 +525,37 @@ if(hd->sysfs_id) { if( - sscanf(hd->sysfs_id, "/block/cciss!c%ud%u", &u0, &u1) == 2 + sscanf(hd->sysfs_id, "/class/block/cciss!c%ud%u", &u0, &u1) == 2 ) { hd->slot = (u0 << 8) + u1; str_printf(&hd->device.name, 0, "CCISS disk %u/%u", u0, u1); } else if( - sscanf(hd->sysfs_id, "/block/ida!c%ud%u", &u0, &u1) == 2 + sscanf(hd->sysfs_id, "/class/block/ida!c%ud%u", &u0, &u1) == 2 ) { hd->slot = (u0 << 8) + u1; str_printf(&hd->device.name, 0, "SMART Array %u/%u", u0, u1); } else if( - sscanf(hd->sysfs_id, "/block/rd!c%ud%u", &u0, &u1) == 2 + sscanf(hd->sysfs_id, "/class/block/rd!c%ud%u", &u0, &u1) == 2 ) { hd->slot = (u0 << 8) + u1; str_printf(&hd->device.name, 0, "DAC960 RAID Array %u/%u", u0, u1); } else if( - sscanf(hd->sysfs_id, "/block/i2o!hd%c", &c) == 1 && + sscanf(hd->sysfs_id, "/class/block/i2o!hd%c", &c) == 1 && c >= 'a' ) { hd->slot = c - 'a'; str_printf(&hd->device.name, 0, "I2O disk %u", hd->slot); } else if( - sscanf(hd->sysfs_id, "/block/dasd%c", &c) == 1 && + sscanf(hd->sysfs_id, "/class/block/dasd%c", &c) == 1 && c >= 'a' ) { hd->slot = c - 'a'; hd->device.name = new_str("S390 Disk"); + hd_set_hw_class(hd, hw_redasd); } } @@ -1221,7 +1222,8 @@ hd_data->flags.list_md || ( strncmp(name, "md", sizeof "md" - 1) && - strncmp(name, "dm-", sizeof "dm-" - 1) + strncmp(name, "dm-", sizeof "dm-" - 1) && + strncmp(name, "bcache", sizeof "bcache" - 1) ) ) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.66/src/hd/hd.c new/hwinfo-21.67/src/hd/hd.c --- old/hwinfo-21.66/src/hd/hd.c 2019-05-23 15:32:53.000000000 +0200 +++ new/hwinfo-21.67/src/hd/hd.c 2019-07-19 15:56:55.000000000 +0200 @@ -4783,13 +4783,6 @@ ) { hd_set_hw_class(hd, hw_tape); } - - if( - hd->base_class.id == bc_storage_device && - hd->sub_class.id == sc_sdev_disk - ) { - hd_set_hw_class(hd, hw_redasd); - } }
