Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2024-10-22 14:51:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.26871 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hwinfo" Tue Oct 22 14:51:13 2024 rev:194 rq:1216693 version:23.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2023-07-24 18:13:14.977664479 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.26871/hwinfo.changes 2024-10-22 14:51:29.764333054 +0200 @@ -1,0 +2,7 @@ +Mon Oct 21 10:50:15 UTC 2024 - wfeldt@opensuse.org + +- merge gh#openSUSE/hwinfo#148 +- avoid reporting of spurious usb storage devices (bsc#1223330) +- 23.3 + +-------------------------------------------------------------------- Old: ---- hwinfo-23.2.tar.xz New: ---- hwinfo-23.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.z3bYhM/_old 2024-10-22 14:51:30.224352298 +0200 +++ /var/tmp/diff_new_pack.z3bYhM/_new 2024-10-22 14:51:30.224352298 +0200 @@ -1,7 +1,7 @@ # # spec file for package hwinfo # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: hwinfo -Version: 23.2 +Version: 23.3 %define lname libhd%(echo "%version" | perl -pe 's{\\D.*}{}') Release: 0 Summary: Hardware Library ++++++ hwinfo-23.2.tar.xz -> hwinfo-23.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.2/VERSION new/hwinfo-23.3/VERSION --- old/hwinfo-23.2/VERSION 2023-07-20 13:51:26.000000000 +0200 +++ new/hwinfo-23.3/VERSION 2024-10-21 12:50:15.000000000 +0200 @@ -1 +1 @@ -23.2 +23.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.2/changelog new/hwinfo-23.3/changelog --- old/hwinfo-23.2/changelog 2023-07-20 13:51:26.000000000 +0200 +++ new/hwinfo-23.3/changelog 2024-10-21 12:50:15.000000000 +0200 @@ -1,3 +1,7 @@ +2024-10-21: 23.3 + - merge gh#openSUSE/hwinfo#148 + - avoid reporting of spurious usb storage devices (bsc#1223330) + 2023-07-20: 23.2 - merge gh#openSUSE/hwinfo#128 - Add support for loongarch cpu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.2/src/hd/int.c new/hwinfo-23.3/src/hd/int.c --- old/hwinfo-23.2/src/hd/int.c 2023-07-20 13:51:26.000000000 +0200 +++ new/hwinfo-23.3/src/hd/int.c 2024-10-21 12:50:15.000000000 +0200 @@ -47,6 +47,7 @@ static void int_find_parent(hd_data_t *hd_data); static void int_add_driver_modules(hd_data_t *hd_data); static void int_update_driver_data(hd_data_t *hd_data, hd_t *hd); +static int is_usb_storage(hd_t *hd); void hd_scan_int(hd_data_t *hd_data) @@ -611,7 +612,10 @@ /* - * Remove usb entries that are handled by usb-storage. + * Remove usb entries that are handled by a usb storage driver. + * + * USB disks are handled in block.c and usb.c - this can lead to incorrect + * duplicate entries. */ void int_fix_usb_scsi(hd_data_t *hd_data) { @@ -621,13 +625,13 @@ if( hd_usb->bus.id == bus_usb && hd_usb->sysfs_id && - search_str_list(hd_usb->drivers, "usb-storage") + is_usb_storage(hd_usb) ) { for(hd_scsi = hd_data->hd; hd_scsi; hd_scsi = hd_scsi->next) { if( hd_scsi->bus.id == bus_scsi && hd_scsi->sysfs_device_link && - search_str_list(hd_scsi->drivers, "usb-storage") + is_usb_storage(hd_scsi) ) { if(!strncmp(hd_scsi->sysfs_device_link, hd_usb->sysfs_id, strlen(hd_usb->sysfs_id))) { hd_set_hw_class(hd_scsi, hw_usb); @@ -1343,5 +1347,25 @@ int_update_driver_data(hd_data, hd); } + +/* + * Return 1 if an usb storage driver is used, otherwise 0. + * + * Storage drivers can be usb-storage or uas. + */ +int is_usb_storage(hd_t *hd) +{ + int is_storage = 0; + + if( + search_str_list(hd->drivers, "usb-storage") || + search_str_list(hd->drivers, "uas") + ) { + is_storage = 1; + } + + return is_storage; +} + /** @} */