Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory
checked in at Sun Aug 7 19:11:57 CEST 2011.
--------
--- yast2-product-creator/yast2-product-creator.changes 2011-07-15
12:19:14.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes
2011-08-05 16:15:31.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Aug 5 16:13:24 CEST 2011 - [email protected]
+
+- added support for 'bootinclude' tag (fate#310978)
+- 2.21.6
+
+-------------------------------------------------------------------
+Fri Aug 5 12:34:40 CEST 2011 - [email protected]
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Wed Aug 3 09:07:19 UTC 2011 - [email protected]
+
+- use term "Software manager" instead of "Package manager"
+ (bnc#585679)
+- 2.21.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.21.4.tar.bz2
New:
----
yast2-product-creator-2.21.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.2vz7No/_old 2011-08-07 19:08:35.000000000 +0200
+++ /var/tmp/diff_new_pack.2vz7No/_new 2011-08-07 19:08:35.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.21.4
+Version: 2.21.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.21.4.tar.bz2
+Source0: yast2-product-creator-2.21.6.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.21.4
+%setup -n yast2-product-creator-2.21.6
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.21.4.tar.bz2 ->
yast2-product-creator-2.21.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/VERSION
new/yast2-product-creator-2.21.6/VERSION
--- old/yast2-product-creator-2.21.4/VERSION 2011-07-15 12:18:27.000000000
+0200
+++ new/yast2-product-creator-2.21.6/VERSION 2011-08-05 16:13:59.000000000
+0200
@@ -1 +1 @@
-2.21.4
+2.21.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/src/complex.ycp
new/yast2-product-creator-2.21.6/src/complex.ycp
--- old/yast2-product-creator-2.21.4/src/complex.ycp 2011-07-15
12:15:03.000000000 +0200
+++ new/yast2-product-creator-2.21.6/src/complex.ycp 2011-07-15
12:18:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif <[email protected]>
*
- * $Id: complex.ycp 64094 2011-05-24 08:34:00Z jsuchome $
+ * $Id: complex.ycp 64839 2011-07-15 10:18:50Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/src/dialogs.ycp
new/yast2-product-creator-2.21.6/src/dialogs.ycp
--- old/yast2-product-creator-2.21.4/src/dialogs.ycp 2011-07-15
12:15:50.000000000 +0200
+++ new/yast2-product-creator-2.21.6/src/dialogs.ycp 2011-07-15
12:18:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif <[email protected]>
*
- * $Id: dialogs.ycp 62617 2010-10-12 14:53:46Z lslezak $
+ * $Id: dialogs.ycp 64839 2011-07-15 10:18:50Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/src/helps.ycp
new/yast2-product-creator-2.21.6/src/helps.ycp
--- old/yast2-product-creator-2.21.4/src/helps.ycp 2008-12-18
14:46:59.000000000 +0100
+++ new/yast2-product-creator-2.21.6/src/helps.ycp 2011-08-03
11:11:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Anas Nashif <[email protected]>
*
- * $Id: helps.ycp 50872 2008-09-09 09:23:15Z jsuchome $
+ * $Id: helps.ycp 65165 2011-08-03 09:08:44Z lslezak $
*/
{
@@ -83,8 +83,8 @@
</p>
") +
/* Configure1 dialog help 3/4 */
-_("<b>Package Manager</b><p>
-Use the package manager without any preselected packages. All
+_("<b>Software Manager</b><p>
+Use the software manager without any preselected packages. All
packages that would be automatically selected during installation must be
selected manually based on the hardware and architecture for which you are
creating this CD.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-2.21.4/src/image-creator.desktop
new/yast2-product-creator-2.21.6/src/image-creator.desktop
--- old/yast2-product-creator-2.21.4/src/image-creator.desktop 2010-01-15
09:17:31.000000000 +0100
+++ new/yast2-product-creator-2.21.6/src/image-creator.desktop 2011-08-05
15:40:56.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=image-creator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/src/kiwi_dialogs.ycp
new/yast2-product-creator-2.21.6/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.21.4/src/kiwi_dialogs.ycp 2011-05-24
10:34:04.000000000 +0200
+++ new/yast2-product-creator-2.21.6/src/kiwi_dialogs.ycp 2011-08-05
16:13:20.000000000 +0200
@@ -47,6 +47,12 @@
"xen" : _("Xen Specific Packages")
];
+ // map indexes of packages sets to their names
+ // (package set is indexed in the sets list)
+ map<integer,string> index2package_set = $[];
+
+ map<string,integer> package_set2index = $[];
+
// read available the images under /usr/share/kiwi/image/ directory
list<term> GetAvailableImages (string subdir) {
@@ -203,6 +209,21 @@
string pac = "";
string ign = "";
+ if (index2package_set[package_set]:"" == "bootinclude")
+ {
+ package_set = package_set2index["image"]:0;
+
+ if (size (packages[package_set,"package"]:[]) > 0)
+ // richtext header
+ pac = Summary::AddHeader ("", _("Packages"));
+ foreach (map pacmap, packages[package_set,"package"]:[], {
+ if (pacmap["bootinclude"]:"" == "true")
+ pac = Summary::AddListItem (pac, pacmap["name"]:"");
+ });
+ UI::ChangeWidget (`id (id), `Value, pat + pac + ign);
+ return;
+ }
+
if (size (packages[package_set,"opensusePattern"]:[]) > 0)
// richtext header
pat = Summary::AddHeader ("", _("Patterns"));
@@ -213,7 +234,8 @@
// richtext header
pac = Summary::AddHeader ("", _("Packages"));
foreach (map pacmap, packages[package_set,"package"]:[], {
- pac = Summary::AddListItem (pac, pacmap["name"]:"");
+ if (pacmap["bootinclude"]:"" != "true")
+ pac = Summary::AddListItem (pac, pacmap["name"]:"");
});
if (size (packages[package_set,"ignore"]:[]) > 0)
ign = Summary::AddHeader ("",
@@ -261,15 +283,74 @@
}
/**
+ * Popup for modifying the list of 'bootinclude' packages
+ */
+ define list modifyBootIncludePackages (list packages) {
+
+ UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VSpacing (20),
`VBox (
+ `HSpacing (70),
+ `VSpacing (0.5),
+ `MultiLineEdit (`id (`bootinclude), _("Packages to be included in Boot
Image"),
+ mergestring ((list<string>) maplist (map p, (list<map>) packages,
``(p["name"]:"")), "\n")
+ ),
+ `ButtonBox (
+ `PushButton (`id(`ok),`opt(`default,`key_F10),Label::OKButton()),
+ `PushButton (`id(`cancel),`opt (`key_F9), Label::CancelButton())
+ )
+ ), `HSpacing (0.5)));
+ any ret = UI::UserInput ();
+ string value= (string)UI::QueryWidget (`id (`bootinclude), `Value);
+ list retlist= maplist (string name, filter (string p, splitstring (value,
"\n"), ``(p != "")), {
+ return $[
+ "name" : name,
+ "bootinclude" : "true"
+ ];
+ });
+
+ UI::CloseDialog ();
+ if (ret == `cancel)
+ return nil;
+ return retlist;
+ }
+
+ /**
* Handler for software selection
*/
define symbol HandleSWSelection (string key, map event) {
if (event["ID"]:nil == key)
{
integer package_set = KiwiConfig["package_set"]:0;
- map sw_contents = modifyPackageSelection
(KiwiConfig["packages",package_set]:$[]);
- if (sw_contents != nil)
- KiwiConfig["packages",package_set] = sw_contents;
+ boolean bootinclude = false;
+ if (index2package_set[package_set]:"" == "bootinclude")
+ {
+ package_set = package_set2index["image"]:0;
+ bootinclude = true;
+ }
+
+ map sw_contents = KiwiConfig["packages",package_set]:$[];
+
+ // separate bootinclude packages from normal ones
+ list bi_packages = [];
+ sw_contents["package"] = filter (map p, sw_contents["package"]:[], {
+ if (p["bootinclude"]:"" == "true")
+ bi_packages = add (bi_packages, p);
+ return p["bootinclude"]:"" != "true";
+ });
+
+ if (bootinclude)
+ {
+ bi_packages = modifyBootIncludePackages (bi_packages);
+ }
+ else
+ {
+ sw_contents = modifyPackageSelection (sw_contents);
+ }
+
+ if (sw_contents != nil && bi_packages != nil)
+ {
+ sw_contents["package"] = union (sw_contents["package"]:[],
bi_packages);
+ KiwiConfig["packages",package_set] = sw_contents;
+ }
InitSWRichText ("rt_sw");
}
return nil;
@@ -293,6 +374,8 @@
i = i + 1; // index to list must be increased
return; // delete is handled by different widgets
}
+ index2package_set[i] = type;
+ package_set2index[type] = i;
if (type == "bootstrap")
// combo box label
label = _("Bootstrap");
@@ -310,6 +393,9 @@
items = add (items, `item (`id (i), label, package_set == i));
i = i + 1;
});
+ // combo box label
+ items = add (items, `item (`id (i), _("Include in Boot Image"),
package_set == i));
+ index2package_set[i] = "bootinclude";
UI::ChangeWidget (`id (id), `Items, items);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-2.21.4/src/product-creator.desktop
new/yast2-product-creator-2.21.6/src/product-creator.desktop
--- old/yast2-product-creator-2.21.4/src/product-creator.desktop
2010-01-15 09:17:31.000000000 +0100
+++ new/yast2-product-creator-2.21.6/src/product-creator.desktop
2011-08-05 15:40:56.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=product-creator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.4/src/product-creator.ycp
new/yast2-product-creator-2.21.6/src/product-creator.ycp
--- old/yast2-product-creator-2.21.4/src/product-creator.ycp 2011-07-15
12:16:21.000000000 +0200
+++ new/yast2-product-creator-2.21.6/src/product-creator.ycp 2011-07-15
12:18:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Anas Nashif <[email protected]>
*
- * $Id: product-creator.ycp 50872 2008-09-09 09:23:15Z jsuchome $
+ * $Id: product-creator.ycp 64839 2011-07-15 10:18:50Z jsuchome $
*
* Main file for product-creator configuration. Uses all other files.
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
