Author: mzugec Date: Mon Apr 14 17:11:16 2008 New Revision: 46604 URL: http://svn.opensuse.org/viewcvs/yast?rev=46604&view=rev Log: install firmware for bcm4xx wireless (FaTE#302130) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/complex.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=46604&r1=... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Apr 14 17:11:16 2008 @@ -1 +1 @@ -2.16.36 +2.16.37 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Apr 14 17:11:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 14 17:09:59 CEST 2008 - mzugec@suse.cz + +- install firmware for bcm4xx wireless (FaTE#302130) +- 2.16.37 + +------------------------------------------------------------------- Mon Apr 14 14:56:03 CEST 2008 - kmachalkova@suse.cz - Unified button labels (FaTE #120373), esp. in installation clients Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=4... ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Mon Apr 14 17:11:16 2008 @@ -128,8 +128,9 @@ } } */ + string fw = ""; if (LanItems::needFirmwareCurrentItem()){ - string fw = LanItems::GetFirmwareForCurrentItem(); + fw = LanItems::GetFirmwareForCurrentItem(); if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from @@ -155,6 +156,16 @@ if(LanItems::Requires != [] && LanItems::Requires != nil) { if(PackagesInstall(LanItems::Requires) != `next) return false; + if (fw=="b43-fwcutter"){ + if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation it needs to execute install_bcm43xx_firmwar script. Should I execute it?"))){ + map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware"); + y2internal("command %1", command); +// Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log"); +// Popup::LongText(command["stdout"]:""); + if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occured during installation."), command["stderr"]:""); + else Popup::Message("bcm43xx_firmware installed successfully"); + } + } } /* TODO: Refresh hwinfo in LanItems Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?... ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Apr 14 17:11:16 2008 @@ -151,7 +151,7 @@ "ipw3945" : "ipw-firmware", "iwl3945" : "iwl3945-ucode", "iwl4965" : "iwl4965-ucode", - "bcm43xx" : "", + "bcm43xx" : "b43-fwcutter", "prism54" : "", "spectrum_cs" : "", "zd1201" : "", Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp... ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Mon Apr 14 17:11:16 2008 @@ -610,6 +610,8 @@ allcards = []; } +allcards=[$["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth1", "dev_names":["eth1"], "device":"79c970 [PCnet32 LANCE]", "device_id":73728, "driver":"bcm43xx", "driver_module":"bcm43xx", "drivers":[$["active":true, "modprobe":true, "modules":[["bcm43xx", ""]]]], "modalias":"pci:v00001022d00002000sv00001022sd00002000bc02sc00i00", "model":"AMD PCnet - Fast 79C971", "old_unique_key":"R3zE.g18wkxJX7ME", "resource":$["hwaddr":[$["addr":"08:00:27:80:b5:07"]], "io":[$["active":true, "length":32, "mode":"rw", "start":49248]], "irq":[$["count":0, "enabled":true, "irq":10]], "link":[$["state":true]], "mem":[$["active":true, "length":4096, "start":4034920448]]], "rev":"64", "slot_id":8, "sub_class_id":0, "sub_device":"PCnet - Fast 79C971", "sub_device_id":73728, "sub_vendor":"AMD", "sub_vendor_id":69666, "sysfs_bus_id":"0000:00:08.0", "sysfs_id":"/devices/pci0000:00/0000:00:08.0", "udi":"/org/freedesktop/Hal/devices/pci_1022_2000_0", "unique_key":"JNkJ.g18wkxJX7ME", "vendor":"AMD", "vendor_id":69666], $["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth0", "dev_names":["eth0"], "device":"79c970 [PCnet32 LANCE]", "device_id":73728, "driver":"pcnet32", "driver_module":"pcnet32", "drivers":[$["active":true, "modprobe":true, "modules":[["pcnet32", ""]]]], "modalias":"pci:v00001022d00002000sv00001022sd00002000bc02sc00i00", "model":"AMD PCnet - Fast 79C971", "old_unique_key":"Wkdv.g18wkxJX7ME", "resource":$["hwaddr":[$["addr":"08:00:27:b6:4a:d4"]], "io":[$["active":true, "length":32, "mode":"rw", "start":49184]], "irq":[$["count":2242394, "enabled":true, "irq":11]], "link":[$["state":true]], "mem":[$["active":true, "length":4096, "start":4026531840]]], "rev":"64", "slot_id":3, "sub_class_id":0, "sub_device":"PCnet - Fast 79C971", "sub_device_id":73728, "sub_vendor":"AMD", "sub_vendor_id":69666, "sysfs_bus_id":"0000:00:03.0", "sysfs_id":"/devices/pci0000:00/0000:00:03.0", "udi":"/org/freedesktop/Hal/devices/pci_1022_2000", "unique_key":"rBUF.g18wkxJX7ME", "vendor":"AMD", "vendor_id":69666]]; + // #97540 string bms = (string)SCR::Read (.etc.install_inf.BrokenModules); if (bms == nil) bms = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org