Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at Mon Jun 29 16:37:27 CEST 2009. -------- --- hwinfo/hwinfo.changes 2009-06-19 11:01:36.000000000 +0200 +++ hwinfo/hwinfo.changes 2009-06-24 15:22:50.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 24 15:22:27 CEST 2009 - snwint@suse.de + +- --log without other options assumes --all (bnc #243103) +- rewrote man page, help text & README (bnc #178662) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hwinfo-16.2.tar.bz2 New: ---- hwinfo-16.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.VD5228/_old 2009-06-29 16:33:43.000000000 +0200 +++ /var/tmp/diff_new_pack.VD5228/_new 2009-06-29 16:33:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 16.2) +# spec file for package hwinfo (Version 16.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,9 +31,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 16.2 -Release: 2 -Source: hwinfo-16.2.tar.bz2 +Version: 16.3 +Release: 1 +Source: hwinfo-16.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-16.2.tar.bz2 -> hwinfo-16.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/Changelog new/hwinfo-16.3/Changelog --- old/hwinfo-16.2/Changelog 2009-06-15 11:32:08.000000000 +0200 +++ new/hwinfo-16.3/Changelog 2009-06-24 15:21:35.000000000 +0200 @@ -1,3 +1,7 @@ +24/6/2009: v16.3 + - --log without other options assumes --all (bnc #243103) + - rewrote man page, help text & README (bnc #178662) + 15/6/2009: v16.2 - fix build on non-x86 archs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/doc/hwinfo.8 new/hwinfo-16.3/doc/hwinfo.8 --- old/hwinfo-16.2/doc/hwinfo.8 2009-05-12 12:10:34.000000000 +0200 +++ new/hwinfo-16.3/doc/hwinfo.8 2009-06-24 15:04:30.000000000 +0200 @@ -1,92 +1,118 @@ -.\" Michal Svec <msvec@suse.cz> -.\" -.\" Process this file with -.\" groff -man -Tascii foo.1 -.\" -.\" -.TH HWINFO 8 "January 2003" "hwinfo" "System configuration" -.\" +.TH HWINFO 8 "June 2009" "hwinfo" "System configuration" .\" .SH NAME hwinfo \- probe for hardware .\" -.\" .SH SYNOPSIS .B hwinfo [ -.I options +.I OPTIONS .B ] .\" -.\" .SH DESCRIPTION .B hwinfo -is used to probe for the hardware present in the system. It can be used -to generate a system overview log which can be later used for support. -.\" +is used to probe for the hardware present in the system. It can be used to +generate a system overview log which can be later used for support. .\" .SH OPTIONS -.\" -.TP -.BI --debug " " level -Set debug -.B level. -The debug info is shown only in the log file. If you specify a log file, -the debug level is implicitly set to a reasonable value. -.\" +Note that running \fBhwinfo\fR without any options is roughly equivalent +to 'hwinfo --all --log=-'. .TP -.BI --dump-db " " n -Dump hardware data base, -.B n -is either -.B 0 -for the external data base, or -.B 1 -for the internal data base. -.\" -.TP -.BI --help -Print a usage and exit. -.\" -.TP -.BI --log " " logfile -Write info to -.B logfile. -.\" -.TP -.BI --short -Just a short listing. +\fB--<\f[BI]HARDWARE_ITEM\fB>\fR +This option can be given more than once. +Probe for a particular \fIHARDWARE_ITEM\fR. Available hardware items are: + +all, arch, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard, +cpu, disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub, ide, +isapnp, isdn, joystick, keyboard, memory, modem, monitor, mouse, netcard, +network, partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd, +reallyall, scanner, scsi, smp, sound, storage-ctrl, sys, tape, tv, uml, usb, +usb-ctrl, vbe, wlan, xen, zip +.TP +\fB--short\fR +Show only a summary. Use this option in addition to a hardware probing +option. +.TP +\fB--listmd\fR +Normally hwinfo does not report RAID devices. Add this option to see them. +.TP +\fB--only \fIDEVNAME\fR +This option can be given more than once. If you add this option, only data +about devices with \fIDEVNAME\fR will be shown. +.TP +\fB--save-config \fISPEC\fR +Store config for a particular device below /var/lib/hardware. \fISPEC\fR +can be a device name, an UDI, or 'all'. This option must be given in addition to +a hardware probing option. +.TP +\fB--show-config \fIUDI\fR +Show saved config data for a particular device. +.TP +\fB--map\fR +If disk names have changed (e.g. after a kernel update) this prints a list +of disk name mappings. Note that you must have used --save-config at some +point before for this can work. +.TP +\fB--debug \fIN\fR +Set debug level to \fIN\fR. The debug info is shown only in the log file. +If you specify a log file, the debug level is implicitly set to a reasonable value. +.TP +\fB--verbose\fR +Increase verbosity. Only together with --map. +.TP +\fB--log \fIFILE\fR +Write log info to \fIFILE\fR. +.TP +\fB--dump-db \fIN\fR +Dump hardware data base. \fIN\fR is either 0 for the external data base in +/var/lib/hardware, or 1 for the internal data base. +.TP +\fB--version\fR +Print libhd version. +.TP +\fB--help\fR +Print usage. +.\" +.SH ENVIRONMENT +\fBhwprobe\fR can hold a comma-separated list of probing flags preceded by '+' +or '-' to be turned on or off. To get a complete list of supported flags, +run 'hwinfo -all' (note: not '--all') and look at the top of the output. + +hwinfo also looks at /proc/cmdline for a \fBhwprobe\fR option. +.\" +.SH EXAMPLES +.TP +- show all disks +hwinfo --disk +.TP +- just an overview +hwinfo --short --block +.TP +- show a particular disk +hwinfo --disk --only /dev/sdb +.TP +- save disk config state +hwinfo --disk --save-config=all +.TP +- try 4 graphics card ports for monitor data (default: 3) +hwprobe=bios.ddc.ports=4 hwinfo --monitor +.TP +- monitor detection runs the Video BIOS to get the monitor data; dump a complete BIOS code execution trace to the log +hwprobe=bios.ddc.ports=1,x86emu=trace:dump:trace.only=0:dump.only=0 \ +hwinfo --monitor --log=foo .\" +.SH FILES .TP -.BI --version -Show libhd version. -.\" +\fB/var/lib/hardware/hd.ids\fR +External hardware data base (in readable text form). Try the --dump-db option to see the format. .TP -.BI --<hwitem> -Probe for the particular hardware item. Available hardware items are: -.B all, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard, cpu, -.B disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub, ide, isapnp, isdn, -.B joystick, keyboard, memory, modem, monitor, mouse, netcard, network, -.B partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, scanner, scsi, smp, -.B sound, storage-ctrl, sys, tape, tv, usb, usb-ctrl, vbe, wlan, -and -.B zip. -.\" -.\" -.SH FILES -.B /var/lib/hardware/* -.\" +\fB/var/lib/hardware/udi\fR +Directory where persistent config data are stored (see --save-config option). .\" .SH BUGS Not all hardware can be detected. .\" -.\" -.SH AUTHOR -.nf -Steffen Winterfeldt <snwint@suse.de> - hwinfo -Michal Svec <msvec@suse.cz> - manual page -.fi -.\" -.\" .SH "SEE ALSO" -Documentation in /usr/share/doc/packages/hwinfo. +More documentation in /usr/share/doc/packages/hwinfo. +.br +Source repository: git://git.opensuse.org/projects/hwinfo.git. .\" -.\" EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/hwinfo.c new/hwinfo-16.3/hwinfo.c --- old/hwinfo-16.2/hwinfo.c 2009-06-08 17:22:49.000000000 +0200 +++ new/hwinfo-16.3/hwinfo.c 2009-06-24 14:59:14.000000000 +0200 @@ -322,13 +322,15 @@ break; case 1000 ... 1100: - if(hw_items < (int) (sizeof hw_item / sizeof *hw_item) - 1) + if(hw_items < sizeof hw_item / sizeof *hw_item - 1) { hw_item[hw_items++] = i - 1000; + } break; case 2000 ... 2005: - if(hw_items < (int) (sizeof hw_item / sizeof *hw_item) - 1) + if(hw_items < sizeof hw_item / sizeof *hw_item - 1) { hw_item[hw_items++] = i; + } break; default: @@ -337,7 +339,7 @@ } } - if(!hw_items && is_short) hw_item[hw_items++] = 2000; /* all */ + if(!hw_items) hw_item[hw_items++] = 2000; /* all */ if(hw_items >= 0 || showconfig || saveconfig) { if(*log_file) { @@ -785,24 +787,53 @@ void help() { fprintf(stderr, - "Usage: hwinfo [options]\n" + "Usage: hwinfo [OPTIONS]\n" "Probe for hardware.\n" - " --short just a short listing\n" - " --log logfile write info to logfile\n" - " --debug level set debuglevel\n" - " --version show libhd version\n" - " --dump-db n dump hardware data base, 0: external, 1: internal\n" - " --hw_item probe for hw_item\n" - " hw_item is one of:\n" - " all, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard,\n" - " cpu, disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub,\n" - " ide, isapnp, isdn, joystick, keyboard, memory, modem, monitor, mouse,\n" - " netcard, network, partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer,\n" - " scanner, scsi, smp, sound, storage-ctrl, sys, tape, tv, usb, usb-ctrl,\n" - " vbe, wlan, zip\n" - "\n" - " Note: debug info is shown only in the log file. (If you specify a\n" - " log file the debug level is implicitly set to a reasonable value.)\n" + "Options:\n" + " --<HARDWARE_ITEM>\n" + " This option can be given more than once. Probe for a particular\n" + " HARDWARE_ITEM. Available hardware items are:\n" + " all, arch, bios, block, bluetooth, braille, bridge, camera,\n" + " cdrom, chipcard, cpu, disk, dsl, dvb, fingerprint, floppy,\n" + " framebuffer, gfxcard, hub, ide, isapnp, isdn, joystick, keyboard,\n" + " memory, modem, monitor, mouse, netcard, network, partition,\n" + " pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd,\n" + " reallyall, scanner, scsi, smp, sound, storage-ctrl, sys, tape,\n" + " tv, uml, usb, usb-ctrl, vbe, wlan, xen, zip\n" + " --short\n" + " Show only a summary. Use this option in addition to a hardware\n" + " probing option.\n" + " --listmd\n" + " Normally hwinfo does not report RAID devices. Add this option to\n" + " see them.\n" + " --only DEVNAME\n" + " This option can be given more than once. If you add this option,\n" + " only data about devices with DEVNAME will be shown.\n" + " --save-config SPEC\n" + " Store config for a particular device below /var/lib/hardware.\n" + " SPEC can be a device name, an UDI, or 'all'. This option must be\n" + " given in addition to a hardware probing option.\n" + " --show-config UDI\n" + " Show saved config data for a particular device.\n" + " --map\n" + " If disk names have changed (e.g. after a kernel update) this\n" + " prints a list of disk name mappings. Note that you must have\n" + " used --save-config at some point before for this can work.\n" + " --debug N\n" + " Set debug level to N. The debug info is shown only in the log\n" + " file. If you specify a log file, the debug level is implicitly\n" + " set to a reasonable value.\n" + " --verbose\n" + " Increase verbosity. Only together with --map.\n" + " --log FILE\n" + " Write log info to FILE.\n" + " --dump-db N\n" + " Dump hardware data base. N is either 0 for the external data\n" + " base in /var/lib/hardware, or 1 for the internal data base.\n" + " --version\n" + " Print libhd version.\n" + " --help\n" + " Print usage.\n" ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/README new/hwinfo-16.3/README --- old/hwinfo-16.2/README 2009-05-12 12:10:34.000000000 +0200 +++ new/hwinfo-16.3/README 2009-06-24 15:20:33.000000000 +0200 @@ -1,5 +1,15 @@ -1. Usage -======== +See hwinfo man page for general usage instructions. + +This document describes some legacy features and the "hwprobe" environment variable. + + +1. Legacy +========= + +*** Note: please do not do this, this is only kept to assist debugging. *** + +Legacy mode is activated when no option starting with "--" is given. In this case hwinfo +works as follows: hwinfo [debug=deb_flag] [log=log_file] [list[+]=hw_item] [[+|-]probe_option1] [[+|-]probe_option2] ... @@ -16,51 +26,35 @@ *** Please don't use "hwinfo >some_log 2>&1" to store the output into a log file! *** - hwinfo -all +ide - - probe for ide drives only + hwinfo -all +pci +int + - probe for pci devices - hwinfo +all -isapnp -floppy - - probe for everything *except* isapnp and floppies +Note that "int" should almost always be active. Some probing flags do not stand for complete modules but enable additional -features; e.g. "pci.range" or "cdrom.info". +features; e.g. "bios.vesa" or "block.cdrom". Example: - hwinfo -all +cdrom - gives a list of all cdrom's + hwinfo -all +block +int + gives a list of all block devs - hwinfo -all +cdrom.info + hwinfo -all +block.cdrom +int additionally reads the iso9660 info -To get a list of all supported probing flags, call 'hwinfo -all'. +The list of supported flags varies from version to version. To get a list of +the actual set of probing flags, call "hwinfo -all" and look at the top of +the log. -2. Environment variables/kernel cmdline parameters -================================================== +2. Environment variable/kernel cmdline parameter +================================================ You can control the hardware probing using the environment variable -"hwprobe" and the kernel cmdline parameters "hwprobe" & "x11". +"hwprobe" and the kernel cmdline parameter "hwprobe". If "hwprobe" is set on the kernel cmdline, the environment variable "hwprobe" is ignored. Otherwise, the meaning of both is exactly the same. - x11 - - Controls the X server/X version to prefer. It is either "3" or "4" or the - name of the X server/X server module to use (XF3: server name without - the leading "XF86_", XF4: the server module name). - - Examples: - x11=3 - o prefer XFree86 3.x over 4.x (if possible) - - x11=SVGA - o use the XF86_SVGA server (*** Even if the server does not - support the card! ***) - - x11=nv - o use the XF4 nv_drv.o driver (*** Even if the module does not - support the card! ***) - hwprobe - Controls which probing flags should *always* be set/cleared. (These settings *cannot* be overridden by command line switches.) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/src/Makefile new/hwinfo-16.3/src/Makefile --- old/hwinfo-16.2/src/Makefile 2009-06-08 17:22:49.000000000 +0200 +++ new/hwinfo-16.3/src/Makefile 2009-06-18 10:00:43.000000000 +0200 @@ -17,9 +17,9 @@ ifdef SHARED_FLAGS $(LIBHD_SO): $(LIBHD) - $(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ + $(CC) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ -Wl,-soname=$(LIBHD_SONAME) \ - -o $(LIBHD_SO) + -o $(LIBHD_SO) $(SO_LIBS) ln -snf $(LIBHD_NAME) $(LIBHD_SONAME) ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/VERSION new/hwinfo-16.3/VERSION --- old/hwinfo-16.2/VERSION 2009-06-15 11:31:45.000000000 +0200 +++ new/hwinfo-16.3/VERSION 2009-06-23 14:52:52.000000000 +0200 @@ -1 +1 @@ -16.2 +16.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org