Hello community, here is the log from the commit of package hwinfo checked in at Thu May 17 11:40:03 CEST 2007. -------- --- hwinfo/hwinfo.changes 2007-05-11 12:16:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2007-05-16 14:50:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 16 14:49:57 CEST 2007 - snwint@suse.de + +- corrected ps3 patch + +------------------------------------------------------------------- Old: ---- hwinfo-13.34.tar.bz2 New: ---- hwinfo-13.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.hs7988/_old 2007-05-17 11:39:26.000000000 +0200 +++ /var/tmp/diff_new_pack.hs7988/_new 2007-05-17 11:39:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.34) +# spec file for package hwinfo (Version 13.35) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,9 +20,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq Autoreqprov: on Summary: Hardware Library -Version: 13.34 +Version: 13.35 Release: 1 -Source: hwinfo-13.34.tar.bz2 +Source: hwinfo-13.35.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +89,8 @@ %doc doc/libhd/html %changelog +* Wed May 16 2007 - snwint@suse.de +- corrected ps3 patch * Fri May 11 2007 - snwint@suse.de - sassmann: added ps3 support (#273135) * Thu May 03 2007 - snwint@suse.de ++++++ hwinfo-13.34.tar.bz2 -> hwinfo-13.35.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.34/Changelog new/hwinfo-13.35/Changelog --- old/hwinfo-13.34/Changelog 2007-05-11 12:15:07.000000000 +0200 +++ new/hwinfo-13.35/Changelog 2007-05-16 14:49:35.000000000 +0200 @@ -1,3 +1,6 @@ +16/5/2007: v13.35 + - corrected ps3 patch + 11/5/2007: v13.34 - sassmann: added ps3 support (#273135) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.34/src/hd/pci.c new/hwinfo-13.35/src/hd/pci.c --- old/hwinfo-13.34/src/hd/pci.c 2007-05-11 12:12:32.000000000 +0200 +++ new/hwinfo-13.35/src/hd/pci.c 2007-05-14 16:09:07.000000000 +0200 @@ -740,7 +740,7 @@ */ void hd_read_platform(hd_data_t *hd_data) { - char *s, *platform_name, *platform_type; + char *s, *platform_type; int scsi_cnt = 0; hd_t *hd; str_list_t *sf_bus, *sf_bus_e; @@ -762,7 +762,7 @@ hd_sysfs_id(sf_dev) ); - platform_name = platform_type = NULL; + platform_type = NULL; if((s = get_sysfs_attr_by_path(sf_dev, "modalias"))) { platform_type = canon_str(s, strlen(s)); @@ -770,7 +770,7 @@ } if( - platform_type && ( !strcmp(platform_type, "ps3_storage") ) + platform_type && !strcmp(platform_type, "ps3_storage") ) { hd = add_hd_entry(hd_data, __LINE__, 0); hd->bus.id = bus_ps3_system_bus; @@ -783,7 +783,7 @@ hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1000); /* PS3_DEV_TYPE_STOR_DISK */ str_printf(&hd->device.name, 0, "PS3 storage %d", hd->slot); - hd->rom_id = new_str(platform_name ? platform_name + 1 : 0); /* skip leading '/' */ + hd->modalias = new_str(platform_type); hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); hd->sysfs_bus_id = new_str(sf_bus_e->str); @@ -791,6 +791,8 @@ if(s) add_str_list(&hd->drivers, s); } + platform_type = free_mem(platform_type); + free_mem(sf_dev); } @@ -804,7 +806,7 @@ */ static void hd_read_ps3_system_bus(hd_data_t *hd_data) { - char *s, *ps3_name, *ps3_type; + char *s, *ps3_name; int eth_cnt = 0; hd_t *hd; str_list_t *sf_bus, *sf_bus_e; @@ -826,7 +828,7 @@ hd_sysfs_id(sf_dev) ); - ps3_name = ps3_type = NULL; + ps3_name = NULL; if((s = get_sysfs_attr_by_path(sf_dev, "modalias"))) { ps3_name = canon_str(s, strlen(s)); @@ -844,13 +846,13 @@ hd->vendor.id = MAKE_ID(TAG_PCI, 0x104d); /* Sony */ - hd->base_class.id = bc_network; - hd->sub_class.id = 0; /* ethernet */ - hd->slot = eth_cnt++; - hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1003); /* PS3_DEV_TYPE_SB_GELIC */ - str_printf(&hd->device.name, 0, "PS3 Ethernet card %d", hd->slot); - - hd->rom_id = new_str(ps3_name ? ps3_name + 1 : 0); /* skip leading '/' */ + hd->base_class.id = bc_network; + hd->sub_class.id = 0; /* ethernet */ + hd->slot = eth_cnt++; + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1003); /* PS3_DEV_TYPE_SB_GELIC */ + str_printf(&hd->device.name, 0, "PS3 Ethernet card %d", hd->slot); + + hd->modalias = new_str(ps3_name); hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); hd->sysfs_bus_id = new_str(sf_bus_e->str); @@ -858,6 +860,8 @@ if(s) add_str_list(&hd->drivers, s); } + ps3_name = free_mem(ps3_name); + free_mem(sf_dev); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.34/VERSION new/hwinfo-13.35/VERSION --- old/hwinfo-13.34/VERSION 2007-05-11 12:14:22.000000000 +0200 +++ new/hwinfo-13.35/VERSION 2007-05-14 15:59:49.000000000 +0200 @@ -1 +1 @@ -13.34 +13.35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org