November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41916 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 12:27:01 2007 New Revision: 41916 URL: http://svn.opensuse.org/viewcvs/yast?rev=41916&view=rev Log: - add GPG key to installation initrd on PPC architecture (#339449) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 12:27:01 2007 @@ -6,6 +6,7 @@ compressed patter files, generate packages.DU only up to the 3rd directory level (#335183) - copy PPC boot files in /suseboot, /ppc and /PS3 (#335177) +- add GPG key to installation initrd on PPC architecture (#339449) - install required package createrepo (#331530), install additional packages on PPC - fixed ISO image creation on PPC when the path contained spaces Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 12:27:01 2007 @@ -1790,6 +1790,37 @@ return ret; } +string DumpKernelFromObjectFile(string object) +{ + y2milestone("Extracting kernel from file %1", object); + string tmpdir = (string)SCR::Read(.target.tmpdir); + string target = tmpdir + "/tmp_kernel.gz"; + + string command = sformat("objcopy -O binary -j .kernel:vmlinux.strip '%1' '%2'", String::Quote(object), String::Quote(target)); + string ret = (Exec(command)) ? target : ""; + + y2milestone("Kernel extracted to %1", ret); + + return ret; +} + +string GunzipKernel(string kernel_gz) +{ + string command = sformat("gunzip -f %1", kernel_gz); + boolean success = Exec(command); + string ret = ""; + + // remove .gz suffix from the file name + if (success) + { + ret = regexpsub (kernel_gz, "^(.*)\\.gz$", "\\1"); + } + + y2milestone("Kernel unpacked to %1", ret); + + return ret; +} + global boolean InsertKeyToInitrds(string gpg_key, string base_dir) { // get initrd list @@ -1805,12 +1836,54 @@ find_output = out["stdout"]:""; } + map<string,string> inst_mapping = $[]; + if (SCR::Read(.target.size, base_dir + "/suseboot") >= 0) { y2milestone("Searching for 'initrd*' in %1/suseboot...", base_dir); command = sformat("cd '%1' && find suseboot -type f -name 'initrd*'", String::Quote(base_dir)); out = (map)SCR::Execute(.target.bash_output, command); find_output = find_output + out["stdout"]:""; + + if (size(out["stdout"]:"") == 0) + { + y2milestone("initrd not found, searching for inst*"); + + command = sformat("cd '%1' && find suseboot -type f -name 'inst32'; find suseboot -type f -name 'inst64'", String::Quote(base_dir)); + out = (map)SCR::Execute(.target.bash_output, command); + + list<string> inst_files = splitstring(out["stdout"]:"", "\n"); + // remove empty strings + inst_files = filter(string inst, inst_files, {return inst != "";}); + + if (size(inst_files) > 0) + { + y2milestone("Found inst* files: %1", inst_files); + + integer index = 0; + // unpack the initrd from the inst* object + foreach(string inst, inst_files, + { + string tmp_initrd = sformat("suseboot/.tmp_yast_initrd%1.gz", index); + + command = sformat("cd '%1' && objcopy -O binary -j .kernel:initrd '%2' '%3'", String::Quote(base_dir), String::Quote(inst), tmp_initrd); + + out = (map)SCR::Execute(.target.bash_output, command); + + if (out["exit"]:-1 == 0) + { + y2milestone("Extracted %1 from %2", tmp_initrd, inst); + find_output = find_output + tmp_initrd + "\n"; + + inst_mapping = add(inst_mapping, inst, tmp_initrd); + } + + index = index + 1; + } + ); + + } + } } list<string> initrds = splitstring(find_output, "\n"); @@ -1833,6 +1906,50 @@ } ); + // put the initrd back to the inst file + foreach(string orig_inst, string tmp_initrd, inst_mapping, + { + y2milestone("%1 -> %2", tmp_initrd, orig_inst); + + if (orig_inst == "suseboot/inst32" || orig_inst == "suseboot/inst64") + { + // extract kernel + string gzkernel = DumpKernelFromObjectFile(base_dir + "/" + orig_inst); + + if (gzkernel != "") + { + // unpack the kernel image - required by mkzimage + string kernel = GunzipKernel(gzkernel); + string tmp_dir = (string)SCR::Read( .target.tmpdir ); + + string initrd_copy = sformat("%1/tmp_initrd", tmp_dir); + + // copy the initrd to a temp dir - mkzimage doesn't work properly + // when there is a space in path + ret = ret && Exec(sformat("mv '%1/%2' '%3'", String::Quote(base_dir), tmp_initrd, initrd_copy)); + + // create new inst file + // see mk_ppc_installation-images_bootbinaries.sh (installation-images) + command = sformat("/bin/mkzimage --board chrp --vmlinux '%1' --initrd '%2' --output '%3/new_inst' --tmp '%3'", + kernel, initrd_copy, tmp_dir); + ret = ret && Exec(command); + + // remove the temporary files + command = sformat("rm -f '%1' '%2'", kernel, initrd_copy); + ret = ret && Exec(command); + + // move the new file to the target directory + command = sformat("mv '%1/new_inst' '%2/%3'", tmp_dir, String::Quote(base_dir), orig_inst); + ret = ret && Exec(command); + } + } + else + { + y2warning("Unsupported inst file: %1", orig_inst); + } + } + ); + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41915 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp src/complex.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 12:26:04 2007 New Revision: 41915 URL: http://svn.opensuse.org/viewcvs/yast?rev=41915&view=rev Log: - display download callbacks in the main window, no flashing popups (#338626) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/complex.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 12:26:04 2007 @@ -12,6 +12,8 @@ (#335164) - skip isolinux configuration when the architecture is not i386 or x86_64 (#335167) +- display download callbacks in the main window, no flashing popups + (#338626) ------------------------------------------------------------------- Fri Nov 2 11:13:58 CET 2007 - jsuchome(a)suse.cz Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 12:26:04 2007 @@ -2313,6 +2313,68 @@ y2debug("source_id: %1, url: %2, task: %3, error: %4, reason: %5", numeric_id, url, task, error, reason); } +global void InitDownload(string task) +{ + y2debug("InitDownload: %1", task); +} + +global void DestDownload() +{ + y2debug("DestDownload"); +} + +global void StartDownload (string url, string localfile) +{ + // reformat the URL + string url_report = URL::FormatURL(URL::Parse(url), 60); + + if (Mode::commandline()) { + CommandLine::PrintVerbose(url_report); + } + else + { + // change the label + UI::ChangeWidget(`id(`pb), `Label, sformat(_("Copying %1"), url_report)); + } +} + + +global void StartDownloadEmpty (string url, string localfile) +{ + y2debug("StartDownload: %1", url); +} + +global boolean ProgressDownload (integer percent, integer expected_size) +{ + return UI::PollInput() != `abort; +} + +global void RedirectCallbacks() +{ + Pkg::CallbackSourceReportStart("ProductCreator::CallbackSourceReportStart"); + Pkg::CallbackSourceReportProgress("ProductCreator::CallbackSourceReportProgress"); + Pkg::CallbackSourceReportEnd("ProductCreator::CallbackSourceReportEnd"); + + Pkg::CallbackInitDownload ("ProductCreator::InitDownload"); + Pkg::CallbackStartDownload ("ProductCreator::StartDownload"); + Pkg::CallbackProgressDownload ("ProductCreator::ProgressDownload"); + // use the standard callback handler + Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); + Pkg::CallbackDestDownload ("ProductCreator::DestDownload"); +} + +global void ResetCallbacks() +{ + Pkg::CallbackSourceReportStart("PackageCallbacks::CallbackSourceReportStart"); + Pkg::CallbackSourceReportProgress("PackageCallbacks::CallbackSourceReportProgress"); + Pkg::CallbackSourceReportEnd("PackageCallbacks::CallbackSourceReportEnd"); + + Pkg::CallbackInitDownload ("PackageCallbacks::InitDownload"); + Pkg::CallbackStartDownload ("PackageCallbacks::StartDownload"); + Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); + Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); + Pkg::CallbackDestDownload ("PackageCallbacks::DestDownload"); +} /** * CopyPackages() @@ -2328,13 +2390,10 @@ boolean ret = true; - // disable source report callbacks - there is a progress dialog - Pkg::CallbackSourceReportStart("ProductCreator::CallbackSourceReportStart"); - Pkg::CallbackSourceReportProgress("ProductCreator::CallbackSourceReportProgress"); - Pkg::CallbackSourceReportEnd("ProductCreator::CallbackSourceReportEnd"); - y2milestone("Package summary: %1", toCopy); + Pkg::CallbackStartDownload ("ProductCreator::StartDownloadEmpty"); + // copy the packages foreach(integer source, map<integer, list<map> > srcmapping, toCopy, { @@ -2420,10 +2479,7 @@ } ); - // restore the source report callbacks - Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); - Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); - Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + Pkg::CallbackStartDownload ("ProductCreator::StartDownload"); return ret; } Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Nov 9 12:26:04 2007 @@ -267,17 +267,29 @@ help ); - if(ProductCreator::Abort()) return `abort; + if(ProductCreator::Abort()) + { + ProductCreator::ResetCallbacks(); + return `abort; + } Progress::NextStage(); + // redirect the download callbacks + ProductCreator::RedirectCallbacks(); + if (!ProductCreator::CreateSkeleton()) { Report::Error(_("Error while creating skeleton.")); + ProductCreator::ResetCallbacks(); return `overview; } - if(ProductCreator::Abort()) return `abort; + if(ProductCreator::Abort()) + { + ProductCreator::ResetCallbacks(); + return `abort; + } Progress::NextStage(); if (ProductCreator::Config["pkgtype"]:"" == "autoyast") { @@ -301,6 +313,7 @@ Progress::NextStage(); if (!ProductCreator::CopyPackages()) { + ProductCreator::ResetCallbacks(); return `overview; } @@ -309,6 +322,7 @@ Progress::NextStage(); if (!ProductCreator::SignSourceStep()) { + ProductCreator::ResetCallbacks(); return `overview; } } @@ -363,6 +377,9 @@ } } until (ret == `next || ret == `back || ret == `abort); + + ProductCreator::ResetCallbacks(); + return (symbol)ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41914 - in /trunk/live-installer: package/yast2-live-installer.changes src/live-installer.ycp
by jsrain＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: jsrain Date: Fri Nov 9 12:24:48 2007 New Revision: 41914 URL: http://svn.opensuse.org/viewcvs/yast?rev=41914&view=rev Log: removed hack for product name initialization (#297609) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Fri Nov 9 12:24:48 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 9 12:24:27 CET 2007 - jsrain(a)suse.cz + +- removed hack for product name initialization (#297609) + +------------------------------------------------------------------- Fri Nov 2 16:41:13 CET 2007 - locilka(a)suse.cz - Adjusted RPM dependencies, adjusted YCP clients (YCP module Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Fri Nov 9 12:24:48 2007 @@ -59,10 +59,6 @@ } } - - // FIXME hack because of bootloader - libzypp does not contain product database - Product::name = "openSUSE"; - list<map> stage_mode = [ $["stage": "initial", "mode": "live_installation" ], $["stage": "continue", "mode": "live_installation" ] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41913 - in /trunk/yast2: library/packages/src/Product.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: jsrain Date: Fri Nov 9 12:23:59 2007 New Revision: 41913 URL: http://svn.opensuse.org/viewcvs/yast?rev=41913&view=rev Log: initialize product name during live installation properly (#297609) Modified: trunk/yast2/library/packages/src/Product.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/Product.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Produ… ============================================================================== --- trunk/yast2/library/packages/src/Product.ycp (original) +++ trunk/yast2/library/packages/src/Product.ycp Fri Nov 9 12:23:59 2007 @@ -112,7 +112,7 @@ */ global define void Product () ``{ - if (Stage::initial ()) + if (Stage::initial () && ! Mode::live_installation ()) { // it should use the same mechanism as running system. But it would // mean to initialize package manager from constructor, which is Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 9 12:23:59 2007 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Fri Nov 9 10:22:30 CET 2007 - jsrain(a)suse.cz +Fri Nov 9 12:23:00 CET 2007 - jsrain(a)suse.cz - added manpage for yast (#336004) +- initialize product name during live installation properly + (#297609) ------------------------------------------------------------------- Wed Nov 7 20:59:53 CET 2007 - mzugec(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41912 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 12:18:47 2007 New Revision: 41912 URL: http://svn.opensuse.org/viewcvs/yast?rev=41912&view=rev Log: - compress metadata if needed, replace the old one, support compressed patter files, generate packages.DU only up to the 3rd directory level (#335183) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 12:18:47 2007 @@ -2,6 +2,9 @@ Fri Nov 9 10:36:55 CET 2007 - lslezak(a)suse.cz - properly download /boot, /docu and slideshow files (#338625) +- compress metadata if needed, replace the old one, support + compressed patter files, generate packages.DU only up to + the 3rd directory level (#335183) - copy PPC boot files in /suseboot, /ppc and /PS3 (#335177) - install required package createrepo (#331530), install additional packages on PPC Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 12:18:47 2007 @@ -32,6 +32,7 @@ import "GPGWidgets"; import "Mode"; import "CommandLine"; +import "FileUtils"; global define void enableSources(); @@ -1685,12 +1686,14 @@ files = []; } - files = filter(string f, files, {return regexpmatch(f, "\\.pat$");}); + files = filter(string f, files, {return regexpmatch(f, "\\.pat$") || regexpmatch(f, "\\.pat.gz$");}); y2milestone("found pattern files: %1", files); - list<string> used_files_regexps = maplist(string p, used_patterns, {return sformat("^%1-.*\\.pat$", p);}); - y2debug("used_files_regexps: %1", used_files_regexps); + list<string> used_files_regexps = (list<string>)union(maplist(string p, used_patterns, {return sformat("^%1-.*\\.pat$", p);}), + maplist(string p, used_patterns, {return sformat("^%1-.*\\.pat.gz$", p);})); + + y2internal("used_files_regexps: %1", used_files_regexps); boolean refresh_diryast = false; foreach(string f, files, @@ -1726,9 +1729,8 @@ success = success && Exec(cmd); y2debug("success: %1", success); - cmd = sformat("cd '%1/%2'; ls *.pat > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir)); - success = success && Exec(cmd); - y2debug("success: %1", success); + cmd = sformat("cd '%1/%2'; ls *.pat *.pat.gz > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir)); + Exec(cmd); } } @@ -2402,8 +2404,18 @@ else { // TODO FIXME get datadir from the source - ret = ret && Exec(sformat("cd '%1/%2/%3' && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", + ret = ret && Exec(sformat("cd '%1/%2/%3' && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV -M 3", String::Quote(basedir), String::Quote(subdir), String::Quote(datadir))); + + // check if the metadata are gzipped + boolean compressed_meta = FileUtils::Exists(sformat("%1/%2/%3/setup/descr/packages.DU.gz", basedir, subdir, datadir)); + y2internal("Compressed metadata: %1", compressed_meta); + + if (compressed_meta) + { + ret = ret && Exec(sformat("cd '%1/%2/%3/setup/descr/' && gzip -9 -f packages packages.DU packages.en", + String::Quote(basedir), String::Quote(subdir), String::Quote(datadir))); + } } } ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41911 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/inst_autosetup.ycp src/modules/AutoInstall.ycp
by ug＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: ug Date: Fri Nov 9 12:03:42 2007 New Revision: 41911 URL: http://svn.opensuse.org/viewcvs/yast?rev=41911&view=rev Log: copy modified profile to the installed system too (#328837) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Nov 9 12:03:42 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 9 12:02:40 CET 2007 - ug(a)suse.de + +- copy modified profile to the installed system too (#328837) + +------------------------------------------------------------------- Wed Nov 7 16:27:03 CET 2007 - ug(a)suse.de - some hardware information for rules was not probed (#336339) Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Fri Nov 9 12:03:42 2007 @@ -47,7 +47,11 @@ ")); return `abort; } - string cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); + string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); + y2milestone("moving original profile: %1",cpcmd); + SCR::Execute(.target.bash, cpcmd); + + cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); y2milestone("moving modified profile: %1",cpcmd); SCR::Execute(.target.bash, cpcmd); return `found; Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Fri Nov 9 12:03:42 2007 @@ -126,10 +126,15 @@ } SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", - AutoinstConfig::xml_tmpfile , destdir , AutoinstConfig::xml_file) ); + "/tmp/profile/autoinst.xml" , destdir , AutoinstConfig::xml_file) ); SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", destdir , AutoinstConfig::xml_file) ); + SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", + AutoinstConfig::profile_dir+"/pre-autoinst.xml" , destdir , AutoinstConfig::cache) ); + SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", + destdir , AutoinstConfig::cache+"/pre-autoinst.xml") ); + return; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41910 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 11:29:26 2007 New Revision: 41910 URL: http://svn.opensuse.org/viewcvs/yast?rev=41910&view=rev Log: - copy PPC boot files in /suseboot, /ppc and /PS3 (#335177) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 11:29:26 2007 @@ -2,6 +2,7 @@ Fri Nov 9 10:36:55 CET 2007 - lslezak(a)suse.cz - properly download /boot, /docu and slideshow files (#338625) +- copy PPC boot files in /suseboot, /ppc and /PS3 (#335177) - install required package createrepo (#331530), install additional packages on PPC - fixed ISO image creation on PPC when the path contained spaces Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 11:29:26 2007 @@ -896,9 +896,86 @@ 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"); + + list<string> lst = GetList(srcid, 1, ""); + if (lst == nil) + { + lst = []; + } + + boolean ret = true; + + if (contains(lst, "ppc/")) + { + y2internal("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); + + if (!r) + { + y2internal("Directory listing may be missing, copying /ppc/bootinfo.txt"); + CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); + } + + ret = ret && r; + } + + if (contains(lst, "PS3/")) + { + y2internal("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/PS3", target); + + if (!r) + { + y2internal("Directory listing may be missing, copying /ppc/bootinfo.txt"); + Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target))); + CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros"); + } + + ret = ret && r; + } + + if (contains(lst, "suseboot/")) + { + y2internal("Copying /suseboot subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); + y2internal("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" + ]; + + y2internal("Directory listing may be missing using fixed list: %1", files); + + foreach(string f, files, + { + CopyFile(srcid, 1, f, target + f); + } + ); + } + + ret = ret && r; + } + + if (contains(lst, "etc/")) + { + y2internal("Copying /etc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/etc", target); + + if (!r) + { + y2internal("Directory listing may be missing, copying /etc/yaboot.conf"); + CopyFile(srcid, 1, "/etc/yaboot.conf", target + "/etc"); + } + + ret = ret && r; + } + + return ret; } string UpDir(string input) @@ -1122,9 +1199,12 @@ integer base_source = checkProductDependency(); boolean bootable_product = isBootSource(base_source); - if (bootable_product) + // ppc64 has /boot/ppc + string boot_architecture = (arch == "ppc64") ? "ppc" : arch; + + if (bootable_product && Config["code10"]:false) { - Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); + Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(boot_architecture))); } list<integer> enabled = Pkg::SourceGetCurrent(true); @@ -1150,7 +1230,7 @@ } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/PS3'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); } @@ -1406,6 +1486,13 @@ CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); } } + else if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(base_source, skel_root); + + // recursive copy of /boot + CopyDirectoryRec(base_source, 1, "boot", skel_root); + } else { // recursive copy of /boot/loader/* @@ -1414,7 +1501,12 @@ } else { - CopyDirectoryRec(base_source, 1, "/boot", skel_root); + CopyDirectoryRec(base_source, 1, "boot", skel_root); + + if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(base_source, skel_root); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41909 - in /trunk/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 11:22:12 2007 New Revision: 41909 URL: http://svn.opensuse.org/viewcvs/yast?rev=41909&view=rev Log: - properly download /boot, /docu and slideshow files (#338625) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 11:22:12 2007 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Fri Nov 9 10:36:55 CET 2007 - lslezak(a)suse.cz +- properly download /boot, /docu and slideshow files (#338625) - install required package createrepo (#331530), install additional packages on PPC - fixed ISO image creation on PPC when the path contained spaces Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 11:22:12 2007 @@ -785,38 +785,64 @@ 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); - string local_dir = Pkg::SourceProvideDir(srcid, mid, src); + string local_dir = Pkg::SourceProvideDirectory(srcid, mid, src, optional, true); y2milestone("local_dir: %1", local_dir); 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 CopyDirectoryNonRec(integer srcid, integer mid, string src, string 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); +} + +list<string> GetList(integer srcid, integer mid, string dir) { // get file list from directory.yast - string file_list = Pkg::SourceProvideOptionalFile(srcid, 1, "directory.yast"); + string file_list = Pkg::SourceProvideOptionalFile(srcid, mid, sformat("%1/directory.yast", dir)); if (file_list == nil || file_list == "") { y2error("directory.yast was not found, a YUM source?"); - return false; + return nil; } string f = (string)SCR::Read(.target.string, file_list); list<string> files = splitstring(f, "\n"); y2milestone("Remote objects: %1", files); + return files; +} + +boolean CopyDirectoryNonRec(integer srcid, integer mid, string src, string target) +{ + // get file list from directory.yast + list<string> files = GetList(srcid, mid, ""); + if (files == nil) + { + files = []; + } + files = filter(string file, files, {return !regexpmatch(file, "/$") && file != "";}); y2milestone("Remote files: %1", files); @@ -830,6 +856,44 @@ return true; } +boolean CopyDocu(integer srcid, string target) +{ + list<string> lst = GetList(srcid, 1, ""); + if (lst == nil) + { + lst = []; + } + + boolean ret = true; + + if (contains(lst, "docu/")) + { + y2milestone("Copying /docu subdirectory"); + Exec(sformat("/bin/mkdir -p '%1/docu'", String::Quote(target))); + + boolean r = CopyDirectoryRecOpt(srcid, 1, "/docu", target); + + if (!r) + { + list<string> files = [ + "docu/RELEASE-NOTES.en.html", "docu/RELEASE-NOTES.en.rtf" + ]; + + y2internal("Directory listing may be missing using fixed list: %1", files); + + foreach(string f, files, + { + CopyFile(srcid, 1, f, target + f); + } + ); + } + + ret = ret && r; + } + + return ret; +} + boolean CopyPPCBoot(integer srcid, string target) { return CopyDirectoryRec(srcid, 1, "/ppc", target) @@ -1124,6 +1188,9 @@ if (source == "") return false; + // copy /docu (release notes) when present + CopyDocu(id, skel_root); + y2milestone("source: %1", source); descr_dir = this_source["productData","descrdir"]:"suse/setup/descr"; @@ -1384,13 +1451,13 @@ string l_dirlist = Pkg::SourceProvideOptionalFile(source_id, 1, slidedir + "directory.yast"); if (l_dirlist != nil) { - string l_slidedir = Pkg::SourceProvideDir(source_id, 1, slidedir); + string l_slidedir = Pkg::SourceProvideDirectory(source_id, 1, slidedir, true, true); if (l_slidedir != nil && l_slidedir != "") { // copy slide show Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); - Exec(sformat("/bin/cp -a -- '%1/*' '%2/%3'", String::Quote(l_slidedir), String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("/bin/cp -a -- '%1' '%2/%3'", String::Quote(l_slidedir), String::Quote(skel_root), String::Quote(datadir + "/setup/"))); } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41908 - in /trunk/devtools: devtools/bin/Makefile.am devtools/bin/check_deps package/yast2-devtools.changes
by locilka＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: locilka Date: Fri Nov 9 11:11:30 2007 New Revision: 41908 URL: http://svn.opensuse.org/viewcvs/yast?rev=41908&view=rev Log: - Addded new check_deps script for basic checking of imported YCP or Perl (YaST) modules. Added: trunk/devtools/devtools/bin/check_deps (with props) Modified: trunk/devtools/devtools/bin/Makefile.am trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/devtools/bin/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/Makefile.a… ============================================================================== --- trunk/devtools/devtools/bin/Makefile.am (original) +++ trunk/devtools/devtools/bin/Makefile.am Fri Nov 9 11:11:30 2007 @@ -28,7 +28,8 @@ y2compile \ y2makeall \ y2makepot \ - check_icons + check_icons \ + check_deps EXTRA_DIST = $(bin_SCRIPTS) $(ybin_SCRIPTS) $(pkgdata_SCRIPTS) version.in Added: trunk/devtools/devtools/bin/check_deps URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/check_deps… ============================================================================== --- trunk/devtools/devtools/bin/check_deps (added) +++ trunk/devtools/devtools/bin/check_deps Fri Nov 9 11:11:30 2007 @@ -0,0 +1,111 @@ +#!/bin/bash + +MODULES_DIRECTORY="/usr/share/YaST2/modules" + +# +# ==Authors== +# Lukas Ocilka <locilka(a)suse.cz> +# +# ==About== +# This script greps for all imported YCP or YaST-Perl modules +# and finds out to which RPM those YCP or Perl modules belong. +# +# ==Syntax== +# ./check_deps [src_directory [be_verbose [RPM_root]]] +# +# ==Usage== +# 1.) ./check_deps +# Writes all imported modules +# Writes all used RPMs +# +# 2.) ./check_deps /SVN/openSUSE_11.0/yast2-network/ +# Checks the /SVN/openSUSE_11.0/yast2-network/ directory +# +# 3.) ./check_deps . . +# Checks the current directory and it's more verbose +# (writes which module belongs to which RPM) +# +# 4.) ./check_deps . . /other_directory/ +# Checks the current directory and it's more verbose +# Information which module belongs to which RPM is taken +# from /other_directory/ directory (RPMs have to be installed +# there, not only copied, see `man rpm` and '--root'). +# + +CHECK_DIRECTORY=$1 + +BE_VERBOSE=$2 + +ROOT=$3 + +################################################################## + +if [ "${CHECK_DIRECTORY}" != "" ]; then + echo "Working in directory: "${CHECK_DIRECTORY} + cd "${CHECK_DIRECTORY}" +else + echo "Working in directory: "`pwd` +fi + +if [ "${ROOT}" == "" ]; then + ROOT="/" +fi +echo "Root: "${ROOT} + +TMPFILE=`mktemp` + +USED_MODULES_YCP=`grep -r "import \".*\"" * 2>/dev/null | \ + grep -v "$/\*\|//$.*import \".*\"" | \ + grep "\.ycp:" | \ + grep -v "$\.svn\|doc/\|testsuite\/\|.changes:$" | \ + sed 's/.*import "$[^"]*$".*/\1/' \ + >> ${TMPFILE} +` + +USED_MODULES_PERL=`grep -r "YaST::YCP::Import[^#]*\"" * * 2>/dev/null | \ + grep -v "#.*YaST::YCP::Import" | \ + grep "\.pm:" | \ + grep -v "$\.svn\|doc/\|testsuite\/\|.changes:$" | \ + sed 's/.*YaST::YCP::Import *( *"$[^"]*$" *).*/\1/' \ + >> ${TMPFILE} +` +USED_MODULES=`cat ${TMPFILE} | grep -v "^$SCR\|UI\|Pkg$$" | sort | uniq` +rm -rf ${TMPFILE} + +if [ "$USED_MODULES" == "" ]; then + echo "No imported YCP modules..." + exit 0; +fi + +echo +echo "All imported modules:" +echo "---------------------" +echo ${USED_MODULES} + +ALL_USED_MODULES="" +for MODULE in ${USED_MODULES}; do + if [ -e "${MODULES_DIRECTORY}/${MODULE}.ycp" ]; then + ALL_USED_MODULES=${ALL_USED_MODULES}" ${MODULES_DIRECTORY}/${MODULE}.ycp" + elif [ -e "${MODULES_DIRECTORY}/${MODULE}.pm" ]; then + ALL_USED_MODULES=${ALL_USED_MODULES}" ${MODULES_DIRECTORY}/${MODULE}.pm" + else + echo "Can't find ${MODULE} module!" + fi +done + +# echo ${ALL_USED_MODULES} + +echo +echo "All imported YaST packages:" +echo "---------------------------" +if [ "${BE_VERBOSE}" == "" ]; then + rpm --queryformat "%{NAME}\n" -qf ${ALL_USED_MODULES} | sort | uniq +else + OUTPUT="" + for MODULE in ${ALL_USED_MODULES}; do + OUTPUT="${OUTPUT}"`rpm --root=${ROOT} --queryformat "%{NAME}\n" -qf ${MODULE}`"\\tFile: ${MODULE}\\n" + done + echo -e ${OUTPUT} | sort +fi + +echo Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Nov 9 11:11:30 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 9 11:10:19 CET 2007 - locilka(a)suse.cz + +- Addded new check_deps script for basic checking of imported + YCP or Perl (YaST) modules. + +------------------------------------------------------------------- Wed Oct 10 14:34:01 CEST 2007 - mvidner(a)suse.cz - Suppresed portability warnings from automake. We know that we use -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41907 - /trunk/product-creator/src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: lslezak Date: Fri Nov 9 11:06:26 2007 New Revision: 41907 URL: http://svn.opensuse.org/viewcvs/yast?rev=41907&view=rev Log: - updated list of kernel packages Modified: trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Nov 9 11:06:26 2007 @@ -1958,18 +1958,22 @@ if (kernel == "") { kernels = [ "kernel-64k-pagesize", + "kernel-bigsmp", "kernel-pae", "kernel-debug", "kernel-default", "kernel-iseries64", "kernel-pmac64", "kernel-pseries64", + "kernel-ppc64", "kernel-s390", "kernel-s390x", "kernel-smp", "kernel-sn2", "kernel-xen", - "kernel-um" + "kernel-xenpae", + "kernel-um", + "kernel-vanilla" ]; } else { kernels = add(kernels, kernel); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0