Hello community, here is the log from the commit of package hwinfo checked in at Fri Mar 16 14:48:45 CET 2007. -------- --- hwinfo/hwinfo.changes 2007-03-08 11:34:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2007-03-16 14:38:35.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 14:38:29 CET 2007 - snwint@suse.de + +- better cpu detection (#252183) + +------------------------------------------------------------------- Old: ---- hwinfo-13.28.tar.bz2 New: ---- hwinfo-13.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.H12778/_old 2007-03-16 14:47:14.000000000 +0100 +++ /var/tmp/diff_new_pack.H12778/_new 2007-03-16 14:47:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.28) +# spec file for package hwinfo (Version 13.29) # # 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.28 +Version: 13.29 Release: 1 -Source: hwinfo-13.28.tar.bz2 +Source: hwinfo-13.29.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +89,8 @@ %doc doc/libhd/html %changelog +* Fri Mar 16 2007 - snwint@suse.de +- better cpu detection (#252183) * Thu Mar 08 2007 - snwint@suse.de - updated X11 data * Thu Mar 01 2007 - snwint@suse.de ++++++ hwinfo-13.28.tar.bz2 -> hwinfo-13.29.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.28/Changelog new/hwinfo-13.29/Changelog --- old/hwinfo-13.28/Changelog 2007-03-08 11:29:51.000000000 +0100 +++ new/hwinfo-13.29/Changelog 2007-03-16 14:37:34.000000000 +0100 @@ -1,3 +1,6 @@ +16/3/2007: v13.29 + - better cpu detection (#252183) + 8/3/2007: v13.28 - updated X11 data diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.28/src/hd/cpu.c new/hwinfo-13.29/src/hd/cpu.c --- old/hwinfo-13.28/src/hd/cpu.c 2006-09-27 15:11:30.000000000 +0200 +++ new/hwinfo-13.29/src/hd/cpu.c 2007-03-16 14:33:48.000000000 +0100 @@ -96,10 +96,9 @@ #endif #ifdef __ia64__ - char model_id[80], vendor_id[80], features[0x100]; - unsigned mhz, stepping; + char model_id[0x100], vendor_id[80], features[0x100]; + unsigned mhz, family, model, stepping; double bogo; - char *t0, *t; #endif #ifdef __alpha__ @@ -149,8 +148,8 @@ if(*model_id || *system_id) { /* at least one of those */ ct = new_mem(sizeof *ct); ct->architecture = arch_alpha; - if(model_id) ct->model_name = new_str(model_id); - if(system_id) ct->vend_name = new_str(system_id); + if(*model_id) ct->model_name = new_str(model_id); + if(*system_id) ct->vend_name = new_str(system_id); if(strncmp(serial_number, "MILO", 4) == 0) hd_data->boot = boot_milo; else @@ -260,8 +259,8 @@ #ifdef __x86_64__ ct->architecture = arch_x86_64; #endif - if(model_id) ct->model_name = new_str(model_id); - if(vendor_id) ct->vend_name = new_str(vendor_id); + if(*model_id) ct->model_name = new_str(model_id); + if(*vendor_id) ct->vend_name = new_str(vendor_id); ct->family = family; ct->model = model; ct->stepping = stepping; @@ -344,16 +343,14 @@ if(*model_id) { /* at least one of those */ ct = new_mem(sizeof *ct); ct->architecture = arch_ppc; - if(model_id) { - ct->model_name = new_str(model_id); - } + if(*model_id) ct->model_name = new_str(model_id); if(!uname(&un)) if(strstr(un.machine,"ppc64")) ct->architecture = arch_ppc64; - if(vendor_id) ct->vend_name = new_str(vendor_id); - if(motherboard) ct->platform = new_str(motherboard); + if(*vendor_id) ct->vend_name = new_str(vendor_id); + if(*motherboard) ct->platform = new_str(motherboard); ct->family = family; ct->model = model; ct->stepping = stepping; @@ -386,14 +383,16 @@ #ifdef __ia64__ *model_id = *vendor_id = *features = 0; - mhz = stepping = 0; + mhz = family = model = stepping = 0; bogo = 0; for(sl = hd_data->cpu; sl; sl = sl->next) { - if(sscanf(sl->str, "family : %79[^\n]", model_id) == 1); + if(sscanf(sl->str, "model name : %255[^\n]", model_id) == 1); if(sscanf(sl->str, "vendor : %79[^\n]", vendor_id) == 1); if(sscanf(sl->str, "features : %255[^\n]", features) == 1); if(sscanf(sl->str, "cpu MHz : %u", &mhz) == 1); + if(sscanf(sl->str, "family : %u", &family) == 1); + if(sscanf(sl->str, "model : %u", &model) == 1); if(sscanf(sl->str, "revision : %u", &stepping) == 1); if(sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1); @@ -401,8 +400,10 @@ if(*model_id || *vendor_id) { /* at least one of those */ ct = new_mem(sizeof *ct); ct->architecture = arch_ia64; - if(model_id) ct->model_name = new_str(model_id); - if(vendor_id) ct->vend_name = new_str(vendor_id); + if(*model_id) ct->model_name = new_str(model_id); + if(*vendor_id) ct->vend_name = new_str(vendor_id); + ct->family = family; + ct->model = model; ct->stepping = stepping; hd_data->boot = boot_elilo; @@ -446,9 +447,7 @@ hd->detail->cpu.data = ct; if(*features) { - for(t0 = features; (t = strsep(&t0, " ")); ) { - add_str_list(&ct->features, t); - } + ct->features = hd_split(',', features); } *model_id = *vendor_id = 0; @@ -480,7 +479,7 @@ #else ct->architecture = arch_s390; #endif - if(vendor_id) ct->vend_name = new_str(vendor_id); + if(*vendor_id) ct->vend_name = new_str(vendor_id); ct->stepping = u1; hd_data->boot = boot_s390; ct->bogo = bogo; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.28/src/hd/hdp.c new/hwinfo-13.29/src/hd/hdp.c --- old/hwinfo-13.28/src/hd/hdp.c 2006-10-10 12:27:15.000000000 +0200 +++ new/hwinfo-13.29/src/hd/hdp.c 2007-03-16 14:32:19.000000000 +0100 @@ -1076,11 +1076,10 @@ if(ct->vend_name) dump_line("Vendor: \"%s\"\n", ct->vend_name); - if(ct->model_name) - dump_line( - "Model: %u.%u.%u \"%s\"\n", - ct->family, ct->model, ct->stepping, ct->model_name - ); + dump_line( + "Model: %u.%u.%u \"%s\"\n", + ct->family, ct->model, ct->stepping, ct->model_name ?: "" + ); if(ct->platform) dump_line("Platform: \"%s\"\n", ct->platform); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.28/VERSION new/hwinfo-13.29/VERSION --- old/hwinfo-13.28/VERSION 2007-03-08 11:29:22.000000000 +0100 +++ new/hwinfo-13.29/VERSION 2007-03-16 14:36:44.000000000 +0100 @@ -1 +1 @@ -13.28 +13.29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org