Author: jsuchome Date: Fri Feb 20 09:47:53 2009 New Revision: 55629 URL: http://svn.opensuse.org/viewcvs/yast?rev=55629&view=rev Log: - adapted kiwi templates for 11.1 (bnc#477645) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/data/kiwi_templates/xen/config.xml trunk/product-creator/src/kiwi_dialogs.ycp 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=55629&r1=55628&r2=55629&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Feb 20 09:47:53 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 20 09:46:56 CET 2009 - jsuchome@suse.cz + +- adapted kiwi templates for 11.1 (bnc#477645) + +------------------------------------------------------------------- Wed Feb 11 14:48:37 CET 2009 - coolo@suse.de - buildrequire yast2-slp to fix build 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=55629&r1=55628&r2=55629&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Fri Feb 20 09:47:53 2009 @@ -6,11 +6,11 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.0" flags="unified">iso</type> - <type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type> - <type boot="usbboot/suse-11.0" filesystem="ext3">usb</type> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> - <type boot="oemboot/suse-11.0" filesystem="ext3" flags="unified">oem</type> + <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> + <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type> + <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> + <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> Modified: trunk/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/xen/config.xml?rev=55629&r1=55628&r2=55629&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/config.xml Fri Feb 20 09:47:53 2009 @@ -6,7 +6,7 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> + <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=55629&r1=55628&r2=55629&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Feb 20 09:47:53 2009 @@ -22,6 +22,7 @@ import "ProductCreator"; import "SourceDialogs"; import "SourceManager"; + import "String"; import "Summary"; import "URL"; import "Wizard"; @@ -1249,33 +1250,19 @@ ProductCreator::Config["taboo"] = maplist ( map pat, sw_contents["ignore"]:[], ``(pat["name"]:"")); } - map label2boot = $[ - "openSUSE 10.2" : "suse-10.2", - "openSUSE 10.3" : "suse-10.3", "openSUSE 11.0" : "suse-11.0", - "SUSE Linux 10.1" : "suse-10.1", + "openSUSE 11.1" : "suse-11.1", "SUSE Linux Enterprise Server 10" : "suse-SLES10", "SUSE Linux Enterprise Desktop 10" : "suse-SLED10", "SUSE Linux Enterprise Desktop 10 SP2" : "suse-SLED10-SP2", "SUSE Linux Enterprise Server 10 SP2" : "suse-SLES10-SP2", + "SUSE Linux Enterprise Server 11" : "suse-SLES11", + "SUSE Linux Enterprise Desktop 11" : "suse-SLED11", ]; - map distproduct2boot = $[ - "openSUSE-10.2-CD-download" : "suse-10.2", - "openSUSE-10.2-dvd5-download" : "suse-10.2", - "openSUSE-10.3-dvd5-download" : "suse-10.3", - "openSUSE-10.3-CD-download" : "suse-10.3", - "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", - "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", - "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", - "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", - "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1", - "SUSE-Linux-Enterprise-Server-SP2" : "suse-SLES10-SP2", - "SUSE-Linux-Enterprise-Desktop-SP2" : "suse-SLED10-SP2", - ]; - string boot_image = label2boot[content["LABEL"]:""]:""; - if (boot_image == "") - boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; + string contentlabel = String::CutBlanks (content["LABEL"]:""); + string boot_image = label2boot[contentlabel]:""; +// FIXME this actually is not used at all, only the one from template... :-( // guess some default boot image value if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org