Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2012-08-07 08:09:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo", Maintainer is "snw...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2012-02-15 16:16:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2012-08-07 08:09:37.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 6 11:55:17 CEST 2012 - snw...@suse.de + +- increase major version to 20 to avoid ABI change problems (maybe bnc #739349) +- change multi-interface detection to work with old sysfs layout (bnc #739368, bnc #693090) + +------------------------------------------------------------------- Old: ---- hwinfo-19.1.tar.bz2 New: ---- hwinfo-20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.L7PB2d/_old 2012-08-07 08:09:41.000000000 +0200 +++ /var/tmp/diff_new_pack.L7PB2d/_new 2012-08-07 08:09:41.000000000 +0200 @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: hwinfo -BuildRequires: doxygen flex perl-XML-Parser udev +BuildRequires: doxygen +BuildRequires: flex +BuildRequires: perl-XML-Parser +BuildRequires: udev %if 0%{?rhel_version} == 0 BuildRequires: perl-XML-Writer %endif %ifarch %ix86 x86_64 BuildRequires: libx86emu-devel %endif -License: GPL-2.0+ -Group: Hardware/Other Provides: libhd Obsoletes: libhd PreReq: /sbin/ldconfig -AutoReqProv: on Summary: Hardware Library -Version: 19.1 -Release: 1 -Source: hwinfo-19.1.tar.bz2 +License: GPL-2.0+ +Group: Hardware/Other +Version: 20.0 +Release: 0 +Source: hwinfo-20.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +45,6 @@ %package devel -License: GPL-2.0+ Summary: Hardware Detection Library Group: Development/Libraries/C and C++ Provides: libhddev ++++++ hwinfo-19.1.tar.bz2 -> hwinfo-20.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-19.1/VERSION new/hwinfo-20.0/VERSION --- old/hwinfo-19.1/VERSION 2012-02-10 09:49:41.000000000 +0100 +++ new/hwinfo-20.0/VERSION 2012-08-06 11:55:14.000000000 +0200 @@ -1 +1 @@ -19.1 +20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-19.1/changelog new/hwinfo-20.0/changelog --- old/hwinfo-19.1/changelog 2012-02-10 09:49:42.000000000 +0100 +++ new/hwinfo-20.0/changelog 2012-08-06 11:55:16.000000000 +0200 @@ -1,4 +1,7 @@ -2012-02-09: HEAD +2012-05-22: 20.0 + - change multi-interface detection to work with old sysfs layout (bnc #739368, bnc #693090) + +2012-02-09: 19.1 - basic arm support - updated git related scripts - Use new and correct sysfs driver names: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-19.1/src/hd/pci.c new/hwinfo-20.0/src/hd/pci.c --- old/hwinfo-19.1/src/hd/pci.c 2012-02-09 11:37:10.000000000 +0100 +++ new/hwinfo-20.0/src/hd/pci.c 2012-08-06 11:52:28.000000000 +0200 @@ -310,7 +310,7 @@ pci_t *pci, *pnext; unsigned u; char *s, *t; - str_list_t *net_ifs; + str_list_t *net_ifs, *net_ifs2; PROGRESS(4, 0, "build list"); @@ -340,22 +340,40 @@ * function, just replicate entries. */ + /* old kernels: subdir 'net/<interface>' */ s = NULL; str_printf(&s, 0, "/sys%s/net", hd->sysfs_id); net_ifs = read_dir(s, 'D'); s = free_mem(s); + if(!net_ifs) { + /* old kernels: links 'net:<interface>' */ + str_list_t *tmp, *sl; + + str_printf(&s, 0, "/sys%s", hd->sysfs_id); + tmp = read_dir(s, 'l'); + s = free_mem(s); + + for(sl = tmp; sl; sl = sl->next) { + if(!strncmp(sl->str, "net:", sizeof "net:" - 1)) { + add_str_list(&net_ifs, sl->str + sizeof "net:" - 1); + } + } + + free_str_list(tmp); + } + if(net_ifs) { hd->unix_dev_name = new_str(net_ifs->str); - net_ifs = net_ifs->next; + net_ifs2 = net_ifs->next; - for(; net_ifs; net_ifs = net_ifs->next) { + for(; net_ifs2; net_ifs2 = net_ifs2->next) { hd2 = add_hd_entry(hd_data, __LINE__, 0); hd2->sysfs_id = new_str(hd->sysfs_id); if(hd->drivers) { add_str_list(&hd2->drivers, hd->drivers->str); } - hd2->unix_dev_name = new_str(net_ifs->str); + hd2->unix_dev_name = new_str(net_ifs2->str); hd2->detail = hd->detail; hd_pci_complete_data(hd2); hd2->detail = NULL; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
