Author: jsuchome Date: Tue Nov 9 14:40:39 2010 New Revision: 62770 URL: http://svn.opensuse.org/viewcvs/yast?rev=62770&view=rev Log: - added option to build i586 images on i686 system (bnc#644895) - 2.20.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue Nov 9 14:40:39 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Nov 9 14:40:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 14:37:48 CET 2010 - jsuchome@suse.cz + +- added option to build i586 images on i686 system (bnc#644895) +- 2.20.3 + +------------------------------------------------------------------- Tue Oct 12 13:32:37 UTC 2010 - lslezak@suse.cz - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Tue Nov 9 14:40:39 2010 @@ -47,6 +47,9 @@ // target architecture of image (can be only i386 if different from current one) global string image_architecture = ""; + // if target architecture should be i586 instead of i686 + global boolean target_i586 = false; + // directories with user-made templated global list<string> templates_dirs = []; @@ -566,9 +569,16 @@ } string linux32 = ""; + string target_arch = ""; // rather set target_arch only in one specific case if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + { linux32 = "linux32"; - string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); + } + if (ProductCreator::GetArch () == "i386" && target_i586) + { + target_arch = "--target-arch i586"; + } + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal %4", chroot_dir, config_dir, linux32, target_arch); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -615,8 +625,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", - chroot_dir, out_dir, linux32); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal %4", + chroot_dir, out_dir, linux32, target_arch); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Tue Nov 9 14:40:39 2010 @@ -2276,11 +2276,15 @@ { arch_term = `VBox ( // checkbox label - `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + `CheckBox (`id (`i386), `opt (`notify, `hstretch), _("&32bit Architecture Image"), Kiwi::image_architecture == "i386"), `VSpacing (0.2) ); } + arch_term = add (arch_term, + // checkbox label + `CheckBox (`id (`i586), `opt (`hstretch), _("Target is i586 only"), Kiwi::target_i586)); + arch_term = add (arch_term, `VSpacing (0.2)); term contents = `VBox ( new_configuration ? @@ -2367,6 +2371,10 @@ UI::ChangeWidget (`id (`import), `Enabled, false); UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } + if (Arch::architecture () == "x86_64") + { + UI::ChangeWidget (`id (`i586), `Enabled, Kiwi::image_architecture == "i386"); + } any ret = nil; while (true) { @@ -2395,6 +2403,10 @@ UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); } + if (ret == `i386) + { + UI::ChangeWidget (`id (`i586), `Enabled, UI::QueryWidget (`id (`i386), `Value)); + } if (ret == `import) { string dir = UI::AskForExistingDirectory ( @@ -2586,6 +2598,8 @@ } } + Kiwi::target_i586 = Kiwi::image_architecture == "i386" && (boolean) UI::QueryWidget (`id (`i586), `Value); + if (size (repositories) > 0) { map current_sources = $[]; Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Tue Nov 9 14:40:39 2010 @@ -45,12 +45,15 @@ if (typemap["primary"]:"false" == "true") { task = typemap[Kiwi::content_key]:task; + if (task == "" && typemap["image"]:"" != "") + task = typemap["image"]:""; break; } }); if (task == "") { y2milestone ("no task found, setting to 'iso'"); + task = "iso"; } return task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org