Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Sat Aug 2 01:54:21 CEST 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-07-24 14:04:30.000000000 +0200
+++ yast2-product-creator/yast2-product-creator.changes 2008-08-01 15:43:57.483716000 +0200
@@ -1,0 +2,12 @@
+Fri Aug 1 15:36:32 CEST 2008 - jsuchome@suse.cz
+
+- Image Creator: added GUI to configure image compression
+- 2.17.5
+
+-------------------------------------------------------------------
+Fri Jul 25 13:02:44 CEST 2008 - jsuchome@suse.cz
+
+- read the default information for new type from the template
+- .background agent replaced by .process
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.17.4.tar.bz2
New:
----
yast2-product-creator-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.VL2848/_old 2008-08-02 01:53:22.000000000 +0200
+++ /var/tmp/diff_new_pack.VL2848/_new 2008-08-02 01:53:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.17.4)
+# spec file for package yast2-product-creator (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-product-creator
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.17.4.tar.bz2
+Source0: yast2-product-creator-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-product-creator-2.17.4
+%setup -n yast2-product-creator-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,12 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Fri Aug 01 2008 jsuchome@suse.cz
+- Image Creator: added GUI to configure image compression
+- 2.17.5
+* Fri Jul 25 2008 jsuchome@suse.cz
+- read the default information for new type from the template
+- .background agent replaced by .process
* Thu Jul 24 2008 jsuchome@suse.cz
- adapted to last version of ag_anyxml (bnc#409491)
- Image Creator: allow more configurations with same name
++++++ yast2-product-creator-2.17.4.tar.bz2 -> yast2-product-creator-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/src/complex.ycp new/yast2-product-creator-2.17.5/src/complex.ycp
--- old/yast2-product-creator-2.17.4/src/complex.ycp 2008-07-23 13:50:20.000000000 +0200
+++ new/yast2-product-creator-2.17.5/src/complex.ycp 2008-07-24 14:02:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 48389 2008-06-18 11:24:45Z jsuchome $
+ * $Id: complex.ycp 49386 2008-07-24 11:04:45Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.17.5/src/data/kiwi_templates/iso/config.xml
--- old/yast2-product-creator-2.17.4/src/data/kiwi_templates/iso/config.xml 2008-06-13 15:00:32.000000000 +0200
+++ new/yast2-product-creator-2.17.5/src/data/kiwi_templates/iso/config.xml 2008-07-25 09:33:05.000000000 +0200
@@ -8,7 +8,7 @@
<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="usboot/suse-11.0" filesystem="ext3">usb</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>
<version>1.0.0</version>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/src/kiwi_dialogs.ycp new/yast2-product-creator-2.17.5/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.17.4/src/kiwi_dialogs.ycp 2008-07-24 13:56:11.000000000 +0200
+++ new/yast2-product-creator-2.17.5/src/kiwi_dialogs.ycp 2008-08-01 15:36:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 48332 2008-06-16 12:31:12Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 49408 2008-07-25 08:14:04Z jsuchome $
*/
{
textdomain "product-creator";
@@ -58,6 +58,54 @@
* widget handlers
****************************************************************************/
+ define void InitCompressionCombo (string id) {
+
+ string current_method = "none";
+ foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], {
+ if (typemap[content_key]:"" == kiwi_task)
+ {
+ current_method = typemap["flags"]:current_method;
+ }
+ });
+ map methods = $[
+ "unified" : "unified",
+ "compressed" : "compressed",
+ "unified-cromfs" : "unified-cromfs",
+ "compressed-cromfs" : "compressed-cromfs",
+ // combo box label
+ "none" : _("None")
+ ];
+ list items = maplist (string method, string label, methods, {
+ return `item (`id (method), label, method == current_method);
+ });
+ UI::ChangeWidget (`id (id), `Items, items);
+ }
+
+ define void StoreCompressionCombo (string key, map event) {
+
+ string selected = (string) UI::QueryWidget (`id (key), `Value);
+ KiwiConfig["preferences",0,"type"] = maplist (map typemap,
+ (list<map>)KiwiConfig["preferences",0,"type"]:[],
+ {
+ if (typemap[content_key]:"" == kiwi_task)
+ {
+ if (selected == "none")
+ {
+ if (haskey (typemap, "flags"))
+ typemap = remove (typemap, "flags");
+ }
+ else
+ typemap["flags"] = selected;
+ }
+ return typemap;
+ });
+ }
+
+ define symbol HandleCompressionCombo (string key, map event) {
+ if (event["ID"]:nil == `next) StoreCompressionCombo (key, event);
+ return nil;
+ }
+
/**
* Initialize the widget with ignored packages
*/
@@ -1134,18 +1182,25 @@
return typemap;
});
// add the new type, that was not previously defined in config.xml
- // FIXME the default values (format,filesystem...) are missing
+ // read the default values for this type from the template
if (!primary_included)
{
- string prefix = kiwi_task == "pxe" ? "net" : kiwi_task;
- boot_dir = substring (boot_dir, search (boot_dir, "/") + 1);
- KiwiConfig["preferences",0,"type"] = add (
- KiwiConfig["preferences",0,"type"]:[], $[
- content_key : kiwi_task,
- "boot" : prefix + "boot/" + boot_dir,
- "primary" : "true"
- ]
- );
+ if (default_dir == "")
+ {
+ default_dir =
+ Directory::datadir+"/product-creator/kiwi_templates/";
+ default_dir = default_dir + (kiwi_task== "xen" ? "xen" : "iso");
+ }
+ map def_map = Kiwi::ReadConfigXML (default_dir);
+ foreach (map typemap, (list<map>)def_map["preferences",0,"type"]:[],
+ {
+ if (typemap[content_key]:"" == kiwi_task)
+ {
+ KiwiConfig["preferences",0,"type"] = add (
+ KiwiConfig["preferences",0,"type"]:[], typemap);
+ break;
+ }
+ });
}
// save the info about packages and patterns into ProductCreator::Config
// ("sources" are already there...)
@@ -1226,14 +1281,10 @@
`VBox (
`VSpacing (0.2),
`HBox (
- `HWeight (1, "version"),
- `HWeight (1, `HBox ("size", "sizeunit"))
- /*
- `VBox (
- `Label (""), "compressed"
- FIXME compressed vs. unified
- )
- */
+ `HWeight (2, `HBox (
+ "version", "size", "sizeunit"
+ )),
+ `HWeight (1, "compression")
),
`HBox (
`HWeight (2, `VBox (
@@ -1248,7 +1299,7 @@
), `HSpacing(1)),
"widget_names" : [
"version",
- "size", "sizeunit", // "compressed",
+ "size", "sizeunit", "compression",
"sw_selection",
"rt_sw", "configure_sw",
"delete_sw",
@@ -1347,6 +1398,18 @@
"store" : StoreCompressCheckBox,
"handle" : HandleCompressCheckBox,
],
+ "compression" : $[
+ "widget" : `combobox,
+ "opt" : [ `hstretch, `notify ],
+ "items" : [],
+ // textentry label
+ "label" : _("Co&mpression"),
+ // help text
+ "help" :_("<p>Select the value for image <b>Compression</b>. This will modify the <i>flags</i> value of the image type. Check kiwi manual for the meaning of the available values.</p>"),
+ "init" : InitCompressionCombo,
+ "store" : StoreCompressionCombo,
+ "handle" : HandleCompressionCombo,
+ ],
"sw_selection" : $[
"widget" : `combobox,
"opt" : [ `hstretch, `notify ],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/src/Kiwi.ycp new/yast2-product-creator-2.17.5/src/Kiwi.ycp
--- old/yast2-product-creator-2.17.4/src/Kiwi.ycp 2008-07-07 15:08:53.000000000 +0200
+++ new/yast2-product-creator-2.17.5/src/Kiwi.ycp 2008-08-01 15:28:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel
*
- * $Id: Kiwi.ycp 48903 2008-07-07 13:10:26Z jsuchome $
+ * $Id: Kiwi.ycp 49414 2008-07-25 11:05:23Z jsuchome $
*/
{
module "Kiwi";
@@ -434,19 +434,16 @@
), `HSpacing(1.5)
));
+ integer id = -1;
+
void update_output () {
- // read the output line from irw:
- list<string> out = (list<string>)SCR::Read(.background.newout);
- foreach (string line, out, {
- line = String::Replace (line, "\r", "\n");
- UI::ChangeWidget (`id(`log), `LastLine, line + "\n");
- });
- list<string> err = (list<string>) SCR::Read(.background.newerr);
- foreach (string line, err, {
- line = String::Replace (line, "\r", "\n");
- UI::ChangeWidget (`id(`errlog), `LastLine, line + "\n");
- });
+ string line = (string)SCR::Read (.process.read_line, id);
+ if (line != nil && line != "")
+ UI::ChangeWidget (`id(`log), `LastLine, line + "\n");
+ string err = (string)SCR::Read (.process.read_line_stderr, id);
+ if (err!= nil && err != "")
+ 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);
@@ -455,23 +452,18 @@
y2milestone ("calling '%1'", cmd);
- SCR::Execute (.background.run_output_err, cmd);
+ id = (integer) SCR::Execute (.process.start_shell, cmd);
symbol ret = nil;
boolean creating = false;
do
{
ret = (symbol) UI::PollInput();
- if ((boolean) SCR::Read(.background.output_open) &&
- (integer) SCR::Read(.background.newlines)>0)
- {
- update_output ();
- }
- else if (!(boolean)SCR::Read(.background.isrunning))
+ if (SCR::Read(.process.running, id) != true)
{
update_output ();
- integer status = (integer) SCR::Read (.background.status);
+ integer status = (integer) SCR::Read (.process.status, id);
if (status != 0)
{
UI::ReplaceWidget (`id (`rp), `HBox (
@@ -485,7 +477,7 @@
else if (!creating)
{
creating = true;
- SCR::Execute(.background.kill); // just to be sure...
+ SCR::Execute (.process.kill, id); // just to be sure...
// now continue with creating
UI::ChangeWidget (`id(`log), `LastLine, "\n");
@@ -493,7 +485,7 @@
y2milestone ("calling '%1'", cmd);
// label
UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image"))));
- SCR::Execute (.background.run_output_err, cmd);
+ id = (integer) SCR::Execute (.process.start_shell, cmd);
ret = nil;
continue;
}
@@ -508,14 +500,20 @@
break;
}
}
+ else
+ {
+ update_output ();
+ }
if (ret == `cancel)
{
- SCR::Execute(.background.kill);
+ SCR::Execute (.process.kill, id, 15);
+ sleep (100);
+ SCR::Execute (.process.kill, id);
}
sleep (100);
} while (ret == nil);
- SCR::Execute(.background.kill);
+ SCR::Execute (.process.kill, id);
UI::CloseDialog ();
return ret == `ok;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/src/routines.ycp new/yast2-product-creator-2.17.5/src/routines.ycp
--- old/yast2-product-creator-2.17.4/src/routines.ycp 2008-07-18 09:21:42.000000000 +0200
+++ new/yast2-product-creator-2.17.5/src/routines.ycp 2008-07-24 14:02:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of product-creator.
* Authors: Anas Nashif
*
- * $Id: routines.ycp 48298 2008-06-13 14:13:59Z jsuchome $
+ * $Id: routines.ycp 49386 2008-07-24 11:04:45Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.4/VERSION new/yast2-product-creator-2.17.5/VERSION
--- old/yast2-product-creator-2.17.4/VERSION 2008-07-22 07:45:20.000000000 +0200
+++ new/yast2-product-creator-2.17.5/VERSION 2008-08-01 15:37:09.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org