[yast-commit] r57278 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/ProductCreator.ycp src/complex.ycp src/data/sysconfig.product-creator src/kiwi_dialogs.ycp
Author: jsuchome
Date: Thu May 21 09:53:48 2009
New Revision: 57278
URL: http://svn.opensuse.org/viewcvs/yast?rev=57278&view=rev
Log:
- merged changes from CODE11:
- added openssl-certs to default bootstrap section, so Update repos
can work (bnc#491475)
- read the whole kiwi process output (bnc#488799)
- make content file optional (for empty repos, bnc#500527)
- correct check for configuration type and version in templates
(bnc#498439)
- during configuration, do not throw away target image desctination
(bnc#499489)
- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE)
- added option to specify "additive" attribute to size (fate#305327)
- detect and report conflicts in selected and deleted package lists
(fate#305254)
- allow building i386 images on x86_64 system (fate#305327)
- 2.18.5
Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/Kiwi.ycp
trunk/product-creator/src/ProductCreator.ycp
trunk/product-creator/src/complex.ycp
trunk/product-creator/src/data/sysconfig.product-creator
trunk/product-creator/src/kiwi_dialogs.ycp
Modified: trunk/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=57278&r1=57277&r2=57278&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Thu May 21 09:53:48 2009
@@ -1 +1 @@
-2.18.4
+2.18.5
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=57278&r1=57277&r2=57278&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Thu May 21 09:53:48 2009
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Thu May 21 09:46:38 CEST 2009 - jsuchome@suse.cz
+
+- merged changes from CODE11:
+- added openssl-certs to default bootstrap section, so Update repos
+ can work (bnc#491475)
+- read the whole kiwi process output (bnc#488799)
+- make content file optional (for empty repos, bnc#500527)
+- correct check for configuration type and version in templates
+ (bnc#498439)
+- during configuration, do not throw away target image desctination
+ (bnc#499489)
+- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE)
+- added option to specify "additive" attribute to size (fate#305327)
+- detect and report conflicts in selected and deleted package lists
+ (fate#305254)
+- allow building i386 images on x86_64 system (fate#305327)
+- 2.18.5
+
+-------------------------------------------------------------------
Wed Apr 22 08:03:46 CEST 2009 - jsuchome@suse.cz
- look primary into base product for isolinux.cfg (bnc#496263)
Modified: trunk/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=57278&r1=57277&r2=57278&view=diff
==============================================================================
--- trunk/product-creator/src/Kiwi.ycp (original)
+++ trunk/product-creator/src/Kiwi.ycp Thu May 21 09:53:48 2009
@@ -11,12 +11,14 @@
textdomain "product-creator";
+ import "Arch";
import "Directory";
import "FileUtils";
import "Label";
import "Message";
import "Package";
import "Popup";
+ import "ProductCreator";
import "Progress";
import "Report";
import "Security";
@@ -42,6 +44,9 @@
// bug 331733
global string supported_boot_images = "";
+ // target architecture of image (can be only i386 if different from current one)
+ global string image_architecture = "";
+
// directories with user-made templated
global list<string> templates_dirs = [];
@@ -446,7 +451,10 @@
UI::ChangeWidget (`id(`errlog), `LastLine, err + "\n");
}
- string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir);
+ string linux32 = "";
+ if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386")
+ linux32 = "linux32";
+ string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32);
if (selected_profiles != "" && selected_profiles != nil)
cmd = cmd + selected_profiles;
@@ -462,6 +470,13 @@
if (SCR::Read(.process.running, id) != true)
{
update_output ();
+ // explicitely check the process buffer after exit (bnc#488799)
+ string buf = (string) SCR::Read (.process.read, id);
+ string err_buf = (string) SCR::Read (.process.read_stderr, id);
+ if (buf != nil && buf != "")
+ UI::ChangeWidget (`id(`log), `LastLine, buf + "\n");
+ if (err_buf != nil && err_buf != "")
+ UI::ChangeWidget (`id(`errlog), `LastLine, err_buf + "\n");
integer status = (integer) SCR::Read (.process.status, id);
if (status != 0)
@@ -481,7 +496,8 @@
// now continue with creating
UI::ChangeWidget (`id(`log), `LastLine, "\n");
- cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir);
+ cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal",
+ chroot_dir, out_dir, linux32);
y2milestone ("calling '%1'", cmd);
// label
UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image"))));
@@ -618,10 +634,10 @@
if (config != nil && config != $[])
{
string name = config["name"]:"";
- string ver = config["version"]:"";
- if (config["image_type"]:"" != "system")
+ string ver = get_preferences (config, "version", "");
+ if (config["description",0,"type"]:"" != "system")
y2warning ("%1 not a 'system' image type, skipping", name);
- else if (name_version[name]:"" == ver)
+ else if (name_version[name]:nil == ver)
y2warning ("template %1,%2 already imported", name, ver);
else
{
@@ -647,6 +663,13 @@
(string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES);
if (supported_boot_images == nil)
supported_boot_images = "";
+ string architecture =
+ (string) SCR::Read (.sysconfig.product-creator.DEFAULT_IMAGE_ARCHITECTURE);
+ if (architecture == "" || architecture == nil)
+ architecture = ProductCreator::GetArch ();
+ if (architecture != "x86_64") // all i[456]86 are i386...
+ architecture = "i386";
+ image_architecture = architecture;
return ReadImageTemplates ();
}
}
Modified: trunk/product-creator/src/ProductCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=57278&r1=57277&r2=57278&view=diff
==============================================================================
--- trunk/product-creator/src/ProductCreator.ycp (original)
+++ trunk/product-creator/src/ProductCreator.ycp Thu May 21 09:53:48 2009
@@ -435,7 +435,8 @@
return content_cache[srcid]:$[];
}
- string content = Pkg::SourceProvideFile(srcid, 1, "content");
+ // make content file optional (for empty repos, bnc#500527)
+ string content = Pkg::SourceProvideOptionalFile(srcid, 1, "content");
map
participants (1)
-
jsuchome@svn.opensuse.org