June 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38268 - in /trunk/network/src: installation/inst_netprobe.ycp modules/Lan.ycp
by mzugec＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: mzugec Date: Mon Jun 4 15:32:04 2007 New Revision: 38268 URL: http://svn.opensuse.org/viewcvs/yast?rev=38268&view=rev Log: fix for build Modified: trunk/network/src/installation/inst_netprobe.ycp trunk/network/src/modules/Lan.ycp Modified: trunk/network/src/installation/inst_netprobe.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ne… ============================================================================== --- trunk/network/src/installation/inst_netprobe.ycp (original) +++ trunk/network/src/installation/inst_netprobe.ycp Mon Jun 4 15:32:04 2007 @@ -11,13 +11,13 @@ textdomain "network"; -import "Detection"; +import "NetHwDetection"; y2milestone("----------------------------------------"); y2milestone("Lan netprobe module started"); y2milestone("Args: %1", WFM::Args()); -if(!Detection::running) Detection::Start(); +if(!NetHwDetection::running) NetHwDetection::Start(); y2milestone("Lan netprobe module finished"); y2milestone("----------------------------------------"); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Jun 4 15:32:04 2007 @@ -1868,7 +1868,7 @@ { y2milestone ("hostname from dns"); // try to get hostname from the network - string hnent = Detection::ResolveIP(ipaddr); + string hnent = NetHwDetection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) if (hnent == "") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38267 - /tags/stable-2_15_5/tv/
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: lslezak Date: Mon Jun 4 15:11:49 2007 New Revision: 38267 URL: http://svn.opensuse.org/viewcvs/yast?rev=38267&view=rev Log: Created tag stable-2_15_5 for tv Added: tags/stable-2_15_5/tv/ - copied from r38266, trunk/tv/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38266 - in /trunk/tv: ./ VERSION package/yast2-tv.changes src/ src/Tv.ycp
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

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… ============================================================================== --- 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=… ============================================================================== --- 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(a)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(a)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… ============================================================================== --- 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<map<string,any> > fws = (list<map<string,any> >)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<map<string,any> > conf_list = maplist (map card, (list<map<string,any> >) cards, ``{ map<string,any> ret = $[]; boolean isdvb = card["dvb"]:false; @@ -2456,22 +2474,29 @@ { if (firmware_database != nil && size(firmware_database) > 0) { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + if (card["fw_install"]:nil == false) + { + y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); + } + else + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; - boolean inst = IsFWInstalled(firmware_prefix + target); + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38265 - in /trunk/core: agents-perl/ agents-perl/testsuite/ package/
by mvidner＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: mvidner Date: Mon Jun 4 14:40:40 2007 New Revision: 38265 URL: http://svn.opensuse.org/viewcvs/yast?rev=38265&view=rev Log: ag_background: added a test suite. Added: trunk/core/agents-perl/testsuite/ (with props) trunk/core/agents-perl/testsuite/Makefile.am trunk/core/agents-perl/testsuite/attacks.txt trunk/core/agents-perl/testsuite/t-double-status.exp (with props) trunk/core/agents-perl/testsuite/t-echo-sleep.exp (with props) trunk/core/agents-perl/testsuite/t-echo.exp (with props) trunk/core/agents-perl/testsuite/t-norun.exp (with props) trunk/core/agents-perl/testsuite/t-srcmgr1.exp (with props) trunk/core/agents-perl/testsuite/t-srcmgr2.exp (with props) trunk/core/agents-perl/testsuite/totest.txt Modified: trunk/core/agents-perl/Makefile.am trunk/core/agents-perl/ag_background (props changed) trunk/core/package/yast2-core.changes Modified: trunk/core/agents-perl/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/Makefile.am?rev… ============================================================================== --- trunk/core/agents-perl/Makefile.am (original) +++ trunk/core/agents-perl/Makefile.am Mon Jun 4 14:40:40 2007 @@ -2,7 +2,7 @@ # Makefile.am for core/agents-perl # -SUBDIRS = conf lib doc +SUBDIRS = conf lib doc testsuite agentdir = @execcompdir@/servers_non_y2 Added: trunk/core/agents-perl/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/Makef… ============================================================================== --- trunk/core/agents-perl/testsuite/Makefile.am (added) +++ trunk/core/agents-perl/testsuite/Makefile.am Mon Jun 4 14:40:40 2007 @@ -0,0 +1,9 @@ +TESTS = \ + t-norun.exp \ + t-echo.exp \ + t-echo-sleep.exp \ + t-double-status.exp \ + t-srcmgr1.exp \ + t-srcmgr2.exp + +XFAIL_TESTS = t-srcmgr1.exp Added: trunk/core/agents-perl/testsuite/attacks.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/attac… ============================================================================== --- trunk/core/agents-perl/testsuite/attacks.txt (added) +++ trunk/core/agents-perl/testsuite/attacks.txt Mon Jun 4 14:40:40 2007 @@ -0,0 +1,9 @@ +test it all on original agent and the new one + +1) possible bug: double assignment of exit status (on eof of both stdout and +stderr) + +2) +try also running more (unrelated) processes to check whether the values are +properly initialized, to simulate indepedent uses of the agent within a single +yast process Added: trunk/core/agents-perl/testsuite/t-double-status.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-dou… ============================================================================== --- trunk/core/agents-perl/testsuite/t-double-status.exp (added) +++ trunk/core/agents-perl/testsuite/t-double-status.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,74 @@ +#!/usr/bin/expect -- +# test ... + +set timeout 3 +expect_after { + default { + puts "OOPS, last matched <<$expect_out(buffer)>>" + exit 1 + } + # pass thru agent stderr +# -i $error_spawn_id +# default {send_user $expect_out(buffer)} +} + +#stty -echo + +#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" +set prog "../ag_background" +puts $prog + +# does not work +#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" + +# can pass -d +spawn $prog $argv + +match_max 100000 + +# TODO use a basic loop like in example and docs +# (while running, or while output open? clarify!) + +# sleep: have it still running while this simple test runs +send "`Execute(.run_output_err, \"echo O; echo O; sleep 1; echo OUT; echo >&2 ERR; exit 2\")\r" +expect "(true)$" + +while {1} { + send "`Read(.isrunning)\r" + expect { + "(true)$" {sleep 1} + "(false)$" break + } + +} + +send "`Read(.pid)\r" +expect "(-1)$" +#send_user "\n" + +send "`Read(.store)\r" +expect "(true)$" +send "`Read(.status)\r" +expect "(2)$" + +send "`Read(.lines)\r" +expect "(3)" +# bug in original agent +expect -re "(\"\")?$" +send "`Read(.lines_err)\r" +expect "(1)$" +send "`Read(.newlines)\r" +expect "(3)$" +send "`Read(.newlines_err)\r" +expect "(1)$" +send "`Read(.newout)\r" +expect -ex "\[\"O\",\"O\",\"OUT\",\] " +send "`Read(.newerr)\r" +expect -ex "\[\"ERR\",\] " + +send "`Read(.output_open)\r" +expect "(false)$" +send "`Read(.output_open_err)\r" +expect "(false)$" +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/t-echo-sleep.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-ech… ============================================================================== --- trunk/core/agents-perl/testsuite/t-echo-sleep.exp (added) +++ trunk/core/agents-perl/testsuite/t-echo-sleep.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,54 @@ +#!/usr/bin/expect -f +# test agent status before starting a process +set timeout 3 +expect_after { + default { + puts OOPS + exit 1 + } +} + +#stty -echo +spawn ../ag_background +match_max 100000 +expect -exact "" + +# TODO use a basic looplike in example and docs +# (while running, or while output open? clarify!) + +# sleep: have it still running while this simple test runs +send "`Execute(.run, \"echo Hello world; sleep 2\")\r" +expect "(true)" +sleep 1 + +send "`Read(.pid)\r" +expect -re "(\[0-9\]+)" +send_user "\n" + +send "`Read(.store)\r" +expect "(false)" +send "`Read(.isrunning)\r" +expect "(true)" +# still undefined? +send "`Read(.status)\r" +expect "(0)" +send "`Read(.lines)\r" +expect "(1)" +# bug in original agent +expect -re "(\"\")?$" +send "`Read(.lines_err)\r" +expect "(0)" +send "`Read(.newlines)\r" +expect "(1)" +send "`Read(.newlines_err)\r" +expect "(0)" +send "`Read(.newout)\r" +expect -ex "\[\] " +send "`Read(.newerr)\r" +expect -ex "\[\] " +send "`Read(.output_open)\r" +expect "(true)" +send "`Read(.output_open_err)\r" +expect "(true)" +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/t-echo.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-ech… ============================================================================== --- trunk/core/agents-perl/testsuite/t-echo.exp (added) +++ trunk/core/agents-perl/testsuite/t-echo.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,48 @@ +#!/usr/bin/expect -f +# test agent status before starting a process +set timeout 3 +expect_after { + default { + puts OOPS + exit 1 + } +} + +#stty -echo +spawn ../ag_background +match_max 100000 +expect -exact "" + +# sleep: have it still running while this simple test runs +send "`Execute(.run, \"sleep 2; echo Hello world\")\r" +expect "(true)" + +send "`Read(.pid)\r" +expect -re "(\[0-9\]+)" +send_user "\n" + +send "`Read(.store)\r" +expect "(false)" +send "`Read(.isrunning)\r" +expect "(true)" +# still undefined? +send "`Read(.status)\r" +expect "(0)" +send "`Read(.lines)\r" +expect "(0)" +send "`Read(.lines_err)\r" +expect "(0)" +send "`Read(.newlines)\r" +expect "(0)" +send "`Read(.newlines_err)\r" +expect "(0)" +send "`Read(.newout)\r" +expect -ex "\[\] " +send "`Read(.newerr)\r" +expect -ex "\[\] " +send "`Read(.output_open)\r" +expect "(true)" +send "`Read(.output_open_err)\r" +expect "(true)" +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/t-norun.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-nor… ============================================================================== --- trunk/core/agents-perl/testsuite/t-norun.exp (added) +++ trunk/core/agents-perl/testsuite/t-norun.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,43 @@ +#!/usr/bin/expect -f +# test agent status before starting a process +set timeout 3 +expect_after { + default { + puts OOPS + exit 1 + } +} + +#stty -echo +spawn ../ag_background +match_max 100000 +expect -exact "" + +send "`Read(.pid)\r" +expect "(-1)" +send_user "\n" + +send "`Read(.store)\r" +expect "(false)" +send "`Read(.isrunning)\r" +expect "(false)" +send "`Read(.status)\r" +expect "(0)" +send "`Read(.lines)\r" +expect "(0)" +send "`Read(.lines_err)\r" +expect "(0)" +send "`Read(.newlines)\r" +expect "(0)" +send "`Read(.newlines_err)\r" +expect "(0)" +send "`Read(.newout)\r" +expect -ex "\[\] " +send "`Read(.newerr)\r" +expect -ex "\[\] " +send "`Read(.output_open)\r" +expect "(false)" +send "`Read(.output_open_err)\r" +expect "(false)" +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/t-srcmgr1.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-src… ============================================================================== --- trunk/core/agents-perl/testsuite/t-srcmgr1.exp (added) +++ trunk/core/agents-perl/testsuite/t-srcmgr1.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,58 @@ +#!/usr/bin/expect -- +# test ... + +set timeout 3 +expect_after { + default { + puts "OOPS, last matched <<$expect_out(buffer)>>" + exit 1 + } + # pass thru agent stderr +# -i $error_spawn_id +# default {send_user $expect_out(buffer)} +} + +#stty -echo + +#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" +set prog "../ag_background" +#puts $prog + +# does not work +#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" + +# can pass -d +spawn $prog $argv + +match_max 100000 + +# TODO use a basic loop like in example and docs +# (while running, or while output open? clarify!) + +# sleep: have it still running while this simple test runs +#send "`Execute(.run_output_err, \"echo O; echo O; exec 1<&-; sleep 2; echo >&2 ERR; exit 113\")\r" +send "`Execute(.run_output_err, \"echo OUT; echo OUT; echo >&2 ERR; exec 1<&- 2<&-; sleep 2; exit 113\")\r" +expect "(true)$" + +while {1} { + send "`Read(.isrunning)\r" + expect { + "(true)$" {sleep 1} + "(false)$" break + } + +} + +send "`Read(.status)\r" +expect "(113)$" + +send "`Read(.newout)\r" +expect -ex "\[\"OUT\",\"OUT\",\] " +send "`Read(.newerr)\r" +expect -ex "\[\"ERR\",\] " + +send "`Execute(.kill, \"\")\r" +expect "(false)$" + +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/t-srcmgr2.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-src… ============================================================================== --- trunk/core/agents-perl/testsuite/t-srcmgr2.exp (added) +++ trunk/core/agents-perl/testsuite/t-srcmgr2.exp Mon Jun 4 14:40:40 2007 @@ -0,0 +1,57 @@ +#!/usr/bin/expect -- +# test ... + +set timeout 3 +expect_after { + default { + puts "OOPS, last matched <<$expect_out(buffer)>>" + exit 1 + } + # pass thru agent stderr +# -i $error_spawn_id +# default {send_user $expect_out(buffer)} +} + +#stty -echo + +#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" +set prog "../ag_background" +#puts $prog + +# does not work +#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" + +# can pass -d +spawn $prog $argv + +match_max 100000 + + +send "`Execute(.run_output_err, \"seq 100 199; seq 200 249 >&2; exec 1<&- 2<&-; sleep 2; exit 113\")\r" +expect "(true)$" + +send "`Write(.buffer_size, 10)\r"; +expect "(true)$" + +while {1} { + send "`Read(.isrunning)\r" + expect { + "(true)$" {sleep 1} + "(false)$" break + } + +} + +send "`Read(.status)\r" +expect "(113)$" + +send "`Read(.newlines)\r" +expect "(100)$" +send "`Read(.newlines_err)\r" +expect "(50)$" + +send "`Execute(.kill, \"\")\r" +expect "(false)$" + +send "`result(true)\r" +expect eof Added: trunk/core/agents-perl/testsuite/totest.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/totes… ============================================================================== --- trunk/core/agents-perl/testsuite/totest.txt (added) +++ trunk/core/agents-perl/testsuite/totest.txt Mon Jun 4 14:40:40 2007 @@ -0,0 +1,50 @@ +`Execute(.run, "cmd") +`Execute(.run_output, "cmd") +`Execute(.run_output_err, "cmd") + +`Execute(.kill) + +`Read(.pid) +`Read(.isrunning) +`Read(.status) +`Read(.lines) +`Read(.lines_err) +`Read(.newlines) +`Read(.newlines_err) +`Read(.store) +`Read(.newout) +`Read(.newerr) +`Read(.buffer_out) +`Read(.buffer_err) +`Read(.output_open) +`Read(.output_open_err) +`Read(.buffer_size) +`Read(.buffer_size_err) + +`Write(.buffer_size, num) +`Write(.buffer_size_err, num) +`Write(.stdin, "string") + +`result(true) + +-- +`Execute(.run, "sh -c 'exit 0'") +`Read(.pid) # expect positive number +sleep +`Read(.store) #no +`Read(.output_open) +`Read(.output_open_err) +`Read(.isrunning) # no +`Read(.status) +# empty output +# numbers +`Read(.lines) +`Read(.lines_err) +`Read(.newlines) +`Read(.newlines_err) +`Read(.newout) +`Read(.newerr) +# nonlines +`Read(.buffer_out) +`Read(.buffer_err) +`result(true) Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Jun 4 14:40:40 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 4 14:40:26 CEST 2007 - mvidner(a)suse.cz + +- ag_background: added a test suite. + +------------------------------------------------------------------- Thu May 24 11:56:41 CEST 2007 - stbinner(a)suse.de - add missing %run_ldconfig calls -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38264 - in /trunk/tv/data: CARDLIST.bttv CARDLIST.cx88 CARDLIST.saa7134
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: lslezak Date: Mon Jun 4 14:36:53 2007 New Revision: 38264 URL: http://svn.opensuse.org/viewcvs/yast?rev=38264&view=rev Log: - tv card DB updated to kernel-default-2.6.21-12 Modified: trunk/tv/data/CARDLIST.bttv trunk/tv/data/CARDLIST.cx88 trunk/tv/data/CARDLIST.saa7134 Modified: trunk/tv/data/CARDLIST.bttv URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.bttv?rev=38264&… ============================================================================== --- trunk/tv/data/CARDLIST.bttv (original) +++ trunk/tv/data/CARDLIST.bttv Mon Jun 4 14:36:53 2007 @@ -143,3 +143,5 @@ 142 -> Sabrent TV-FM (bttv version) 143 -> Hauppauge ImpactVCB (bt878) [0070:13eb] 144 -> MagicTV +145 -> SSAI Security Video Interface [4149:5353] +146 -> SSAI Ultrasound Video Interface [414a:5353] Modified: trunk/tv/data/CARDLIST.cx88 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.cx88?rev=38264&… ============================================================================== --- trunk/tv/data/CARDLIST.cx88 (original) +++ trunk/tv/data/CARDLIST.cx88 Mon Jun 4 14:36:53 2007 @@ -37,7 +37,7 @@ 36 -> AVerTV 303 (M126) [1461:000a] 37 -> Hauppauge Nova-S-Plus DVB-S [0070:9201,0070:9202] 38 -> Hauppauge Nova-SE2 DVB-S [0070:9200] - 39 -> KWorld DVB-S 100 [17de:08b2] + 39 -> KWorld DVB-S 100 [17de:08b2,1421:0341] 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid [0070:9400,0070:9402] 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802] 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025,1822:0019] Modified: trunk/tv/data/CARDLIST.saa7134 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.saa7134?rev=382… ============================================================================== --- trunk/tv/data/CARDLIST.saa7134 (original) +++ trunk/tv/data/CARDLIST.saa7134 Mon Jun 4 14:36:53 2007 @@ -52,8 +52,8 @@ 51 -> ProVideo PV952 [1540:9524] 52 -> AverMedia AverTV/305 [1461:2108] 53 -> ASUS TV-FM 7135 [1043:4845] - 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,1489:0214,5168:0304] - 55 -> LifeView FlyDVB-T DUO [5168:0306] + 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,5168:5214,1489:0214,5168:0304] + 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306] 56 -> Avermedia AVerTV 307 [1461:a70a] 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0351,1421:0370,1421:1370] @@ -76,7 +76,7 @@ 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] - 78 -> ASUSTeK P7131 Dual [1043:4862,1043:4876] + 78 -> ASUSTeK P7131 Dual [1043:4862,1043:4857] 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210] 81 -> Philips Tiger reference design [1131:2018] @@ -107,3 +107,10 @@ 106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344] 107 -> Encore ENLTV-FM [1131:230f] 108 -> Terratec Cinergy HT PCI [153b:1175] +109 -> Philips Tiger - S Reference design +110 -> Avermedia M102 [1461:f31e] +111 -> ASUS P7131 4871 [1043:4871] +112 -> ASUSTeK P7131 Hybrid [1043:4876] +113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6] +114 -> KWorld DVB-T 210 [17de:7250] +115 -> Sabrent PCMCIA TV-PCB05 [0919:2003] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38263 - /trunk/autoinstallation/src/modules/AutoinstLVM.ycp
by ug＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: ug Date: Mon Jun 4 14:30:05 2007 New Revision: 38263 URL: http://svn.opensuse.org/viewcvs/yast?rev=38263&view=rev Log: dropped useless code and fixed a typo Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Mon Jun 4 14:30:05 2007 @@ -111,7 +111,7 @@ map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["evms_group"]:"x","partitions"]:[], ``{ if( vg_p["create"]:true == false ) - keepLVM[p["lvm_group"]:"x"] = add( keepLVM[p["evms_group"]:"x"]:[], vg_p["lv_name"]:"" ); + keepEVMS[p["evms_group"]:"x"] = add( keepEVMS[p["evms_group"]:"x"]:[], vg_p["lv_name"]:"" ); }); } }); @@ -147,6 +147,7 @@ // Process data lvm = mapmap(string device, map disk, lvm, ``{ +/* foreach( string key, ["keep_lv"], ``{ list num = []; list<string> nlist = splitstring(disk[key]:"", ","); @@ -155,7 +156,6 @@ }); disk[key] = num; }); - list fsys = []; list<string> nlist = splitstring( disk["keep_lv_fsys"]:"" , "," ); foreach( string n, nlist, ``{ @@ -165,6 +165,7 @@ } }); disk["keep_lv_fsys"] = fsys; +*/ disk["pesize"] = pesize_str_to_byte(disk["pesize"]:"4M"); string vgname = substring(device, 5); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38262 - in /trunk/storage: package/yast2-storage.changes scripts/Makefile.am scripts/create_udev_cdrom_rules yast2-storage.spec.in
by fehr＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: fehr Date: Mon Jun 4 13:07:33 2007 New Revision: 38262 URL: http://svn.opensuse.org/viewcvs/yast?rev=38262&view=rev Log: - fix missing ldconfig call detect by RPMLINT - removed obsolete script create_udev_cdrom_rules Removed: trunk/storage/scripts/create_udev_cdrom_rules Modified: trunk/storage/package/yast2-storage.changes trunk/storage/scripts/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jun 4 13:07:33 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 4 13:06:28 CEST 2007 - fehr(a)suse.de + +- fix missing ldconfig call detect by RPMLINT +- removed obsolete script create_udev_cdrom_rules + +------------------------------------------------------------------- Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de - automatically increase GPT before creating partitions (#236404) Modified: trunk/storage/scripts/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/scripts/Makefile.am?rev=… ============================================================================== --- trunk/storage/scripts/Makefile.am (original) +++ trunk/storage/scripts/Makefile.am Mon Jun 4 13:07:33 2007 @@ -3,11 +3,6 @@ # ybin_SCRIPTS = \ - check.boot \ - create_udev_cdrom_rules + check.boot EXTRA_DIST = $(ybin_SCRIPTS) - -install-exec-am: - mkdir -p $(DESTDIR)/usr/sbin - ln -sf /usr/lib/YaST2/bin/create_udev_cdrom_rules $(DESTDIR)/usr/sbin Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Jun 4 13:07:33 2007 @@ -87,8 +87,6 @@ # scripts @ybindir@/check.boot -@ybindir@/create_udev_cdrom_rules -/usr/sbin/create_udev_cdrom_rules # perl bindings of libstorage %{perl_vendorarch}/LibStorage.so @@ -118,6 +116,9 @@ %defattr(-,root,root) %{_libdir}/liby2storage.so* +%post lib +/sbin/ldconfig + %package devel Requires: blocxx-devel libstdc++-devel Summary: - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38261 - in /trunk/fingerprint-reader: ./ agent-thinkfinger/ agent-thinkfinger/conf/ agent-thinkfinger/doc/ agent-thinkfinger/doc/autodocs/ agent-thinkfinger/src/ agent-thinkfinger/testsuite/ doc/ ...
by jsuchome＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: jsuchome Date: Mon Jun 4 11:14:59 2007 New Revision: 38261 URL: http://svn.opensuse.org/viewcvs/yast?rev=38261&view=rev Log: initial version of package Added: trunk/fingerprint-reader/ trunk/fingerprint-reader/MAINTAINER trunk/fingerprint-reader/Makefile.cvs trunk/fingerprint-reader/RPMNAME trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/agent-thinkfinger/ trunk/fingerprint-reader/agent-thinkfinger/Makefile.am trunk/fingerprint-reader/agent-thinkfinger/conf/ trunk/fingerprint-reader/agent-thinkfinger/conf/Makefile.am trunk/fingerprint-reader/agent-thinkfinger/conf/thinkfinger.scr trunk/fingerprint-reader/agent-thinkfinger/doc/ trunk/fingerprint-reader/agent-thinkfinger/doc/Makefile.am trunk/fingerprint-reader/agent-thinkfinger/doc/autodocs/ trunk/fingerprint-reader/agent-thinkfinger/doc/autodocs/Makefile.am trunk/fingerprint-reader/agent-thinkfinger/src/ trunk/fingerprint-reader/agent-thinkfinger/src/Makefile.am trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h trunk/fingerprint-reader/agent-thinkfinger/src/Y2CCThinkFingerAgent.cc trunk/fingerprint-reader/agent-thinkfinger/testsuite/ trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am trunk/fingerprint-reader/configure.in.in trunk/fingerprint-reader/doc/ trunk/fingerprint-reader/doc/Makefile.am trunk/fingerprint-reader/doc/autodocs/ trunk/fingerprint-reader/doc/autodocs/Makefile.am trunk/fingerprint-reader/package/ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/ trunk/fingerprint-reader/src/FingerprintReader.ycp (with props) trunk/fingerprint-reader/src/Makefile trunk/fingerprint-reader/src/Makefile.am trunk/fingerprint-reader/src/Makefile.in trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm trunk/fingerprint-reader/src/complex.ycp (with props) trunk/fingerprint-reader/src/dialogs.ycp (with props) trunk/fingerprint-reader/src/fingerprint-reader (with props) trunk/fingerprint-reader/src/fingerprint-reader.desktop trunk/fingerprint-reader/src/fingerprint-reader.ycp (with props) trunk/fingerprint-reader/src/helps.ycp (with props) trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (with props) trunk/fingerprint-reader/src/wizards.ycp (with props) trunk/fingerprint-reader/testsuite/ trunk/fingerprint-reader/testsuite/Makefile.am trunk/fingerprint-reader/testsuite/tests/ trunk/fingerprint-reader/testsuite/tests/FingerprintReader.err trunk/fingerprint-reader/testsuite/tests/FingerprintReader.out trunk/fingerprint-reader/testsuite/tests/FingerprintReader.ycp (with props) trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in Added: trunk/fingerprint-reader/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/MAINTAINER?re… ============================================================================== --- trunk/fingerprint-reader/MAINTAINER (added) +++ trunk/fingerprint-reader/MAINTAINER Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +Jiri Suchomel <jsuchome(a)suse.cz> Added: trunk/fingerprint-reader/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/Makefile.cvs?… ============================================================================== --- trunk/fingerprint-reader/Makefile.cvs (added) +++ trunk/fingerprint-reader/Makefile.cvs Mon Jun 4 11:14:59 2007 @@ -0,0 +1,18 @@ +# +# Makefile.cvs +# +configure: all + ./configure + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/fingerprint-reader/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/RPMNAME?rev=3… ============================================================================== --- trunk/fingerprint-reader/RPMNAME (added) +++ trunk/fingerprint-reader/RPMNAME Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +yast2-fingerprint-reader Added: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=3… ============================================================================== --- trunk/fingerprint-reader/VERSION (added) +++ trunk/fingerprint-reader/VERSION Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +2.15.0 Added: trunk/fingerprint-reader/agent-thinkfinger/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +SUBDIRS = conf doc src testsuite Added: trunk/fingerprint-reader/agent-thinkfinger/conf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/conf/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/conf/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,7 @@ +# +# Makefile.am for .../agent-thinkfinger/conf +# + +scrconf_DATA = thinkfinger.scr + +EXTRA_DIST = $(scrconf_DATA) Added: trunk/fingerprint-reader/agent-thinkfinger/conf/thinkfinger.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/conf/thinkfinger.scr (added) +++ trunk/fingerprint-reader/agent-thinkfinger/conf/thinkfinger.scr Mon Jun 4 11:14:59 2007 @@ -0,0 +1,16 @@ +/** + * File: thinkfinger.scr + * Summary: ThinkFinger agent + * Author: Jiri Suchomel <jsuchome(a)suse.cz> + * Access: read / write / execute + * + * Example: FIXME + * + * $Id$ + * + */ +.thinkfinger + +`ag_thinkfinger( + `ThinkFingerAgent() +) Added: trunk/fingerprint-reader/agent-thinkfinger/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/doc/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/doc/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +SUBDIRS = autodocs Added: trunk/fingerprint-reader/agent-thinkfinger/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/doc/autodocs/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/doc/autodocs/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,13 @@ +# +# Makefile.am for .../agent-thinkfinger/doc/autodocs +# + +htmldir = $(docdir)/autodocs + +html_DATA = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag +CLEANFILES = $(html_DATA) doxygen.log doxygen.conf installdox + +doxygen.css @RPMNAME@.tag: index.html + +index.html: $(srcdir)/../../src/*.h + @ybindir@/ydoxygen PROJECT_NAME=@RPMNAME@ Added: trunk/fingerprint-reader/agent-thinkfinger/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/src/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,24 @@ + +# Makefile.am for .../agent-thinkfinger/src +# + +AM_CXXFLAGS = -DY2LOG=\"agent-thinkfinger\" -Wall + +plugin_LTLIBRARIES = libpy2ag_thinkfinger.la +noinst_LTLIBRARIES = liby2ag_thinkfinger.la + +liby2ag_thinkfinger_la_SOURCES = \ + ThinkFingerAgent.cc \ + ThinkFingerAgent.h +liby2ag_thinkfinger_la_LDFLAGS = -version-info 2:0 +liby2ag_thinkfinger_la_LIBADD = @AGENT_LIBADD@ -lthinkfinger -L$(libdir) + + +libpy2ag_thinkfinger_la_SOURCES = \ + $(liby2ag_thinkfinger_la_SOURCES) \ + Y2CCThinkFingerAgent.cc +libpy2ag_thinkfinger_la_LDFLAGS = -version-info 2:0 +libpy2ag_thinkfinger_la_LIBADD = @AGENT_LIBADD@ -lthinkfinger -L$(libdir) + + +INCLUDES = -I$(includedir) Added: trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc (added) +++ trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc Mon Jun 4 11:14:59 2007 @@ -0,0 +1,361 @@ +/* ThinkFingerAgent.cc + * + * An agent for ThinkFinger library (access to fingerprint reader) + * + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +#include "ThinkFingerAgent.h" + +#define PC(n) (path->component_str(n)) + +/* +libthinkfinger_state global_state; // save the last state + +s_tfdata swipes; // save the nubmer of (un)succ. swipes globally +*/ + + +//FIXME remove unused parts... +typedef struct { + char bir[MAX_PATH]; + int swipe_success; + int swipe_failed; + ThinkFingerAgent *tfagent; +} s_tfdata; + +/** + * set the current status, for which YaST can query + */ +static void set_status (int swipe_success, int swiped_required, int swipe_failed) +{ + y2milestone ("Please swipe your finger (successful swipes %i/%i, failed swipes: %i)...", + swipe_success, swiped_required, swipe_failed); +} + + +//void ThinkFingerAgent::callback (libthinkfinger_state state, void *data) +static void callback (libthinkfinger_state state, void *data) +{ + s_tfdata *tfdata = (s_tfdata *) data; + switch (state) { + case TF_STATE_ACQUIRE_SUCCESS: + y2milestone (" done - success"); + break; + case TF_STATE_ACQUIRE_FAILED: + y2milestone (" failed"); + break; + case TF_STATE_ENROLL_SUCCESS: + set_status (tfdata->swipe_success, 3, tfdata->swipe_failed); + y2milestone (" done.\nStoring data (%s)...", tfdata->bir); + break; + case TF_STATE_SWIPE_FAILED: + y2milestone (" TF_STATE_SWIPE_FAILED"); + set_status (tfdata->swipe_success, 3, ++tfdata->swipe_failed); + break; + case TF_STATE_SWIPE_SUCCESS: + y2milestone (" TF_STATE_SWIPE_SUCCESS"); + set_status (++tfdata->swipe_success, 3, tfdata->swipe_failed); + break; + case TF_STATE_SWIPE_0: + y2milestone (" TF_STATE_SWIPE_0"); + set_status (tfdata->swipe_success, 3, tfdata->swipe_failed); + break; + default: + break; + } + /* + global_state = state; + swipes.swipe_failed = tfdata->swipe_failed; + swipes.swipe_success = tfdata->swipe_success; + */ + tfdata->tfagent->global_state = state; + tfdata->tfagent->swipe_success = tfdata->swipe_success; + tfdata->tfagent->swipe_failed = tfdata->swipe_failed; +} + +/** + * Constructor + */ +ThinkFingerAgent::ThinkFingerAgent() : SCRAgent() +{ + tf = NULL; + initialized = false; + global_state = TF_STATE_UNDEFINED; + swipe_success = 0; + swipe_failed = 0; +} + +/** + * Destructor + */ +ThinkFingerAgent::~ThinkFingerAgent() +{ +} + +/** + * Dir + */ +YCPList ThinkFingerAgent::Dir(const YCPPath& path) +{ + y2error("Wrong path '%s' in Dir().", path->toString().c_str()); + return YCPNull(); +} + + +/** + * Read + */ +YCPValue ThinkFingerAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) { + + y2debug("Path in Read(): %s", path->toString().c_str()); + YCPValue ret = YCPVoid(); + + if (!initialized) + { + y2error ("ThinkFinger not initialized yet!"); + return ret; + } + + if (path->length() == 0) { + ret = YCPString("0"); + } + else if (path->length() == 1) { + + if (PC(0) == "error") { + // return the last error message + ret = YCPString ("error_message"); + } + else if (PC(0) == "state") { + YCPMap retmap; + if (global_state != TF_STATE_UNDEFINED) + { + retmap->add (YCPString ("swipe_success"), YCPInteger (swipe_success)); + retmap->add (YCPString ("swipe_failed"), YCPInteger (swipe_failed)); + switch (global_state) { + case TF_STATE_ACQUIRE_SUCCESS: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_ACQUIRE_SUCCESS")); + break; + case TF_STATE_ACQUIRE_FAILED: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_ACQUIRE_FAILED")); + break; + case TF_STATE_ENROLL_SUCCESS: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_ENROLL_SUCCESS")); + break; + case TF_STATE_SWIPE_FAILED: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_SWIPE_FAILED")); + break; + case TF_STATE_SWIPE_SUCCESS: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_SWIPE_SUCCESS")); + break; + case TF_STATE_SWIPE_0: + retmap->add (YCPString ("state"), YCPString ("TF_STATE_SWIPE_0")); + break; + default: + break; + } + global_state = TF_STATE_UNDEFINED; + } + return retmap; + } + // wait for thread exit + else if (PC(0) == "exit_status" ) { + int *retval; + ret = YCPBoolean(false); + if ( pthread_join( pt, (void**)&retval ) == 0 ) + if ( *retval == 0 ) + ret = YCPBoolean(true); + libthinkfinger_free (tf); + } + else { + y2error ("Unknown path in Read(): %s", path->toString().c_str()); + } + } + else { + y2error ("Unknown path in Read(): %s", path->toString().c_str()); + } + return ret; +} + + +/** + * Write TODO finalize? + */ +YCPBoolean ThinkFingerAgent::Write(const YCPPath &path, const YCPValue& value, + const YCPValue& arg) +{ + y2debug("Path in Write(): %s", path->toString().c_str()); + YCPBoolean ret = YCPBoolean(false); + + if (!initialized) { + y2error ("ThinkFinger not initialized yet!"); + return ret; + } + + if (path->length() == 0) { + ret = YCPBoolean(true); + } + return ret; +} + +/** + * Execute(.thinkfinger) must be run first to initialize TODO? + */ +YCPValue ThinkFingerAgent::Execute(const YCPPath &path, const YCPValue& val, const YCPValue& arg) +{ + y2debug ("Path in Execute(): %s", path->toString().c_str()); + YCPValue ret = YCPBoolean(false); + + if (path->length() == 1) { + + if (PC(0) == "add-user") { + string username = ""; + if (!val.isNull()) + { + username = val->asString()->value(); + } + else + { + y2error ("username missing"); + return ret; + } +y2internal ("username is '%s'", username.c_str()); +// TODO check username length? +// TODO check if user exists? (should be done above...) + user = username; + +y2internal ("thinkfinger agent initialization..."); + libthinkfinger_init_status init_status; + tf = libthinkfinger_new (&init_status); + if (init_status != TF_INIT_SUCCESS) { + y2error ("init failed"); + return ret; + } +y2internal ("... succeeded"); + + initialized = true; + + /* + s_tfdata tfdata; + + tfdata.swipe_success = 0; + tfdata.swipe_failed = 0; +// tfdata.tfagent = this; + snprintf (tfdata.bir, MAX_PATH-1, "%s/%s%s", PAM_BIRDIR, username.c_str(), BIR_EXTENSION); +y2internal ("data file is '%s'", tfdata.bir); + + libthinkfinger_set_file (tf, tfdata.bir); + + if (libthinkfinger_set_file (tf, tfdata.bir) < 0) + { + y2error ("... set_file failed"); + libthinkfinger_free (tf); + return ret;//TODO free? + } + if (libthinkfinger_set_callback (tf, callback, &tfdata) < 0) + { + y2error ("... set_callback failed"); + libthinkfinger_free (tf); + return ret;//TODO free? + } + */ + if (pthread_create (&pt, NULL, (void*(*)(void*))&call_acquire, this) != 0) + { + y2error ("pthread_create failed"); +// libthinkfinger_free (tf); + } + else + ret = YCPBoolean (true); + + } + } + return ret; +} + +/** + * otherCommand + */ +YCPValue ThinkFingerAgent::otherCommand(const YCPTerm& term) +{ + string sym = term->name(); + + if (sym == "ThinkFingerAgent") { + + return YCPVoid(); + } + + return YCPNull(); +} + + +//void *ThinkFingerAgent::call_acquire (libthinkfinger *my_tf) +void *ThinkFingerAgent::call_acquire (ThinkFingerAgent *ag) +{ + static int retval; + + retval = -1; + + /* +y2internal ("thinkfinger agent initialization..."); + libthinkfinger_init_status init_status; + tf = libthinkfinger_new (&init_status); + if (init_status != TF_INIT_SUCCESS) { + y2error ("init failed"); + return ret; + } +y2internal ("... succeeded"); + + initialized = true; + + */ + s_tfdata tfdata; + + tfdata.swipe_success = 0; + tfdata.swipe_failed = 0; + tfdata.tfagent = ag; + snprintf (tfdata.bir, MAX_PATH-1, "%s/%s%s", PAM_BIRDIR, ag->user.c_str(), BIR_EXTENSION); +y2internal ("data file is '%s'", tfdata.bir); + +// libthinkfinger_set_file (ag->tf, tfdata.bir); + + if (libthinkfinger_set_file (ag->tf, tfdata.bir) < 0) + { + y2error ("... set_file failed"); +// libthinkfinger_free (ag->tf); + pthread_exit((void*)&retval); + } + if (libthinkfinger_set_callback (ag->tf, callback, &tfdata) < 0) + { + y2error ("... set_callback failed"); +// libthinkfinger_free (ag->tf); + pthread_exit((void*)&retval); + } + + +y2internal ("acquiring..."); + int tf_state = libthinkfinger_acquire (ag->tf); +y2internal ("acquire done"); + switch (tf_state) { + case TF_STATE_ACQUIRE_SUCCESS: + y2internal ("TF_STATE_ACQUIRE_SUCCESS!"); + retval = 0; + break; + case TF_STATE_ACQUIRE_FAILED: + y2error ("TF_STATE_ACQUIRE_FAILED"); + break; + case TF_STATE_USB_ERROR: + y2error ("Could not acquire fingerprint (USB error)."); + break; + case TF_RESULT_COMM_FAILED: + y2error ("Could not acquire fingerprint (communication with fingerprint reader failed)."); + break; + default: + y2error ("Undefined error occured (%i).", tf_state); + break; + } +// TODO it is possible that libthinkfinger_acquire ends without providing TF_STATE_ACQUIRE_SUCCESS/TF_STATE_ACQUIRE_FAILED + y2internal ("retval is %i", retval); + pthread_exit((void*)&retval); +} Added: trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h (added) +++ trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h Mon Jun 4 11:14:59 2007 @@ -0,0 +1,123 @@ +/* ThinkFingerAgent.h + * + * ThinkFinger agent implementation + * + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id: ThinkFingerAgent.h 26456 2005-12-07 16:11:23Z jsuchome $ + */ + +#ifndef _ThinkFingerAgent_h +#define _ThinkFingerAgent_h + +#include <Y2.h> +#include <scr/SCRAgent.h> + +using namespace std; + +#include <iostream> +#include <libthinkfinger.h> + +#include <string> +#include <vector> + +#include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <libintl.h> +#include <fstream> +#include <pthread.h> + +// for testing only... +//#define DEFAULT_BIR_PATH "/tmp/test.bir" +#define MAX_PATH 256 +// #define MODE_ACQUIRE 1 +#define BIR_EXTENSION ".bir" +#define PAM_BIRDIR "/etc/pam_thinkfinger" + +/** + * @short An interface class between YaST2 and ThinkFinger Agent + */ +class ThinkFingerAgent : public SCRAgent +{ +private: + + libthinkfinger *tf; + + pthread_t pt; + + string user; + /** + * Forbid any calls, when not initialized + */ + bool initialized; + + /* + libthinkfinger_state global_state; // save the last state + + s_tfdata swipes; // save the nubmer of (un)succ. swipes globally + */ + + /** + * Call ThinkFinger->Recover in the new thread + */ +// static void *call_recover (ThinkFingerAgent *); + + static void *call_acquire (ThinkFingerAgent *); + +// static void *call_acquire (libthinkfinger *my_tf); + +// void callback (libthinkfinger_state, void *); + +public: + /** + * Default constructor. + */ + ThinkFingerAgent(); + + /** + * Destructor. + */ + virtual ~ThinkFingerAgent(); + + /** + * Provides SCR Read (). + * @param path Path that should be read. + * @param arg Additional parameter. + */ + virtual YCPValue Read(const YCPPath &path, + const YCPValue& arg = YCPNull(), + const YCPValue& opt = YCPNull()); + + /** + * Provides SCR Write (). + */ + virtual YCPBoolean Write(const YCPPath &path, + const YCPValue& val, + const YCPValue& arg = YCPNull()); + + /** + * Provides SCR Execute (). + */ + virtual YCPValue Execute(const YCPPath &path, + const YCPValue& val = YCPNull(), + const YCPValue& arg = YCPNull()); + + /** + * Provides SCR Dir (). + */ + virtual YCPList Dir(const YCPPath& path); + + /** + * Used for mounting the agent. + */ + virtual YCPValue otherCommand(const YCPTerm& term); + + libthinkfinger_state global_state; // save the last state + + int swipe_success; + int swipe_failed; // FIXME use functions! +// s_tfdata swipes; // save the nubmer of (un)succ. swipes globally +}; + +#endif /* _ThinkFingerAgent_h */ Added: trunk/fingerprint-reader/agent-thinkfinger/src/Y2CCThinkFingerAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/Y2CCThinkFingerAgent.cc (added) +++ trunk/fingerprint-reader/agent-thinkfinger/src/Y2CCThinkFingerAgent.cc Mon Jun 4 11:14:59 2007 @@ -0,0 +1,15 @@ +/* Y2CCThinkFingerAgent.cc + * + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +#include <scr/Y2AgentComponent.h> +#include <scr/Y2CCAgentComponent.h> + +#include "ThinkFingerAgent.h" + +typedef Y2AgentComp <ThinkFingerAgent> Y2ThinkFingerAgentComp; + +Y2CCAgentComp <Y2ThinkFingerAgentComp> g_y2ccag_thinkfinger ("ag_thinkfinger"); Added: trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am (added) +++ trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,10 @@ +# +# Makefile.am for .../agent-thinkfinger/testsuite +# + +AUTOMAKE_OPTIONS = dejagnu + +clean-local: + rm -f tmp.err.* tmp.out.* site.exp site.bak + +EXTRA_DIST = README Added: trunk/fingerprint-reader/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/configure.in.… ============================================================================== --- trunk/fingerprint-reader/configure.in.in (added) +++ trunk/fingerprint-reader/configure.in.in Mon Jun 4 11:14:59 2007 @@ -0,0 +1,14 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ +@YAST2-INIT-PROGRAM@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ +@YAST2-CHECKS-PROGRAM@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/fingerprint-reader/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/doc/Makefile.… ============================================================================== --- trunk/fingerprint-reader/doc/Makefile.am (added) +++ trunk/fingerprint-reader/doc/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,10 @@ +# Makefile.am for fingerprint-reader/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/fingerprint-reader/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/doc/autodocs/… ============================================================================== --- trunk/fingerprint-reader/doc/autodocs/Makefile.am (added) +++ trunk/fingerprint-reader/doc/autodocs/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,3 @@ +# Makefile.am for fingerprint-reader/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (added) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Jun 4 11:14:59 2007 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Mar 2 09:31:47 2007 - jsuchome(a)suse.cz + +- initial version Added: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/Fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (added) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,288 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/FingerprintReader.ycp + * Package: Configuration of fingerprint-reader + * Summary: FingerprintReader settings, input and output functions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Representation of the configuration of fingerprint-reader. + * Input and output routines. + */ + +{ + +module "FingerprintReader"; +textdomain "fingerprint-reader"; + +import "Progress"; +import "Report"; +import "Summary"; +import "Message"; + +/** + * Prototypes + */ +global boolean Modified(); + +/** + * Data was modified? + */ +global boolean modified = false; + +/** + */ +global boolean proposal_valid = false; + +/** + * Write only, used during autoinstallation. + * Don't run services and SuSEconfig, it's all done at one place. + */ +global boolean write_only = false; + +/** + * Abort function + * return boolean return true if abort + */ +global boolean() AbortFunction = Modified; + +/** + * Abort function + * @return boolean return true if abort + */ +global define boolean Abort() ``{ + if(AbortFunction != nil) + { + return AbortFunction () == true; + } + return false; +} + +/** + * Data was modified? + * @return true if modified + */ +global boolean Modified() { + y2debug("modified=%1",modified); + return modified; +} + +// Settings: Define all variables needed for configuration of fingerprint-reader +// TODO FIXME: Define all the variables necessary to hold +// TODO FIXME: the configuration here (with the appropriate +// TODO FIXME: description) +// TODO FIXME: For example: +// /** +// * List of the configured cards. +// */ +// list cards = []; +// +// /** +// * Some additional parameter needed for the configuration. +// */ +// boolean additional_parameter = true; + +/** + * Read all fingerprint-reader settings + * @return true on success + */ +global boolean Read() { + + /* FingerprintReader read dialog caption */ + string caption = _("Initializing fingerprint-reader Configuration"); + + // TODO FIXME Set the right number of stages + integer steps = 4; + + integer sl = 500; + sleep(sl); + + // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside + Progress::New( caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Read the database"), + /* Progress stage 2/3 */ + _("Read the previous settings"), + /* Progress stage 3/3 */ + _("Detect the devices") + ], [ + /* Progress step 1/3 */ + _("Reading the database..."), + /* Progress step 2/3 */ + _("Reading the previous settings..."), + /* Progress step 3/3 */ + _("Detecting the devices..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + // read database + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error(_("Cannot read database1.")); + sleep(sl); + + // read another database + if(Abort()) return false; + Progress::NextStep(); + /* Error message */ + if(false) Report::Error(_("Cannot read database2.")); + sleep(sl); + + // read current settings + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error(Message::CannotReadCurrentSettings()); + sleep(sl); + + // detect devices + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Warning(_("Cannot detect devices.")); + sleep(sl); + + if(Abort()) return false; + /* Progress finished */ + Progress::NextStage(); + sleep(sl); + + if(Abort()) return false; + modified = false; + return true; +} + +/** + * Write all fingerprint-reader settings + * @return true on success + */ +global boolean Write() { + + /* FingerprintReader read dialog caption */ + string caption = _("Saving fingerprint-reader Configuration"); + + // TODO FIXME And set the right number of stages + integer steps = 2; + + integer sl = 500; + sleep(sl); + + // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside + Progress::New(caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Run SuSEconfig") + ], [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Running SuSEconfig..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + // write settings + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error (_("Cannot write settings.")); + sleep(sl); + + // run SuSEconfig + if(Abort()) return false; + Progress::NextStage (); + /* Error message */ + if(false) Report::Error (Message::SuSEConfigFailed()); + sleep(sl); + + if(Abort()) return false; + /* Progress finished */ + Progress::NextStage(); + sleep(sl); + + if(Abort()) return false; + return true; +} + +/** + * Get all fingerprint-reader settings from the first parameter + * (For use by autoinstallation.) + * @param settings The YCP structure to be imported. + * @return boolean True on success + */ +global boolean Import (map settings) { + // TODO FIXME: your code here (fill the above mentioned variables)... + return true; +} + +/** + * Dump the fingerprint-reader settings to a single map + * (For use by autoinstallation.) + * @return map Dumped settings (later acceptable by Import ()) + */ +global map Export () { + // TODO FIXME: your code here (return the above mentioned variables)... + return $[]; +} + +/** + * Create a textual summary and a list of unconfigured cards + * @return summary of the current configuration + */ +global list Summary() { + // TODO FIXME: your code here... + /* Configuration summary text for autoyast */ + return [ _("Configuration summary..."), [] ]; +} + +/** + * Create an overview table with all configured cards + * @return table items + */ +global list Overview() { + // TODO FIXME: your code here... + return []; +} + +/** + * Return packages needed to be installed and removed during + * Autoinstallation to insure module has all needed software + * installed. + * @return map with 2 lists. + */ +global map AutoPackages() { + // TODO FIXME: your code here... + return $[ "install":[], "remove":[] ]; +} + +/* EOF */ +} Added: trunk/fingerprint-reader/src/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/Makefile?… ============================================================================== --- trunk/fingerprint-reader/src/Makefile (added) +++ trunk/fingerprint-reader/src/Makefile Mon Jun 4 11:14:59 2007 @@ -0,0 +1,546 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# src/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# Makefile.am for fingerprint-reader/src + +# Makefile.am.common -*- Makefile -*- +# Generated file, do not edit! + +srcdir = . +top_srcdir = .. + +pkgdatadir = $(datadir)/yast2-fingerprint-reader +pkglibdir = $(libdir)/yast2-fingerprint-reader +pkgincludedir = $(includedir)/yast2-fingerprint-reader +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c -p +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-suse-linux-gnu +host_triplet = i686-suse-linux-gnu +target_triplet = i686-suse-linux-gnu +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.am.common +subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ + "$(DESTDIR)$(yncludedir)" +clientDATA_INSTALL = $(INSTALL_DATA) +desktopDATA_INSTALL = $(INSTALL_DATA) +moduleDATA_INSTALL = $(INSTALL_DATA) +modulebinDATA_INSTALL = $(INSTALL_DATA) +yncludeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \ + $(ynclude_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run aclocal-1.9 +AGENT_LIBADD = -L$(libdir) -lscr +ALLOCA = +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run autoconf +AUTOHEADER = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run autoheader +AUTOMAKE = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -Wall -Wformat -Wmissing-prototypes +CPP = gcc -E +CPPFLAGS = +CREATE_PKGCONFIG_FALSE = +CREATE_PKGCONFIG_NOARCH_FALSE = +CREATE_PKGCONFIG_NOARCH_TRUE = # +CREATE_PKGCONFIG_TRUE = # +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 -Wall -Wformat +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = /usr/bin/grep -E +EXEEXT = +F77 = +FFLAGS = +GREP = /usr/bin/grep +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAINTAINER = Jiri Suchomel <jsuchome(a)suse.cz> +MAKEINFO = ${SHELL} /home/jsuchome/yast/source/fingerprint-reader/missing --run makeinfo +OBJEXT = o +PACKAGE = yast2-fingerprint-reader +PACKAGE_BUGREPORT = http://bugs.opensuse.org/ +PACKAGE_NAME = yast2-fingerprint-reader +PACKAGE_STRING = yast2-fingerprint-reader 2.13.0 +PACKAGE_TARNAME = yast2-fingerprint-reader +PACKAGE_VERSION = 2.13.0 +PATH_SEPARATOR = : +PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/opt/gnome/share/pkgconfig +RANLIB = ranlib +RPMNAME = yast2-fingerprint-reader +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css +STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl +STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl +STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl +STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl +VERSION = 2.13.0 +XGETTEXT = /usr/bin/xgettext +Y2DEVTOOLS_PREFIX = /usr +YCPC = /usr/bin/ycpc +YCPDOC = /usr/lib/YaST2/bin/ycpdoc +YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep +YDOXYGEN = /usr/lib/YaST2/bin/ydoxygen +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = +agentdir = ${prefix}/lib/YaST2/servers_non_y2 +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - +bindir = ${exec_prefix}/bin +build = i686-suse-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = suse +clientdir = ${prefix}/share/YaST2/clients +datadir = ${datarootdir} +datarootdir = ${prefix}/share +desktopdir = ${prefix}/share/applications/YaST2 +docdir = ${prefix}/share/doc/packages/yast2-fingerprint-reader +dvidir = ${docdir} +exec_prefix = ${prefix} +execcompdir = ${prefix}/lib/YaST2 +fillupdir = /var/adm/fillup-templates +host = i686-suse-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = suse +htmldir = ${docdir} +imagedir = ${prefix}/share/YaST2/images +includedir = ${prefix}/include/YaST2 +infodir = ${datarootdir}/info +install_sh = /home/jsuchome/yast/source/fingerprint-reader/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${prefix}/share/YaST2/locale +localstatedir = ${prefix}/var +mandir = ${prefix}/share/man +mkdir_p = mkdir -p -- +moduledir = ${prefix}/share/YaST2/modules +oldincludedir = /usr/include +pdfdir = ${docdir} +pkgconfigdatadir = ${datadir}/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig +plugindir = ${libdir}/YaST2/plugin +potdir = ${docdir}/pot +prefix = /usr +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +schemadir = ${prefix}/share/YaST2/schema +scrconfdir = ${prefix}/share/YaST2/scrconf +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target = i686-suse-linux-gnu +target_alias = +target_cpu = i686 +target_os = linux-gnu +target_vendor = suse +themedir = ${prefix}/share/YaST2/theme +yast2dir = ${prefix}/share/YaST2 +ybindir = ${prefix}/lib/YaST2/bin +ydatadir = ${prefix}/share/YaST2/data +yncludedir = ${prefix}/share/YaST2/include/fingerprint-reader +ystartupdir = ${prefix}/lib/YaST2 +client_DATA = \ + fingerprint-reader.ycp \ + users_plugin_fingerprint_reader.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + fingerprint-reader.desktop + +module_DATA = \ + FingerprintReader.ycp \ + UsersPluginFingerprintReader.pm + +ycpchook = fingerprint-reader +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) +modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) +modulebindir = $(moduledir) +ybcfiles = $(filter %.ybc,$(modulebin_DATA)) + +# files to clean +CLEANFILES = ${ybcfiles} +DISTCLEANFILES = .dep + +# Needs to be outside "." because of cases +# where ycpchook contains a symlink to "." +# Otherwise "." keeps being newer than .dep and we loop. +NEWDEP = ${top_builddir}/.dep.new +CHECK_SYNTAX = true +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-clientDATA: $(client_DATA) + @$(NORMAL_INSTALL) + test -z "$(clientdir)" || $(mkdir_p) "$(DESTDIR)$(clientdir)" + @list='$(client_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(clientDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(clientdir)/$$f'"; \ + $(clientDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(clientdir)/$$f"; \ + done + +uninstall-clientDATA: + @$(NORMAL_UNINSTALL) + @list='$(client_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(clientdir)/$$f'"; \ + rm -f "$(DESTDIR)$(clientdir)/$$f"; \ + done +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ + $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ + rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ + done +install-moduleDATA: $(module_DATA) + @$(NORMAL_INSTALL) + test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + @list='$(module_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(moduleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(moduleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + done + +uninstall-moduleDATA: + @$(NORMAL_UNINSTALL) + @list='$(module_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ + rm -f "$(DESTDIR)$(moduledir)/$$f"; \ + done +install-modulebinDATA: $(modulebin_DATA) + @$(NORMAL_INSTALL) + test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)" + @list='$(modulebin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(modulebinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(modulebindir)/$$f'"; \ + $(modulebinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(modulebindir)/$$f"; \ + done + +uninstall-modulebinDATA: + @$(NORMAL_UNINSTALL) + @list='$(modulebin_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \ + rm -f "$(DESTDIR)$(modulebindir)/$$f"; \ + done +install-yncludeDATA: $(ynclude_DATA) + @$(NORMAL_INSTALL) + test -z "$(yncludedir)" || $(mkdir_p) "$(DESTDIR)$(yncludedir)" + @list='$(ynclude_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(yncludeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(yncludedir)/$$f'"; \ + $(yncludeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(yncludedir)/$$f"; \ + done + +uninstall-yncludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(ynclude_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(yncludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(yncludedir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/.. + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-clientDATA install-desktopDATA \ + install-moduleDATA install-modulebinDATA install-yncludeDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ + uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \ + uninstall-yncludeDATA + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + dist-hook distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-clientDATA install-data install-data-am \ + install-desktopDATA install-exec install-exec-am install-info \ + install-info-am install-man install-moduleDATA \ + install-modulebinDATA install-strip install-yncludeDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \ + uninstall-moduleDATA uninstall-modulebinDATA \ + uninstall-yncludeDATA + + +# create a symlink for local build, #145327 +fingerprint-reader: + ln -sf . $@ + +# suffix mapping: info '(make)Static Usage' +# apply only to our modules, not external ones +${ybcfiles}: %.ybc: %.ycp $(ycpchook) + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< +# generate dependencies +# two steps not to lose the file if the command fails +# hook: create the links before we look for files +.dep: $(wildcard *.ycp) ${ycpchook} + ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} + cat ${NEWDEP} > .dep + rm ${NEWDEP} + +dist-hook: check-syntax +check-syntax: $(client_DATA) $(ycpchook) + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi + +-include .dep +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/fingerprint-reader/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/Makefile.… ============================================================================== --- trunk/fingerprint-reader/src/Makefile.am (added) +++ trunk/fingerprint-reader/src/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,29 @@ +# Makefile.am for fingerprint-reader/src + +yncludedir = @yncludedir@/fingerprint-reader + +client_DATA = \ + fingerprint-reader.ycp \ + users_plugin_fingerprint_reader.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + fingerprint-reader.desktop + +module_DATA = \ + FingerprintReader.ycp \ + UsersPluginFingerprintReader.pm + +# create a symlink for local build, #145327 +fingerprint-reader: + ln -sf . $@ +ycpchook = fingerprint-reader + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/fingerprint-reader/src/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/Makefile.… ============================================================================== --- trunk/fingerprint-reader/src/Makefile.in (added) +++ trunk/fingerprint-reader/src/Makefile.in Mon Jun 4 11:14:59 2007 @@ -0,0 +1,546 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Makefile.am for fingerprint-reader/src + +# Makefile.am.common -*- Makefile -*- +# Generated file, do not edit! + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.am.common +subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ + "$(DESTDIR)$(yncludedir)" +clientDATA_INSTALL = $(INSTALL_DATA) +desktopDATA_INSTALL = $(INSTALL_DATA) +moduleDATA_INSTALL = $(INSTALL_DATA) +modulebinDATA_INSTALL = $(INSTALL_DATA) +yncludeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \ + $(ynclude_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AGENT_LIBADD = @AGENT_LIBADD@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ +CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ +CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ +CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +YDOXYGEN = @YDOXYGEN@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +agentdir = @agentdir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@/fingerprint-reader +ystartupdir = @ystartupdir@ +client_DATA = \ + fingerprint-reader.ycp \ + users_plugin_fingerprint_reader.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + fingerprint-reader.desktop + +module_DATA = \ + FingerprintReader.ycp \ + UsersPluginFingerprintReader.pm + +ycpchook = fingerprint-reader +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) +modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) +modulebindir = $(moduledir) +ybcfiles = $(filter %.ybc,$(modulebin_DATA)) + +# files to clean +CLEANFILES = ${ybcfiles} +DISTCLEANFILES = .dep + +# Needs to be outside "." because of cases +# where ycpchook contains a symlink to "." +# Otherwise "." keeps being newer than .dep and we loop. +NEWDEP = ${top_builddir}/.dep.new +CHECK_SYNTAX = true +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-clientDATA: $(client_DATA) + @$(NORMAL_INSTALL) + test -z "$(clientdir)" || $(mkdir_p) "$(DESTDIR)$(clientdir)" + @list='$(client_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(clientDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(clientdir)/$$f'"; \ + $(clientDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(clientdir)/$$f"; \ + done + +uninstall-clientDATA: + @$(NORMAL_UNINSTALL) + @list='$(client_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(clientdir)/$$f'"; \ + rm -f "$(DESTDIR)$(clientdir)/$$f"; \ + done +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ + $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ + rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ + done +install-moduleDATA: $(module_DATA) + @$(NORMAL_INSTALL) + test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + @list='$(module_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(moduleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(moduleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + done + +uninstall-moduleDATA: + @$(NORMAL_UNINSTALL) + @list='$(module_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ + rm -f "$(DESTDIR)$(moduledir)/$$f"; \ + done +install-modulebinDATA: $(modulebin_DATA) + @$(NORMAL_INSTALL) + test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)" + @list='$(modulebin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(modulebinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(modulebindir)/$$f'"; \ + $(modulebinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(modulebindir)/$$f"; \ + done + +uninstall-modulebinDATA: + @$(NORMAL_UNINSTALL) + @list='$(modulebin_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \ + rm -f "$(DESTDIR)$(modulebindir)/$$f"; \ + done +install-yncludeDATA: $(ynclude_DATA) + @$(NORMAL_INSTALL) + test -z "$(yncludedir)" || $(mkdir_p) "$(DESTDIR)$(yncludedir)" + @list='$(ynclude_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(yncludeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(yncludedir)/$$f'"; \ + $(yncludeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(yncludedir)/$$f"; \ + done + +uninstall-yncludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(ynclude_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(yncludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(yncludedir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/.. + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-clientDATA install-desktopDATA \ + install-moduleDATA install-modulebinDATA install-yncludeDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ + uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \ + uninstall-yncludeDATA + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + dist-hook distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-clientDATA install-data install-data-am \ + install-desktopDATA install-exec install-exec-am install-info \ + install-info-am install-man install-moduleDATA \ + install-modulebinDATA install-strip install-yncludeDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \ + uninstall-moduleDATA uninstall-modulebinDATA \ + uninstall-yncludeDATA + + +# create a symlink for local build, #145327 +fingerprint-reader: + ln -sf . $@ + +# suffix mapping: info '(make)Static Usage' +# apply only to our modules, not external ones +${ybcfiles}: %.ybc: %.ycp $(ycpchook) + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< +# generate dependencies +# two steps not to lose the file if the command fails +# hook: create the links before we look for files +.dep: $(wildcard *.ycp) ${ycpchook} + ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} + cat ${NEWDEP} > .dep + rm ${NEWDEP} + +dist-hook: check-syntax +check-syntax: $(client_DATA) $(ycpchook) + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi + +-include .dep +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/UsersPlug… ============================================================================== --- trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm (added) +++ trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm Mon Jun 4 11:14:59 2007 @@ -0,0 +1,214 @@ +#! /usr/bin/perl -w +# +# This is the API part of UsersPluginFingerprintReader plugin - +# configuration of user's fingerprints on specific device +# + +package UsersPluginFingerprintReader; + +use strict; + +use YaST::YCP qw(:LOGGING); +use YaPI; +use Data::Dumper; + +textdomain("users"); + +our %TYPEINFO; + +##-------------------------------------- +##--------------------- global imports + +YaST::YCP::Import ("SCR"); + +##-------------------------------------- +##--------------------- global variables + +# error message, returned when some plugin function fails +my $error = ""; + +##-------------------------------------- + +# All functions have 2 "any" parameters: this will probably mean +# 1st: configuration map (hash) - e.g. saying if we work with user +# 2nd: data map (hash) of user to work with + +# in 'config' map there is a info of this type: +# "what" => "user" / "group" +# "modified" => "added"/"edited"/"deleted" +# "enabled" => 1/ key not present +# "disabled" => 1/ key not present +# "plugins_to_remove" => list of plugins which has to be removed + +# 'data' map contains the atrtributes of the user. It could also contain +# some keys, which Users module uses internaly (like 'groupname' for name of +# user's default group). Just ignore these values + +# -- Warning messages -- +# There is a special way, when you want to give user additional information +# (warning) about some issues appeared during the function. +# +# These keys can be saved by plugin to the result structure of AddBefore, +# Add, EditBefore, Edit, Enable, Disable calls: +# "warning_message" => STRING +# Translated message that should be shown to user (probably as a popup) +# "warning_message_ID" => STRING +# The ID of the message (optional). +# +# This key can be present in user $data hash: +# "confirmed_warnings" => HASH (in the form { message_ID_1 => 1 }) +# (This has sense only if plugin uses optional "warning_message_ID" key) +# Indicates which messages were already shown to this user. +# Plugin function may check for existence of the message_ID_1 in this +# hash before generating "warning_message", to realize if this message +# was alredy shown before (in the same situation). +# See example in AddBefore function. + +##------------------------------------ + +# helper, check if Fingerprint Reader was already configured +sub fingerprint_reader_configured { + + #FIXME do a pam-config query + return YaST::YCP::Boolean (1); +} + +# return names of provided functions +BEGIN { $TYPEINFO{Interface} = ["function", ["list", "string"], "any", "any"];} +sub Interface { + + my $self = shift; + my @interface = ( + "GUIClient", + "Check", + "Name", + "Summary", + "Restriction", + "Interface", + "PluginPresent", + "PluginRemovable", + "Error", + "AddBefore", + "EditBefore", + ); + return \@interface; +} + +# return error message, generated by plugin +BEGIN { $TYPEINFO{Error} = ["function", "string", "any", "any"];} +sub Error { + + my $self = shift; + return $error; +} + + +# return plugin name, used for GUI (translated) +BEGIN { $TYPEINFO{Name} = ["function", "string", "any", "any"];} +sub Name { + + my $self = shift; + # plugin name + return __("Fingerprint configuration"); +} + +##------------------------------------ +# return plugin summary (to be shown in table with all plugins) +BEGIN { $TYPEINFO{Summary} = ["function", "string", "any", "any"];} +sub Summary { + + my $self = shift; + # plugin summary (table item) + my $ret = __("Set the fingerprint of an User"); + return $ret; +} + +##------------------------------------ +# checks the current data map of user (2nd parameter) and returns +# true if given user has our plugin +BEGIN { $TYPEINFO{PluginPresent} = ["function", "boolean", "any", "any"];} +sub PluginPresent { + + my $self = shift; + + # it is present every time it is available + return fingerprint_reader_configured (); +} + +##------------------------------------ +# Is it possible to remove this plugin from user? +BEGIN { $TYPEINFO{PluginRemovable} = ["function", "boolean", "any", "any"];} +sub PluginRemovable { + # doesn't have sense to remove + return YaST::YCP::Boolean (0); +} + + +##------------------------------------ +# return name of YCP client defining YCP GUI +BEGIN { $TYPEINFO{GUIClient} = ["function", "string", "any", "any"];} +sub GUIClient { + + my $self = shift; + return "users_plugin_fingerprint_reader"; +} + +##------------------------------------ +# Type of objects this plugin is restricted to. +# It defines: +# 1. type of objects which it should be applied to (ldap/nis/local/system) +# 2. type of objects at all (user) +# If this function doesn't exist, plugin is applied for all users of all types +BEGIN { $TYPEINFO{Restriction} = ["function", + ["map", "string", "any"], "any", "any"];} +sub Restriction { + + my $self = shift; + return { + "local" => 1, + "system" => 1, +# "ldap" => 1, #only for local ldap users? + # only for users + "user" => 1, + }; +} + +# this will be called at the beggining of Users::Add +# Could be called multiple times for one user +BEGIN { $TYPEINFO{AddBefore} = ["function", + ["map", "string", "any"], + "any", "any"]; +} +sub AddBefore { + + my ($self, $config, $data) = @_; + + if (!fingerprint_reader_configured ()) { + # error popup + $error = __("Fingerprint reader is not configured. Run 'yast2-fingerprint-reader' to configure it"); + return undef; + } + return $data; +} + +# this will be called at the beggining of Users::Edit +BEGIN { $TYPEINFO{EditBefore} = ["function", + ["map", "string", "any"], + "any", "any"]; +} +sub EditBefore { + + my ($self, $config, $data) = @_; + + if (!fingerprint_reader_configured ()) { + # error popup + $error = __("Fingerprint reader is not configured. Run 'yast2-fingerprint-reader' to configure it"); + return undef; + } + return $data; +} + + + +42 +# EOF Added: trunk/fingerprint-reader/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/complex.y… ============================================================================== --- trunk/fingerprint-reader/src/complex.ycp (added) +++ trunk/fingerprint-reader/src/complex.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,205 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/fingerprint-reader/complex.ycp + * Package: Configuration of fingerprint-reader + * Summary: Dialogs definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "fingerprint-reader"; + +import "Label"; +import "Popup"; +import "Wizard"; +import "Wizard_hw"; +import "Confirm"; +import "FingerprintReader"; + + +include "fingerprint-reader/helps.ycp"; + +/** + * Return a modification status + * @return true if data was modified + */ +boolean Modified() { + return FingerprintReader::Modified(); +} + +boolean ReallyAbort() { + return !FingerprintReader::Modified() || Popup::ReallyAbort(true); +} + +boolean PollAbort() { + return UI::PollInput() == `abort; +} + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); + // FingerprintReader::AbortFunction = PollAbort; + if (!Confirm::MustBeRoot()) return `abort; + boolean ret = FingerprintReader::Read(); + return ret ? `next : `abort; +} + +/** + * Write settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol WriteDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + // FingerprintReader::AbortFunction = PollAbort; + boolean ret = FingerprintReader::Write(); + return ret ? `next : `abort; +} + +/** + * Summary dialog + * @return dialog result + */ +any SummaryDialog() { + + /* FingerprintReader summary dialog caption */ + string caption = _("FingerprintReader Configuration"); + + /* FIXME */ + list summary = FingerprintReader::Summary(); + list unconfigured = summary[1]:[]; + string configured = summary[0]:""; + + /* Frame label */ + term contents = Wizard_hw::DetectedContent(_("FingerprintReader to Configure"), + unconfigured, false, configured); + + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", + Label::BackButton(), Label::FinishButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel || ret == `back) { + if(ReallyAbort()) break; + else continue; + } + /* overview dialog */ + else if(ret == `edit_button) { + ret = `overview; + break; + } + /* configure the selected device */ + else if(ret == `configure_button) { + // TODO FIXME: check for change of the configuration + any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem); + if(selected == `other) { + ret = `other; + } + else { + ret = `configure; + } + break; + } + else if(ret == `next) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/** + * Overview dialog + * @return dialog result + */ +any OverviewDialog() { + + /* FingerprintReader overview dialog caption */ + string caption = _("FingerprintReader Overview"); + + list overview = FingerprintReader::Overview(); + + /* FIXME table header */ + term contents = Wizard_hw::ConfiguredContent( + /* Table header */ + `header(_("Number"), _("FingerprintReader")), + overview, nil, nil, nil, nil ); + + contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); + + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", + Label::BackButton(), Label::FinishButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + /* add */ + else if(ret == `add_button) { + /* FIXME */ + ret = `add; + break; + } + /* edit */ + else if(ret == `edit_button) { + /* FIXME */ + ret = `edit; + break; + } + /* delete */ + else if(ret == `delete_button) { + /* FIXME */ + continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/* EOF */ +} Added: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.y… ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (added) +++ trunk/fingerprint-reader/src/dialogs.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,115 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/fingerprint-reader/dialogs.ycp + * Package: Configuration of fingerprint-reader + * Summary: Dialogs definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "fingerprint-reader"; + +import "Label"; +import "Wizard"; +import "FingerprintReader"; + +include "fingerprint-reader/helps.ycp"; + +/** + * Configure1 dialog + * @return dialog result + */ +any Configure1Dialog () { + + /* FingerprintReader configure1 dialog caption */ + string caption = _("FingerprintReader Configuration"); + + /* FingerprintReader configure1 dialog contents */ + term contents = `Label (_("First part of configuration of fingerprint-reader")); + + Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/** + * Configure2 dialog + * @return dialog result + */ +any Configure2Dialog () { + + /* FingerprintReader configure2 dialog caption */ + string caption = _("FingerprintReader Configuration"); + + /* FingerprintReader configure2 dialog contents */ + term contents = `Label (_("Second part of configuration of fingerprint-reader")); + + Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/* EOF */ +} Added: trunk/fingerprint-reader/src/fingerprint-reader URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/fingerprint-reader (added) +++ trunk/fingerprint-reader/src/fingerprint-reader Mon Jun 4 11:14:59 2007 @@ -0,0 +1 @@ +link . \ No newline at end of file Added: trunk/fingerprint-reader/src/fingerprint-reader.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/fingerprint-reader.desktop (added) +++ trunk/fingerprint-reader/src/fingerprint-reader.desktop Mon Jun 4 11:14:59 2007 @@ -0,0 +1,24 @@ +[Desktop Entry] +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=fingerprint-reader + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=fingerprint-reader + +Icon=yast-fingerprint-reader +Exec=/sbin/yast2 fingerprint-reader + +Name=FingerprintReader +GenericName=fingerprint-reader +X-KDE-SubstituteUID=true Added: trunk/fingerprint-reader/src/fingerprint-reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/fingerprint-reader.ycp (added) +++ trunk/fingerprint-reader/src/fingerprint-reader.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,93 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/fingerprint-reader.ycp + * Package: Configuration of fingerprint-reader + * Summary: Main file + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Main file for fingerprint-reader configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of fingerprint-reader</h3> + */ + +textdomain "fingerprint-reader"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("FingerprintReader module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "fingerprint-reader/wizards.ycp"; + +map cmdline_description = $[ + "id" : "fingerprint-reader", + /* Command line help text for the Xfingerprint-reader module */ + "help" : _("Configuration of fingerprint-reader"), + "guihandler" : FingerprintReaderSequence, + "initialize" : FingerprintReader::Read, + "finish" : FingerprintReader::Write, + "actions" : $[ + // FIXME TODO: fill the functionality description here + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mappings" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* is this proposal or not? */ +boolean propose = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } +} + +/* main ui function */ +any ret = nil; + +if(propose) ret = FingerprintReaderAutoSequence(); +else ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("FingerprintReader module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/fingerprint-reader/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/helps.ycp… ============================================================================== --- trunk/fingerprint-reader/src/helps.ycp (added) +++ trunk/fingerprint-reader/src/helps.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,119 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/fingerprint-reader/helps.ycp + * Package: Configuration of fingerprint-reader + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "fingerprint-reader"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help 1/2 */ + "read" : _("<big>Initializing fingerprint-reader Configuration</big> +Please wait... +") + + + /* Read dialog help 2/2 */ + _("<big>Aborting Initialization:</big> +Safely abort the configuration utility by pressing Abort now. +"), + + /* Write dialog help 1/2 */ + "write" : _("<big>Saving fingerprint-reader Configuration</big> +Please wait... +") + + + /* Write dialog help 2/2 */ +_("<big>Aborting Saving:</big> +Abort the save procedure by pressing Abort. +An additional dialog informs whether it is safe to do so. + +"), + + /* Summary dialog help 1/3 */ + "summary" : _("<big>FingerprintReader Configuration</big> +Configure fingerprint-reader here. +") + + + /* Summary dialog help 2/3 */ + _("<big>Adding a fingerprint-reader:</big> +Choose an fingerprint-reader from the list of detected fingerprint-readers. +If your fingerprint-reader was not detected, use Other (not detected). +Then press Configure. +") + + + /* Summary dialog help 3/3 */ + _("<big>Editing or Deleting:</big> +If you press Edit, an additional dialog in which to change +the configuration opens. +"), + + /* Ovreview dialog help 1/3 */ + "overview" : _("<big>FingerprintReader Configuration Overview</big> +Obtain an overview of installed fingerprint-readers. Additionally +edit their configurations. +") + + + /* Ovreview dialog help 2/3 */ +_("<big>Adding a fingerprint-reader:</big> +Press Add to configure a fingerprint-reader.") + + + /* Ovreview dialog help 3/3 */ +_("<big>Editing or Deleting:</big> +Choose a fingerprint-reader to change or remove. +Then press Edit or Delete as desired. +"), + + /* Configure1 dialog help 1/2 */ + "c1" : _("<big>Configuration Part One</big> +Press Next to continue. + ") + + + /* Configure1 dialog help 2/2 */ +_("<big>Selecting Something</big> +It is not possible. You must code it first. :-) +"), + + /* Configure2 dialog help 1/2 */ + "c2" : _("<big>Configuration Part Two</big> +Press Next to continue. + +") + + + /* Configure2 dialog help 2/2 */ +_("<big>Selecting Something</big> +It is not possible. You must code it first. :-) +"), + +]; + +/* EOF */ +} Added: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (added) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,151 @@ +/** + * File: + * include/users/users_plugin_fingerprint_reader.ycp + * + * Package: + * Configuration of Fingerprint Reader + * + * Summary: + * GUI part of plugin (UsersPluginFingerprintReader) used to manage + * user fingerprints on the appropriate hardware + * + * Authors: + * Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + textdomain "fingerprint-reader"; // use own textdomain for new plugins + + import "Label"; + import "UsersPluginFingerprintReader"; + import "Wizard"; + + any ret = nil; + string func = ""; + map<string,any> config = $[]; + map<string,any> data = $[]; + + /* Check arguments */ + if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string) WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + config = (map<string,any>)WFM::Args(1); + if(size(WFM::Args()) > 2 && is(WFM::Args(2), map)) + data = (map<string,any>)WFM::Args(2); + } + y2milestone("----------------------------------------"); + y2milestone("users plugin started: FingerprintReader"); + + y2debug ("func=%1, config=%2, data=%3", func,config,data); + + if (func == "Summary") { + ret = UsersPluginFingerprintReader::Summary (config, $[]); + } + else if (func == "Name") { + ret = UsersPluginFingerprintReader::Name (config, $[]); + } + else if (func == "Dialog") { + + string caption = UsersPluginFingerprintReader::Name (config, $[]); + string help_text = _(""); + + term contents = `HBox (`HSpacing (1.5), `VBox( + `VSpacing(0.5), + `ReplacePoint (`id (`rp), + `Label (`id (`label), "Initializing...") + ), + `VSpacing (0.5) + ), + `HSpacing (1.5) + ); + + Wizard::CreateDialog (); + Wizard::SetDesktopIcon("users"); + + // dialog caption + Wizard::SetContentsButtons(caption, contents, help_text, + Label::CancelButton(), Label::AcceptButton()); + + Wizard::HideAbortButton (); + Wizard::DisableNextButton (); + + + + string swipe_string (map statemap) { + + return sformat ("Please swipe your finger (successful swipes %1/3, failed swipes: %2)...", + statemap["swipe_success"]:0, statemap["swipe_failed"]:0); + } + + SCR::Execute (.thinkfinger.add-user, data["uid"]:""); + + /* + UI::OpenDialog (`VBox (`HSpacing (20), + `ReplacePoint (`id (`rp), + `Label (`id (`label), "Initializing...") + ), + `PushButton (`id(`ok), "Cancel") + )); + */ + boolean exit = false; + while (true) + { + + map statemap = (map) SCR::Read (.thinkfinger.state); + if (statemap != nil && statemap != $[]) + { +y2warning ("statemap: %1", statemap); + string state = statemap["state"]:""; + switch (state) { + case "TF_STATE_ACQUIRE_SUCCESS": { + UI::ReplaceWidget (`id (`rp), `Label ("Success")); + exit = true; + break; + } + case "TF_STATE_ACQUIRE_FAILED" : { + UI::ReplaceWidget (`id (`rp), `Label ("Failure")); + exit = true; + break; + } + case "TF_STATE_SWIPE_FAILED" : { + UI::ReplaceWidget (`id (`rp), `Label (swipe_string (statemap))); + break; + } + case "TF_STATE_SWIPE_SUCCESS" : { + UI::ReplaceWidget (`id (`rp), `Label (swipe_string (statemap))); + break; + } + case "TF_STATE_SWIPE_0" : { + UI::ReplaceWidget (`id (`rp), `Label (swipe_string (statemap))); + break; + } + } + + } + else if (statemap == nil) + { + break; + } + + any r = UI::PollInput (); + if (r == `cancel || exit) break; + sleep (5); + } + if (SCR::Read (.thinkfinger.exit_status) == true) + { + // new id was already saved + Wizard::DisableBackButton (); + Wizard::EnableNextButton (); + } + + UI::UserInput (); + Wizard::CloseDialog (); + } + y2debug ("ret=%1", ret); + y2milestone("users plugin finished"); + y2milestone("----------------------------------------"); + + return ret; +} Added: trunk/fingerprint-reader/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/wizards.y… ============================================================================== --- trunk/fingerprint-reader/src/wizards.ycp (added) +++ trunk/fingerprint-reader/src/wizards.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,177 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/fingerprint-reader/wizards.ycp + * Package: Configuration of fingerprint-reader + * Summary: Wizards definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "fingerprint-reader"; + +import "Sequencer"; +import "Wizard"; + +include "fingerprint-reader/complex.ycp"; +include "fingerprint-reader/dialogs.ycp"; + +/** + * Add a configuration of fingerprint-reader + * @return sequence result + */ +any AddSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "config1" : ``(Configure1Dialog()), + "config2" : ``(Configure2Dialog()), + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "config1", + "config1" : $[ + `abort : `abort, + `next : "config2" + ], + "config2" : $[ + `abort : `abort, + `next : `next + ] + ]; + + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the fingerprint-reader configuration + * @return sequence result + */ +any MainSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "summary" : ``( SummaryDialog() ), + "overview" : ``( OverviewDialog() ), + "configure" : [ ``( AddSequence() ), true ], + "add" : [ ``( AddSequence() ), true ], + "edit" : [ ``( AddSequence() ), true ] + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "summary", + "summary" : $[ + `abort : `abort, + `next : `next, + `overview : "overview", + `configure : "configure", + `other : "configure", + ], + "overview" : $[ + `abort : `abort, + `next : `next, + `add : "add", + `edit : "edit", + ], + "configure" : $[ + `abort : `abort, + `next : "summary", + ], + "add" : $[ + `abort : `abort, + `next : "overview", + ], + "edit" : $[ + `abort : `abort, + `next : "overview", + ] + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** + * Whole configuration of fingerprint-reader + * @return sequence result + */ +any FingerprintReaderSequence() { + + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; + + Wizard::CreateDialog(); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + +/** + * Whole configuration of fingerprint-reader but without reading and writing. + * For use with autoinstallation. + * @return sequence result + */ +any FingerprintReaderAutoSequence() { + + /* Initialization dialog caption */ + string caption = _("FingerprintReader Configuration"); + /* Initialization dialog contents */ + term contents = `Label(_("Initializing...")); + + Wizard::CreateDialog(); + Wizard::SetContentsButtons(caption, contents, "", + Label::BackButton(), Label::NextButton()); + + any ret = MainSequence(); + + UI::CloseDialog(); + return ret; +} + +/* EOF */ +} Added: trunk/fingerprint-reader/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/testsuite/Mak… ============================================================================== --- trunk/fingerprint-reader/testsuite/Makefile.am (added) +++ trunk/fingerprint-reader/testsuite/Makefile.am Mon Jun 4 11:14:59 2007 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/fingerprint-reader/testsuite/tests/FingerprintReader.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/testsuite/tes… ============================================================================== (empty) Added: trunk/fingerprint-reader/testsuite/tests/FingerprintReader.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/testsuite/tes… ============================================================================== --- trunk/fingerprint-reader/testsuite/tests/FingerprintReader.out (added) +++ trunk/fingerprint-reader/testsuite/tests/FingerprintReader.out Mon Jun 4 11:14:59 2007 @@ -0,0 +1,2 @@ +Dump FingerprintReader::Modified +Return false Added: trunk/fingerprint-reader/testsuite/tests/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/testsuite/tes… ============================================================================== --- trunk/fingerprint-reader/testsuite/tests/FingerprintReader.ycp (added) +++ trunk/fingerprint-reader/testsuite/tests/FingerprintReader.ycp Mon Jun 4 11:14:59 2007 @@ -0,0 +1,13 @@ +{ + +// testedfiles: FingerprintReader.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "FingerprintReader"; + +DUMP("FingerprintReader::Modified"); +TEST(``(FingerprintReader::Modified()), [], nil); + +} Added: trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/yast2-fingerp… ============================================================================== --- trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in (added) +++ trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in Mon Jun 4 11:14:59 2007 @@ -0,0 +1,30 @@ +@HEADER-COMMENT@ + +@HEADER@ +BuildRequires: libthinkfinger +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of fingerprint reader + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/fingerprint-reader +@yncludedir@/fingerprint-reader/* +@clientdir@/fingerprint-reader.ycp +@moduledir@/FingerprintReader.* +@desktopdir@/fingerprint-reader.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38260 - in /trunk/tv: package/yast2-tv.changes src/Tv.ycp
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: lslezak Date: Mon Jun 4 10:53:24 2007 New Revision: 38260 URL: http://svn.opensuse.org/viewcvs/yast?rev=38260&view=rev Log: - check whether lirc service and /etc/sysconfig/lirc are available when reading/writing the configuration (#211901) Modified: trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Mon Jun 4 10:53:24 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 4 10:51:02 CEST 2007 - lslezak(a)suse.cz + +- check whether lirc service and /etc/sysconfig/lirc are available + when reading/writing the configuration (#211901) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=38260&r1=38259… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Mon Jun 4 10:53:24 2007 @@ -2883,8 +2883,10 @@ cards_with_ir_kbd_gpio = (map) SCR::Read (.target.yast2, "tv_cards-lirc_gpio.ycp"); - use_irc = Service::Status ("lirc") == 0; - irc_module = (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE); + + use_irc = (Service::Info("lirc") != $[]) ? (Service::Status ("lirc") == 0) : false; + + irc_module = (SCR::Read(.target.size, "/etc/sysconfig/lirc") >= 0) ? (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE) : ""; if (irc_module == nil) irc_module = ""; if (SCR::Read (.target.size, "/etc/lircd.conf") != -1) @@ -2896,10 +2898,17 @@ irc_config = "/usr/share/lirc/remotes/linux-input-layer-lircd.conf"; } - map out = (map) SCR::Execute (.target.bash_output, - "/usr/bin/find /usr/share/lirc/remotes/ -name *lircd*"); - remotes = sort (splitstring (out["stdout"]:"", "\n")); - // FIXME choose from remotes + if (SCR::Read(.target.size, "/usr/share/lirc") >= 0) + { + map out = (map) SCR::Execute (.target.bash_output, + "/usr/bin/find /usr/share/lirc/remotes/ -name *lircd*"); + remotes = sort (splitstring (out["stdout"]:"", "\n")); + // FIXME choose from remotes + } + else + { + remotes = []; + } return `next; } @@ -2910,9 +2919,16 @@ */ global define any WriteIRC () ``{ - // 1. sysconfig values - SCR::Write (.sysconfig.lirc.LIRC_MODULE, irc_module); - SCR::Write (.sysconfig.lirc, nil); + if (SCR::Read(.target.size, "/etc/sysconfig/lirc") >= 0) + { + // write sysconfig values + SCR::Write (.sysconfig.lirc.LIRC_MODULE, irc_module); + SCR::Write (.sysconfig.lirc, nil); + } + else + { + y2warning("/etc/syconfig/lirc doesn't exist, writing the configuration has been skipped"); + } y2milestone("config file: %1", irc_config); @@ -2933,20 +2949,31 @@ y2milestone("config file: %1 copied to /etc/lircd.conf",irc_config); } - // adjust runlevels: - Service::Adjust ("lirc", "enable"); - // start the service - if (Service::Status ("lirc") == 0) - Service::RunInitScript ("lirc", "restart"); + // does the service exist? + if (Service::Info("lirc") != $[]) + { + // adjust runlevels: + Service::Adjust ("lirc", "enable"); + // start the service + if (Service::Status ("lirc") == 0) + Service::RunInitScript ("lirc", "restart"); + else + Service::RunInitScript ("lirc", "start"); + } else - Service::RunInitScript ("lirc", "start"); + { + y2error("Service 'lirc' doesn't exist!"); + } } else { - // adjust runlevels: - Service::Adjust ("lirc", "disable"); - // stop the service - Service::RunInitScript ("lirc", "stop"); + if (Service::Info("lirc") != $[]) + { + // adjust runlevels: + Service::Adjust ("lirc", "disable"); + // stop the service + Service::RunInitScript ("lirc", "stop"); + } } return `next; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38259 - /tags/stable-2_15_13/update/
by locilka＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: locilka Date: Mon Jun 4 09:42:34 2007 New Revision: 38259 URL: http://svn.opensuse.org/viewcvs/yast?rev=38259&view=rev Log: Created tag stable-2_15_13 for update Added: tags/stable-2_15_13/update/ - copied from r38258, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0