November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41776 - in /trunk/dirinstall: doc/ src/modules/DirInstall.ycp src/modules/Makefile.am yast2-dirinstall.spec.in
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 12:25:39 2007 New Revision: 41776 URL: http://svn.opensuse.org/viewcvs/yast?rev=41776&view=rev Log: Fixed for build Added: trunk/dirinstall/doc/ Modified: trunk/dirinstall/src/modules/DirInstall.ycp trunk/dirinstall/src/modules/Makefile.am trunk/dirinstall/yast2-dirinstall.spec.in Modified: trunk/dirinstall/src/modules/DirInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/DirInstal… ============================================================================== --- trunk/dirinstall/src/modules/DirInstall.ycp (original) +++ trunk/dirinstall/src/modules/DirInstall.ycp Mon Nov 5 12:25:39 2007 @@ -8,17 +8,17 @@ * */ { -textdomain "packager"; +textdomain "dirinstall"; + module "DirInstall"; import "Mode"; import "Stage"; import "HTML"; import "ProductControl"; import "String"; +import "Installation"; global boolean runme_at_boot = false; -string target = "/var/tmp/dirinstall"; - global boolean makeimage = false; global string image_dir = ""; global string image_name = ""; @@ -27,8 +27,6 @@ global string dirinstall_control_file = "/usr/share/YaST2/control/dirinstall.xml"; -global boolean installing_into_dir = false; - list<list<string> > filesystems = [ ["/proc", "proc", "proc" ], ["/sys", "sysfs", "sysfs" ], @@ -45,16 +43,16 @@ global void SetTarget(string tgt) { - if (target != tgt) + if (Installation::dirinstall_target != tgt) { - target = tgt; + Installation::dirinstall_target = tgt; target_time = time(); } } global string GetTarget() { - return target; + return Installation::dirinstall_target; } global void InitProductControl () { @@ -67,7 +65,7 @@ y2error("control file %1 not found", ProductControl::custom_control_file ); } } else { - installing_into_dir =false; + Installation::dirinstall_installing_into_dir =false; } @@ -83,7 +81,7 @@ string color = "red"; list<string> tmp = []; // Proposal for dirinstall installation - tmp = add (tmp, sformat (_("Target Directory: %1"), HTML::Colorize(DirInstall::target, color))); + tmp = add (tmp, sformat (_("Target Directory: %1"), HTML::Colorize(Installation::dirinstall_target, color))); // Proposal for backup during update tmp = add (tmp, sformat (_("Run YaST and SuSEconfig at First Boot: %1"), HTML::Colorize(DirInstall::runme_at_boot @@ -103,7 +101,7 @@ string mp = descr[0]:""; string dev = descr[1]:""; string type = descr[2]:""; - mp = target + mp; + mp = Installation::dirinstall_target + mp; WFM::Execute (.local.bash, sformat ("test -d '%1' || mkdir -p '%1'", String::Quote (mp))); WFM::Execute (.local.bash, sformat ("/bin/mount -t %1 %2 '%3'", type, dev, String::Quote (mp))); Modified: trunk/dirinstall/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/Makefile.… ============================================================================== --- trunk/dirinstall/src/modules/Makefile.am (original) +++ trunk/dirinstall/src/modules/Makefile.am Mon Nov 5 12:25:39 2007 @@ -5,9 +5,4 @@ module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) EXTRA_DIST = $(module_DATA) -packager: - ln -sf ../include packager - -ycpchook = packager - include $(top_srcdir)/Makefile.am.common Modified: trunk/dirinstall/yast2-dirinstall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/yast2-dirinstall.spec… ============================================================================== --- trunk/dirinstall/yast2-dirinstall.spec.in (original) +++ trunk/dirinstall/yast2-dirinstall.spec.in Mon Nov 5 12:25:39 2007 @@ -1,8 +1,17 @@ @HEADER-COMMENT@ @HEADER@ -Requires: yast2 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +# Installation::dirinstall_target +Requires: yast2 >= 2.16.7 +Requires: yast2 yast2-country yast2-mouse yast2-packager yast2-runlevel + +BuildRequires: yast2 >= 2.16.7 +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite +#BuildRequires: docbook-xsl-stylesheets doxygen libxslt sgml-skel + +Provides: /usr/share/YaST2/clients/dirinstall.ycp +# Package-split +Conflicts: yast2-packager < 2.16.3 BuildArchitectures: noarch @@ -23,9 +32,10 @@ %defattr(-,root,root) %dir @yncludedir@/dirinstall @yncludedir@/dirinstall/* -@clientdir@/dirinstall.ycp -@clientdir@/dirinstall_*.ycp -@moduledir@/Dirinstall.* -@moduledir@/Dirinstall2.* -@desktopdir@/dirinstall.desktop +@yncludedir@/packager/* +@clientdir@/*.ycp +@moduledir@/* +@desktopdir@/*.desktop +%dir /usr/share/YaST2/control +/usr/share/YaST2/control/*.xml %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] r41775 - /trunk/packager/src/modules/Packages.ycp
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 12:20:46 2007 New Revision: 41775 URL: http://svn.opensuse.org/viewcvs/yast?rev=41775&view=rev Log: Forgotten import of moved module Modified: trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Nov 5 12:20:46 2007 @@ -31,13 +31,13 @@ import "Popup"; import "Label"; import "Wizard"; -import "DirInstall"; import "PackageCallbacksInit"; import "Product"; import "DefaultDesktop"; import "SourceDialogs"; import "FileUtils"; import "PackageCallbacks"; +import "Installation"; include "packager/load_release_notes.ycp"; @@ -149,7 +149,7 @@ */ global string CountSizeToBeInstalled () { integer sz = 0; - if (! Mode::installation () && !DirInstall::installing_into_dir ) + if (! Mode::installation () && !Installation::dirinstall_installing_into_dir ) { list<string> packages = Pkg::GetPackages (`selected, true); foreach (string p, packages, { -- 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] r41774 - in /trunk/packager: doc/.cvsignore doc/Makefile.am doc/autodocs/ doc/autodocs/Makefile.am package/yast2-packager.changes src/modules/SpaceCalculation.ycp
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 12:10:53 2007 New Revision: 41774 URL: http://svn.opensuse.org/viewcvs/yast?rev=41774&view=rev Log: - Part of the package content has been moved to a new package yast2-dirinstall. - Fixed (added) generation of autodocs. Added: trunk/packager/doc/Makefile.am trunk/packager/doc/autodocs/ trunk/packager/doc/autodocs/Makefile.am Modified: trunk/packager/doc/.cvsignore trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SpaceCalculation.ycp Modified: trunk/packager/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/doc/.cvsignore?rev=4177… ============================================================================== --- trunk/packager/doc/.cvsignore (original) +++ trunk/packager/doc/.cvsignore Mon Nov 5 12:10:53 2007 @@ -1,2 +1,3 @@ +Makefile +Makefile.in *.junk - Added: trunk/packager/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/doc/Makefile.am?rev=417… ============================================================================== --- trunk/packager/doc/Makefile.am (added) +++ trunk/packager/doc/Makefile.am Mon Nov 5 12:10:53 2007 @@ -0,0 +1,12 @@ +# +# Makefile.am for y2c_firewall/doc +# +# $Id: Makefile.am 3154 2002-07-01 15:52:42Z msvec $ +# + +SUBDIRS = autodocs + +htmldir = @docdir@ +html_DATA = + +EXTRA_DIST = $(html_DATA) Added: trunk/packager/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/doc/autodocs/Makefile.a… ============================================================================== --- trunk/packager/doc/autodocs/Makefile.am (added) +++ trunk/packager/doc/autodocs/Makefile.am Mon Nov 5 12:10:53 2007 @@ -0,0 +1,5 @@ +# Makefile.am for YCP module .../doc/autodocs + +AUTODOCS_YCP = $(wildcard $(srcdir)/../../src/*/*.ycp) +AUTODOCS_PM = $(wildcard $(srcdir)/../../src/*/*.pm) +include $(top_srcdir)/autodocs-ycp.ami Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 5 12:10:53 2007 @@ -3,6 +3,7 @@ - Part of the package content has been moved to a new package yast2-dirinstall. +- Fixed (added) generation of autodocs. - 2.16.3 ------------------------------------------------------------------- Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalcul… ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Mon Nov 5 12:10:53 2007 @@ -100,8 +100,8 @@ if (Installation::dirinstall_installing_into_dir) { - target = GetDirMountPoint(DirInstall::GetTarget(), partition ); - y2milestone("Installing into a directory, target directory: %1, target mount point: %2", DirInstall::GetTarget(), target); + target = GetDirMountPoint(Installation::dirinstall_target, partition ); + y2milestone("Installing into a directory, target directory: %1, target mount point: %2", Installation::dirinstall_target, target); } // pkginfo expects names of partitions without "/" in front ( exception: "/" itself ) @@ -125,7 +125,7 @@ mountName = "/" + mountName; } - string dir_target = DirInstall::GetTarget(); + string dir_target = Installation::dirinstall_target; y2debug("mountName: %1, dir_target: %2", mountName, dir_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] r41773 - in /trunk/yast2: VERSION package/yast2.changes
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 12:06:35 2007 New Revision: 41773 URL: http://svn.opensuse.org/viewcvs/yast?rev=41773&view=rev Log: 2.16.7 Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=41773&r1=41772… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Nov 5 12:06:35 2007 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Nov 5 12:06:35 2007 @@ -2,6 +2,7 @@ Mon Nov 5 11:19:38 CET 2007 - locilka(a)suse.cz - Dirinstall-related global data added to Installation YCP module. +- 2.16.7 ------------------------------------------------------------------- Fri Nov 2 14:27:14 CET 2007 - locilka(a)suse.cz -- 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] r41772 - /tags/branch-SLE-10-SP1-2_13_1/fingerprint-reader/
by jsuchome＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: jsuchome Date: Mon Nov 5 11:36:43 2007 New Revision: 41772 URL: http://svn.opensuse.org/viewcvs/yast?rev=41772&view=rev Log: Created tag branch-SLE-10-SP1-2_13_1 for fingerprint-reader Added: tags/branch-SLE-10-SP1-2_13_1/fingerprint-reader/ - copied from r41771, branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/ -- 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] r41771 - in /branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader: VERSION package/yast2-fingerprint-reader.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: jsuchome Date: Mon Nov 5 11:36:37 2007 New Revision: 41771 URL: http://svn.opensuse.org/viewcvs/yast?rev=41771&view=rev Log: - fixed wrong widget id (#338323) - 2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/VERSION branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/VERSION Mon Nov 5 11:36:37 2007 @@ -1 +1 @@ -2.13.0 +2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Nov 5 11:36:37 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 1 08:14:39 CET 2007 - jsuchome(a)suse.cz + +- fixed wrong widget id (#338323) +- 2.13.1 + +------------------------------------------------------------------- Tue Oct 2 13:48:59 CEST 2007 - jsuchome(a)suse.cz - Backport 2.15.2 version for SLE10 (F302658) Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/dialogs.ycp Mon Nov 5 11:36:37 2007 @@ -146,7 +146,7 @@ { if ((findlastof (dir, "/") + 1) == size(dir)) dir = substring (dir, 0, size(dir)-1); - UI::ChangeWidget (`id(`home), `Value, dir); + UI::ChangeWidget (`id(`import_dir), `Value, dir); } } else if (ret == `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] r41770 - in /trunk/packager: ./ package/ src/clients/ src/config/ src/include/ src/include/dirinstall/ src/modules/
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 11:24:49 2007 New Revision: 41770 URL: http://svn.opensuse.org/viewcvs/yast?rev=41770&view=rev Log: - Part of the package content has been moved to a new package yast2-dirinstall. - 2.16.3 Removed: trunk/packager/src/clients/dirinstall.ycp trunk/packager/src/clients/dirinstall_options.ycp trunk/packager/src/clients/dirinstall_options_proposal.ycp trunk/packager/src/clients/inst_dirinstall.ycp trunk/packager/src/clients/inst_dirinstall_finish.ycp trunk/packager/src/config/dirinstall.desktop trunk/packager/src/config/dirinstall.xml trunk/packager/src/include/dirinstall/ trunk/packager/src/modules/DirInstall.ycp Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/config/Makefile.am trunk/packager/src/include/Makefile.am trunk/packager/src/modules/SpaceCalculation.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=41770&r1=41… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Nov 5 11:24:49 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 5 11:24:49 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 5 11:23:33 CET 2007 - locilka(a)suse.cz + +- Part of the package content has been moved to a new package + yast2-dirinstall. +- 2.16.3 + +------------------------------------------------------------------- Fri Nov 2 17:22:16 CET 2007 - locilka(a)suse.cz - Removed dependency on yast2-bootloader, Bootloader::PreUpdate() Modified: trunk/packager/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/Makefile.am?… ============================================================================== --- trunk/packager/src/config/Makefile.am (original) +++ trunk/packager/src/config/Makefile.am Mon Nov 5 11:24:49 2007 @@ -1,9 +1,4 @@ # Makefile.am for source/packager/src/config -controldir = $(yast2dir)/control - -control_DATA = \ - dirinstall.xml - desktop_DATA = $(wildcard *.desktop) EXTRA_DIST = $(desktop_DATA) $(control_DATA) Modified: trunk/packager/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/Makefile.am… ============================================================================== --- trunk/packager/src/include/Makefile.am (original) +++ trunk/packager/src/include/Makefile.am Mon Nov 5 11:24:49 2007 @@ -2,7 +2,7 @@ # Makefile.am for packager/src # -SUBDIRS = checkmedia dirinstall +SUBDIRS = checkmedia yncludedir = @yncludedir@/packager ynclude_DATA = \ Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalcul… ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Mon Nov 5 11:24:49 2007 @@ -23,7 +23,6 @@ import "ProductFeatures"; import "Report"; import "String"; - import "DirInstall"; import "Stage"; boolean info_called = false; // list partition_info already initialized? @@ -99,7 +98,7 @@ // filter out headline and other invalid entries partition = filter( map<string, string> part, partition, ``( substring ( part["name"]:"", 0, 1 ) == "/" ) ); - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { target = GetDirMountPoint(DirInstall::GetTarget(), partition ); y2milestone("Installing into a directory, target directory: %1, target mount point: %2", DirInstall::GetTarget(), target); @@ -119,7 +118,7 @@ string mountName = part["name"]:""; string spec = part["spec"]:""; - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { if (substring(mountName, 0, 1) != "/") { Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Mon Nov 5 11:24:49 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp +BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # Installation::installedVersion && Installation::updateVersion # Update::* moved to Installation::update_* @@ -61,16 +61,12 @@ %files %defattr(-,root,root) %dir @yncludedir@/checkmedia -%dir @yncludedir@/dirinstall %dir @yncludedir@/packager @yncludedir@/checkmedia/* -@yncludedir@/dirinstall/* @yncludedir@/packager/* @clientdir@/*.ycp @moduledir@/* @desktopdir@/*.desktop @scrconfdir@/* @execcompdir@/servers_non_y2/ag_* -%dir /usr/share/YaST2/control -/usr/share/YaST2/control/*.xml %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] r41769 - /trunk/yast2/yast2.spec.in
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 11:22:01 2007 New Revision: 41769 URL: http://svn.opensuse.org/viewcvs/yast?rev=41769&view=rev Log: RPM dependencies Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41769&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Mon Nov 5 11:22:01 2007 @@ -30,7 +30,7 @@ Conflicts: yast2-installation < 2.16.2 Conflicts: yast2-update < 2.16.1 # Installation::dirinstall_target -Conflicts: yast2-packager < 2.16.4 +Conflicts: yast2-packager < 2.16.3 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -- 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] r41768 - in /trunk/yast2: library/control/src/Installation.ycp package/yast2.changes yast2.spec.in
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 11:20:30 2007 New Revision: 41768 URL: http://svn.opensuse.org/viewcvs/yast?rev=41768&view=rev Log: - Dirinstall-related global data added to Installation YCP module. Modified: trunk/yast2/library/control/src/Installation.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Instal… ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Mon Nov 5 11:20:30 2007 @@ -151,6 +151,12 @@ global string update_backup_path = "/var/adm/backup"; + // dirinstall-related + + global boolean dirinstall_installing_into_dir = false; + + global string dirinstall_target = "/var/tmp/dirinstall"; + //--------------------------------------------------------------- // constructor Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Nov 5 11:20:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 5 11:19:38 CET 2007 - locilka(a)suse.cz + +- Dirinstall-related global data added to Installation YCP module. + +------------------------------------------------------------------- Fri Nov 2 14:27:14 CET 2007 - locilka(a)suse.cz - YCP module Internet moved from yast2-network to yast2 to remove Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41768&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Mon Nov 5 11:20:30 2007 @@ -29,6 +29,8 @@ # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 Conflicts: yast2-update < 2.16.1 +# Installation::dirinstall_target +Conflicts: yast2-packager < 2.16.4 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -- 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] r41767 - in /trunk/dirinstall/src: ./ clients/ config/ include/ modules/
by locilka＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: locilka Date: Mon Nov 5 10:27:36 2007 New Revision: 41767 URL: http://svn.opensuse.org/viewcvs/yast?rev=41767&view=rev Log: - Initial version created by splitting from yast2-packager Added: trunk/dirinstall/src/clients/ trunk/dirinstall/src/clients/Makefile.am trunk/dirinstall/src/clients/dirinstall.ycp - copied unchanged from r41756, trunk/packager/src/clients/dirinstall.ycp trunk/dirinstall/src/clients/dirinstall_options.ycp - copied unchanged from r41756, trunk/packager/src/clients/dirinstall_options.ycp trunk/dirinstall/src/clients/dirinstall_options_proposal.ycp - copied unchanged from r41756, trunk/packager/src/clients/dirinstall_options_proposal.ycp trunk/dirinstall/src/clients/inst_dirinstall.ycp - copied unchanged from r41756, trunk/packager/src/clients/inst_dirinstall.ycp trunk/dirinstall/src/clients/inst_dirinstall_finish.ycp - copied unchanged from r41756, trunk/packager/src/clients/inst_dirinstall_finish.ycp trunk/dirinstall/src/config/ trunk/dirinstall/src/config/Makefile.am trunk/dirinstall/src/config/dirinstall.desktop - copied unchanged from r41756, trunk/packager/src/config/dirinstall.desktop trunk/dirinstall/src/config/dirinstall.xml - copied unchanged from r41756, trunk/packager/src/config/dirinstall.xml trunk/dirinstall/src/include/ trunk/dirinstall/src/include/Makefile.am - copied unchanged from r41756, trunk/packager/src/include/checkmedia/Makefile.am trunk/dirinstall/src/include/ui.ycp - copied unchanged from r41756, trunk/packager/src/include/checkmedia/ui.ycp trunk/dirinstall/src/modules/ trunk/dirinstall/src/modules/DirInstall.ycp - copied unchanged from r41756, trunk/packager/src/modules/DirInstall.ycp trunk/dirinstall/src/modules/Makefile.am Modified: trunk/dirinstall/src/Makefile.am Modified: trunk/dirinstall/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/Makefile.am?rev=4… ============================================================================== --- trunk/dirinstall/src/Makefile.am (original) +++ trunk/dirinstall/src/Makefile.am Mon Nov 5 10:27:36 2007 @@ -1,30 +1,5 @@ -# Makefile.am for dirinstall/src +# +# Makefile.am for packager/src +# -yncludedir = @yncludedir@/dirinstall - -client_DATA = \ - dirinstall.ycp \ - dirinstall_auto.ycp \ - dirinstall_proposal.ycp - -ynclude_DATA = \ - helps.ycp \ - wizards.ycp \ - dialogs.ycp \ - complex.ycp - -desktop_DATA = \ - dirinstall.desktop - -module_DATA = \ - Dirinstall.ycp \ - Dirinstall2.pm - -# create a symlink for local build, #145327 -dirinstall: - ln -sf . $@ -ycpchook = dirinstall - -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) - -include $(top_srcdir)/Makefile.am.common +SUBDIRS = clients modules config include Added: trunk/dirinstall/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/Makefile.… ============================================================================== --- trunk/dirinstall/src/clients/Makefile.am (added) +++ trunk/dirinstall/src/clients/Makefile.am Mon Nov 5 10:27:36 2007 @@ -0,0 +1,11 @@ +# +# Makefile.am for packager/src/clients +# + +client_DATA = $(wildcard *.ycp) + +EXTRA_DIST = $(client_DATA) + +YCPCFLAGS=-M ../modules -I ../include + +include $(top_srcdir)/Makefile.am.common Added: trunk/dirinstall/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/config/Makefile.a… ============================================================================== --- trunk/dirinstall/src/config/Makefile.am (added) +++ trunk/dirinstall/src/config/Makefile.am Mon Nov 5 10:27:36 2007 @@ -0,0 +1,9 @@ +# Makefile.am for source/packager/src/config + +controldir = $(yast2dir)/control + +control_DATA = \ + dirinstall.xml + +desktop_DATA = $(wildcard *.desktop) +EXTRA_DIST = $(desktop_DATA) $(control_DATA) Added: trunk/dirinstall/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/Makefile.… ============================================================================== --- trunk/dirinstall/src/modules/Makefile.am (added) +++ trunk/dirinstall/src/modules/Makefile.am Mon Nov 5 10:27:36 2007 @@ -0,0 +1,13 @@ +# Makefile.am for packager/src/modules + +YCPCFLAGS = -I . -M . + +module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) +EXTRA_DIST = $(module_DATA) + +packager: + ln -sf ../include packager + +ycpchook = packager + +include $(top_srcdir)/Makefile.am.common -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0