Author: jsuchome Date: Mon Sep 17 21:00:14 2007 New Revision: 40950 URL: http://svn.opensuse.org/viewcvs/yast?rev=40950&view=rev Log: - support s390x architecture (#301362) - 2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION?rev=40950&r1=40949&r2=40950&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION Mon Sep 17 21:00:14 2007 @@ -1 +1 @@ -2.13.12 +2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes?rev=40950&r1=40949&r2=40950&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes Mon Sep 17 21:00:14 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 17 20:51:40 CEST 2007 - jsuchome@suse.cz + +- support s390x architecture (#301362) +- 2.13.13 + +------------------------------------------------------------------- Thu Jul 26 08:22:32 CEST 2007 - lslezak@suse.cz - always store isolinux.cfg into the config file, even if there Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp?rev=40950&r1=40949&r2=40950&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp Mon Sep 17 21:00:14 2007 @@ -368,7 +368,10 @@ } else { - bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", Arch::architecture()); + string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; + + bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); list<integer> srcids = UrlToId([Config["sources", 0]:""]); @@ -707,6 +710,7 @@ integer sles_src = 0; string descr_dir = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1306,6 +1310,7 @@ string cpCmd = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") { Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp?rev=40950&r1=40949&r2=40950&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Mon Sep 17 21:00:14 2007 @@ -500,9 +500,11 @@ y2milestone("content file: %1", read_content); boolean found_architecture = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; foreach(string key, string value, read_content, { - if (key == "ARCH." + Arch::architecture()) + if (key == "ARCH." + arch); { found_architecture = true; break; @@ -523,7 +525,7 @@ } else { - Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), Arch::architecture())); + Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), arch)); } } else if (ret == `remove) @@ -630,6 +632,9 @@ define void CheckCode10Source() { + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; + boolean code10 = false; foreach (string url , CDCreator::Config["sources"]:[], { @@ -647,7 +652,7 @@ { list<string> items = splitstring(dir_listing, "\n"); - code10 = code10 || contains(items, Arch::architecture() + "/"); + code10 = code10 || contains(items, arch + "/"); } } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org