Author: mvidner Date: Mon Jul 16 14:38:16 2007 New Revision: 39435 URL: http://svn.opensuse.org/viewcvs/yast?rev=39435&view=rev Log: Added .probe.fingerprint (F301952). Modified: trunk/hardware-detection/VERSION trunk/hardware-detection/configure.in.in trunk/hardware-detection/package/yast2-hardware-detection.changes trunk/hardware-detection/src/HwProbe.cc trunk/hardware-detection/testsuite/tests/dir.out trunk/hardware-detection/yast2-hardware-detection.spec.in Modified: trunk/hardware-detection/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/VERSION?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/VERSION (original) +++ trunk/hardware-detection/VERSION Mon Jul 16 14:38:16 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/hardware-detection/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/configure.in.in?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/configure.in.in (original) +++ trunk/hardware-detection/configure.in.in Mon Jul 16 14:38:16 2007 @@ -43,6 +43,13 @@ AC_DEFINE([HAVE_HD_IS_XEN], 1) fi +AH_TEMPLATE([HAVE_HW_FINGERPRINT], [Define if hw_fingerprint exists]) +if test \ + \( "$HWINFO_VERSION_MAJOR" -eq 13 -a "$HWINFO_VERSION_MINOR" -ge 38 \) -o \ + "$HWINFO_VERSION_MAJOR" -ge 14; then + AC_DEFINE([HAVE_HW_FINGERPRINT], 1) +fi + PKG_CHECK_MODULES([HWINFO], [hwinfo]) ## and generate the output Modified: trunk/hardware-detection/package/yast2-hardware-detection.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/package/yast2-hardware-detection.changes?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/package/yast2-hardware-detection.changes (original) +++ trunk/hardware-detection/package/yast2-hardware-detection.changes Mon Jul 16 14:38:16 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 16 13:47:34 CEST 2007 - mvidner@suse.cz + +- Added .probe.fingerprint (F301952). +- Re-enabled test suite. +- 2.15.7 + +------------------------------------------------------------------- Thu Jun 14 10:50:10 CEST 2007 - mvidner@suse.cz - Disable WPA probing so that the WiFi connection is not interrupted Modified: trunk/hardware-detection/src/HwProbe.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/src/HwProbe.cc?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/src/HwProbe.cc (original) +++ trunk/hardware-detection/src/HwProbe.cc Mon Jul 16 14:38:16 2007 @@ -333,6 +333,11 @@ { "tape", ITEM(hw_tape), pr_null, 0}, { "bluetooth", ITEM(hw_bluetooth), pr_null, 0}, { "dsl", ITEM(hw_dsl), pr_null, 0}, +#ifdef HAVE_HW_FINGERPRINT + { "fingerprint", ITEM(hw_fingerprint), pr_null, 0}, +#else +#warning "Omitting hw_fingerprint" +#endif //not-yet-in-hwinfo { "vbe", ITEM(hw_vbe), pr_null, 0}, { 0, 0, pr_null, 0 } }; Modified: trunk/hardware-detection/testsuite/tests/dir.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/testsuite/tests/dir.out?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/testsuite/tests/dir.out (original) +++ trunk/hardware-detection/testsuite/tests/dir.out Mon Jul 16 14:38:16 2007 @@ -1 +1 @@ -(["has_pcmcia", "architecture", "boot_arch", "version", "boot_disk", "cdb_isdn", "has_smp", "bios_video", "is_uml", "framebuffer", "status", "uniqueid", "is_xen", "cdrom", "floppy", "disk", "netif", "display", "mouse", "keyboard", "sound", "isdn", "modem", "storage", "netcard", "monitor", "printer", "tv", "dvb", "scanner", "system", "camera", "chipcard", "usbctrl", "ieee1394ctrl", "hub", "scsi", "ide", "memory", "fbdev", "usb", "pci", "isapnp", "cpu", "braille", "joystick", "bios", "pppoe", "wlan", "redasd", "block", "tape", "bluetooth", "dsl"]) +(["has_pcmcia", "architecture", "boot_arch", "version", "boot_disk", "cdb_isdn", "has_smp", "bios_video", "is_uml", "framebuffer", "status", "uniqueid", "is_xen", "cdrom", "floppy", "disk", "netif", "display", "mouse", "keyboard", "sound", "isdn", "modem", "storage", "netcard", "monitor", "printer", "tv", "dvb", "scanner", "system", "camera", "chipcard", "usbctrl", "ieee1394ctrl", "hub", "scsi", "ide", "memory", "fbdev", "usb", "pci", "isapnp", "cpu", "braille", "joystick", "bios", "pppoe", "wlan", "redasd", "block", "tape", "bluetooth", "dsl", "fingerprint"]) Modified: trunk/hardware-detection/yast2-hardware-detection.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/yast2-hardware-detection.spec.in?rev=39435&r1=39434&r2=39435&view=diff ============================================================================== --- trunk/hardware-detection/yast2-hardware-detection.spec.in (original) +++ trunk/hardware-detection/yast2-hardware-detection.spec.in Mon Jul 16 14:38:16 2007 @@ -22,8 +22,8 @@ # we check for hwinfo BuildRequires: pkg-config Summary: - -# hwinfo-13.24: hd_is_xen -Requires: hwinfo >= 13.23 +# hwinfo-13.38: hw_fingerprint +Requires: hwinfo >= 13.38 %description - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org