Author: jsuchome Date: Thu Jan 21 17:03:42 2010 New Revision: 60470 URL: http://svn.opensuse.org/viewcvs/yast?rev=60470&view=rev Log: - correctly copy PPC files for bootable medias (bnc#561751) - do not copy /etc, /PS3 directories - do not write TRANS.TBL checksum into content file - 2.13.17 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION?rev=60470&r1=60469&r2=60470&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION Thu Jan 21 17:03:42 2010 @@ -1 +1 @@ -2.13.16 +2.13.17 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes?rev=60470&r1=60469&r2=60470&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes Thu Jan 21 17:03:42 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 14 07:34:27 CET 2010 - jsuchome@suse.cz + +- correctly copy PPC files for bootable medias (bnc#561751) +- do not copy /etc, /PS3 directories +- do not write TRANS.TBL checksum into content file +- 2.13.17 + +------------------------------------------------------------------- Wed Apr 22 17:00:35 CEST 2009 - lslezak@suse.cz - register Pkg::CallbackSourceReportInit/Destroy() callbacks - Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp?rev=60470&r1=60469&r2=60470&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp Thu Jan 21 17:03:42 2010 @@ -471,7 +471,7 @@ { // generate new sha1 sums for files in descr subdirectory // remove './' from the file names, ignore directory.yast file, sort the output - string command = sformat("(cd '%1/%2' && find . -type f -exec sha1sum \\{\\} \\; | sed -e 's#^\\(.\\{40\\}\\) ./#META SHA1 \\1 #' | grep -v '^.\\{40\\} directory.yast$' | LC_ALL=C sort -k 2)", String::Quote(dir), String::Quote(product_dir)); + string command = sformat("(cd '%1/%2' && find . -type f -exec sha1sum \\{\\} \\; | sed -e 's#^\\(.\\{40\\}\\) ./#META SHA1 \\1 #' | grep -Ev '( directory.yast$| TRANS.TBL$)' | LC_ALL=C sort -k 2)", String::Quote(dir), String::Quote(product_dir)); y2milestone("Generating SHA1 sums: %1", command); @@ -600,7 +600,7 @@ return true; } -boolean CopyDirectoryRec(integer srcid, integer mid, string src, string target) +boolean CopyDirectoryR(integer srcid, integer mid, string src, string target, boolean optional) { y2milestone("CopyDirectoryRec: srcid: %1, mid: %2, src: %3, target: %4", srcid, mid, src, target); @@ -609,14 +609,29 @@ if (local_dir == nil || local_dir == "") { - // an error message, %1 is the directory, %2 is URL of the source - Report::Error(sformat(_("Cannot read directory %1\nfrom source %2."), src, Pkg::SourceGeneralData(srcid)["url"]:"")); + if (!optional) + { + // an error message, %1 is the directory, %2 is URL of the source + Report::Error(sformat(_("Cannot read directory %1\nfrom source %2."), src, Pkg::SourceGeneralData(srcid)["url"]:"")); + } + return false; } return Exec(sformat("/bin/cp -a -f -- '%1' '%2'", String::Quote(local_dir), String::Quote(target))); } +boolean CopyDirectoryRec(integer srcid, integer mid, string src, string target) +{ + return CopyDirectoryR(srcid, mid, src, target, false); +} + +boolean CopyDirectoryRecOpt(integer srcid, integer mid, string src, string target) +{ + return CopyDirectoryR(srcid, mid, src, target, true); +} + + boolean CopyDirectoryNonRec(integer srcid, integer mid, string src, string target) { // get file list from directory.yast @@ -647,9 +662,44 @@ boolean CopyPPCBoot(integer srcid, string target) { - return CopyDirectoryRec(srcid, 1, "/ppc", target) - && CopyDirectoryRec(srcid, 1, "/etc", target) - && CopyDirectoryRec(srcid, 1, "/suseboot", target); + y2milestone("Copying PPC boot files"); + boolean ret = true; + + y2milestone("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); + + if (!r) + { + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); + } + + ret = ret && r; + + y2milestone("Copying /suseboot subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); + y2milestone("Result: %1", r); + + if (!r) + { + list<string> files = [ + "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", + "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", + "/suseboot/yaboot.txt" + ]; + + y2milestone("Directory listing may be missing using fixed list: %1", files); + + foreach(string f, files, + { + CopyOptionalFile(srcid, 1, f, target + f); + } + ); + } + + ret = ret && r; + + return ret; } string UpDir(string input) @@ -761,7 +811,6 @@ } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p %1/etc", skel_root)); Exec(sformat("/bin/mkdir -p %1/ppc", skel_root)); Exec(sformat("/bin/mkdir -p %1/suseboot", skel_root)); } @@ -981,6 +1030,13 @@ CopyDirectoryRec(source_id, 1, "boot/loader", sformat("%1/boot", skel_root)); } } + else if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(source_id, skel_root); + + // recursive copy of /boot + CopyDirectoryRec(source_id, 1, "boot", skel_root); + } else { // recursive copy of /boot/loader/* @@ -990,6 +1046,10 @@ else { CopyDirectoryRec(source_id, 1, "/boot", skel_root); + if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(source_id, skel_root); + } } } Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp?rev=60470&r1=60469&r2=60470&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp Thu Jan 21 17:03:42 2010 @@ -58,7 +58,7 @@ "isolinux": $[ `abort : `abort, `next : "packagemanager", - `autoyast : "summary" + `autoyast : "gpgkey" ], "packagemanager": $[ `abort : `abort, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org