Author: lslezak Date: Mon Jun 4 15:11:05 2007 New Revision: 38266 URL: http://svn.opensuse.org/viewcvs/yast?rev=38266&view=rev Log: - respect "fw_install" flag in DVB card DB (do not install the firmware if the card doesn't need it) - 2.15.5 Modified: trunk/tv/ (props changed) trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/ (props changed) trunk/tv/src/Tv.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=38266&r1=38265&r2=38266&view=diff ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Mon Jun 4 15:11:05 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=38266&r1=38265&r2=38266&view=diff ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Mon Jun 4 15:11:05 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jun 4 14:35:57 CEST 2007 - lslezak@suse.cz + +- tv card DB updated to kernel-default-2.6.21-12 +- respect "fw_install" flag in DVB card DB (do not install the + firmware if the card doesn't need it) +- 2.15.5 + +------------------------------------------------------------------- Mon Jun 4 10:51:02 CEST 2007 - lslezak@suse.cz - check whether lirc service and /etc/sysconfig/lirc are available Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=38266&r1=38265&r2=38266&view=diff ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Mon Jun 4 15:11:05 2007 @@ -1254,9 +1254,17 @@ // find card that requires the driver string cardname = "TV"; + // is the firmware really needed? + boolean firmware_needed = false; + foreach(map card, (list<map>) cards, { list<string> drvs = card["module"]:[]; + if (card["fw_install"]:true) + { + firmware_needed = true; + } + if (contains(drvs, drv)) { cardname = card["name"]:"TV"; @@ -1264,6 +1272,11 @@ } ); + if (firmware_needed) + { + y2milestone("Skipping firmware installation for driver '%1' (card '%2')", drv, cardname); + continue; + } list > fws = (list >)firmware_database[drv]:[]; @@ -1470,6 +1483,7 @@ list<map> detected = (list<map>)SCR::Read(.probe.tv); list<map> probe_dvb = (list<map>)SCR::Read(.probe.dvb); + if (probe_dvb != nil) { detected = (list<map>)merge(detected, probe_dvb); @@ -1925,6 +1939,7 @@ } list probe_tv = (list) SCR::Read(.probe.tv); + y2milestone(".probe.tv: %1", probe_tv); if (probe_tv == nil) { // Warning message popup (detection problem): @@ -1936,6 +1951,7 @@ // probe for DVB cards list<map> probe_dvb = (list<map>) SCR::Read(.probe.dvb); + y2milestone(".probe.dvb: %1", probe_dvb); if (probe_dvb == nil) { @@ -2417,6 +2433,8 @@ } ); + y2milestone("cards: %1", cards); + list > conf_list = maplist (map card, (list >) cards, ``{ map ret = $[]; boolean isdvb = card["dvb"]:false; @@ -2456,22 +2474,29 @@ { if (firmware_database != nil && size(firmware_database) > 0) { - foreach(string fwmod, list > fws, (map > >)firmware_database, { + if (card["fw_install"]:nil == false) + { + y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); + } + else + { + foreach(string fwmod, list > fws, (map > >)firmware_database, { - if (contains(card["module"]:[], fwmod)) - { - foreach(map fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; - boolean inst = IsFWInstalled(firmware_prefix + target); + if (contains(card["module"]:[], fwmod)) + { + foreach(map fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + boolean inst = IsFWInstalled(firmware_prefix + target); - descr = add(descr, _("Firmware: ") + - ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); - } - ); + descr = add(descr, _("Firmware: ") + + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); + } + ); + } } - } - ); + ); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org