Author: jsuchome Date: Fri Mar 4 14:27:24 2011 New Revision: 63513 URL: http://svn.opensuse.org/viewcvs/yast?rev=63513&view=rev Log: - strip UTF-8 ending from locale string (bnc#675101) - allow live iso creation only for x86/x86_64 (bnc#675101 - 2.21.0 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=63513&r1=63512&r2=63513&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Mar 4 14:27:24 2011 @@ -1 +1 @@ -2.20.3 +2.21.0 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=63513&r1=63512&r2=63513&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Mar 4 14:27:24 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 4 14:26:18 CET 2011 - jsuchome@suse.cz + +- strip UTF-8 ending from locale string (bnc#675101) +- allow live iso creation only for x86/x86_64 (bnc#675101 +- 2.21.0 + +------------------------------------------------------------------- Tue Nov 9 14:37:48 CET 2010 - jsuchome@suse.cz - added option to build i586 images on i686 system (bnc#644895) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=63513&r1=63512&r2=63513&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Fri Mar 4 14:27:24 2011 @@ -276,6 +276,14 @@ ret["preferences",0,"defaultdestination",0,content_key]:""; } + if (haskey (ret["preferences",0]:$[], "locale")) + { + // remove .UTF-8 endings from locale (bnc#675101) + string lang = get_preferences (ret, "locale", ""); + list<string> split = splitstring (lang, "."); + ret = save_preferences (ret, "locale", split[0]:lang); + } + return ret; } Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/config.xml?rev=63513&r1=63512&r2=63513&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Fri Mar 4 14:27:24 2011 @@ -17,7 +17,7 @@ <boot-theme>openSUSE</boot-theme> <rpm-check-signatures>false</rpm-check-signatures> <rpm-force>false</rpm-force> - <locale>en_US.UTF-8</locale> + <locale>en_US</locale> <oem-swap>false</oem-swap> <oem-boot-title>USB</oem-boot-title> <rpm-excludedocs>false</rpm-excludedocs> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=63513&r1=63512&r2=63513&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Mar 4 14:27:24 2011 @@ -529,6 +529,14 @@ */ define void StorePreferences (string key, map event) { string val = (string) UI::QueryWidget (`id(key), `Value); + + // split .UTF-8 endings from locale (bnc#675101) + if (key == "locale") + { + list<string> split = splitstring (val, "."); + val = split[0]:val; + UI::ChangeWidget (`id (key), `Value, val); + } if (val == "" && haskey (KiwiConfig["preferences",0]:$[], key)) { KiwiConfig["preferences",0] = @@ -2122,14 +2130,22 @@ list basic_type_items = [ // combo box item - `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso"), - // combo box item `item (`id ("xen"), _("Xen Image"), kiwi_task == "xen"), // combo box item `item (`id ("usb"), _("USB Stick Image"), kiwi_task == "usb"), // combo box item `item (`id ("vmx"), _("Virtual Disk Image"), kiwi_task == "vmx") ]; + + // build Live iso only for x86_64 and i386 (bnc#675101) + if (Arch::architecture () == "x86_64" || ProductCreator::GetArch () == "i386") + { + basic_type_items = prepend (basic_type_items, + // combo box item + `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso") + ); + } + map task2label = $[ // combo box item "pxe" : _("Network Boot Image"), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org