Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Tue Mar 17 23:45:59 CET 2009.
--------
--- yast2-product-creator/yast2-product-creator.changes 2009-03-04 13:36:48.000000000 +0100
+++ yast2-product-creator/yast2-product-creator.changes 2009-03-16 15:15:41.255962000 +0100
@@ -1,0 +2,9 @@
+Mon Mar 16 14:55:45 CET 2009 - jsuchome@suse.cz
+
+- escape URL of base product when saving to XML (bnc#482395)
+- copy optional files as optional (bnc#482329)
+- sign and create a checksum for add_on_products file (bnc#481470)
+- bring all required patterns into the final product (bnc#482540)
+- 2.18.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.18.0.tar.bz2
New:
----
yast2-product-creator-2.18.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.u28902/_old 2009-03-17 23:42:52.000000000 +0100
+++ /var/tmp/diff_new_pack.u28902/_new 2009-03-17 23:42:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.18.0)
+# spec file for package yast2-product-creator (Version 2.18.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.18.0
+Version: 2.18.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.18.0.tar.bz2
+Source0: yast2-product-creator-2.18.1.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-slp yast2-testsuite
PreReq: %fillup_prereq
@@ -48,8 +48,14 @@
+Authors:
+--------
+ Anas Nashif
+ Ladislav Slezak
+ Jiri Suchomel
+
%prep
-%setup -n yast2-product-creator-2.18.0
+%setup -n yast2-product-creator-2.18.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +101,12 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Mon Mar 16 2009 jsuchome@suse.cz
+- escape URL of base product when saving to XML (bnc#482395)
+- copy optional files as optional (bnc#482329)
+- sign and create a checksum for add_on_products file (bnc#481470)
+- bring all required patterns into the final product (bnc#482540)
+- 2.18.1
* Wed Mar 04 2009 jsuchome@suse.cz
- add GPG key correctly to the installkey.gpg keyring inside initrd
(bnc#478975)
++++++ yast2-product-creator-2.18.0.tar.bz2 -> yast2-product-creator-2.18.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.0/src/ProductCreator.ycp new/yast2-product-creator-2.18.1/src/ProductCreator.ycp
--- old/yast2-product-creator-2.18.0/src/ProductCreator.ycp 2009-03-04 13:29:59.000000000 +0100
+++ new/yast2-product-creator-2.18.1/src/ProductCreator.ycp 2009-03-16 14:55:29.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 55078 2009-01-27 13:08:44Z lslezak $
+ * $Id: ProductCreator.ycp 55920 2009-03-04 12:37:00Z jsuchome $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -528,6 +528,11 @@
v["sources"] = sources;
}
+ string base_repo = v["base_repo"]:"";
+ if (base_repo != "")
+ {
+ v["base_repo"] = String::EscapeTags (base_repo);
+ }
return(v);
});
@@ -784,6 +789,12 @@
ret = ret && GPG::SignAsciiDetached(keyid, dir + "/media.1/products", passphrase);
}
+ // sign the add_on_products file
+ if (FileUtils::Exists (dir + "/add_on_products"))
+ {
+ ret = ret && GPG::SignAsciiDetached(keyid, dir + "/add_on_products", passphrase);
+ }
+
y2milestone("Signed source: %1", ret);
return ret;
}
@@ -827,6 +838,16 @@
string meta_sha1 = SHA1Meta(dir, prod_dir);
string key_sha1 = SHA1Key(dir);
+ // add the sum of add_on_products if it was created
+ if (FileUtils::Exists (dir + "/add_on_products"))
+ {
+ string command = sformat ("cd %1; sha1sum add_on_products", dir);
+ y2milestone ("Generating SHA1 sum for add_on_products: %1", command);
+ map ret = (map)SCR::Execute(.target.bash_output, command);
+ y2milestone("Result: %1", ret);
+ meta_sha1 = meta_sha1 + "HASH SHA1 " + ret["stdout"]:"";
+ }
+
string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content'", String::Quote(dir));
map out = (map)SCR::Execute(.target.bash_output, command);
if (out["exit"]:-1 != 0)
@@ -1017,7 +1038,7 @@
foreach(string f, files,
{
- CopyFile(srcid, 1, f, target + f);
+ CopyOptionalFile (srcid, 1, f, target + f);
}
);
}
@@ -1678,10 +1699,9 @@
{
if (savespace)
{
- CopyFile(base_source, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
- CopyFile(base_source, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
- CopyFile(base_source, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
-
+ CopyFile(base_source, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyFile(base_source, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyOptionalFile (base_source, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
// Loader, x86 specific
if (_arch == "i386" || _arch == "x86_64")
{
@@ -1873,7 +1893,6 @@
Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(skel_root)));
}
-
// remove unused patterns (they cannot be used due to missing packages)
if (Config["type"]:`unknown == `patterns)
{
@@ -1885,18 +1904,20 @@
}
y2milestone("used patterns: %1", used_patterns);
+
// addons 'doesn't include patterns added via dependency
- foreach (string pattern, used_patterns, {
- list<map> descrs = Pkg::ResolvableDependencies(pattern,`pattern,"");
- foreach (map descr, descrs, {
- foreach (map dep, (list<map>)descr["dependencies"]:[], {
- if (dep["res_kind"]:"" == "pattern" &&
- contains (["requires","recommends"],dep["dep_kind"]:""))
- {
- used_patterns = add (used_patterns, dep["name"]:"");
- }
- });
- });
+ // better find the pattern dependencies with solver
+ foreach(string p, used_patterns, {
+ Pkg::ResolvableInstall (p, `pattern);
+ });
+ Pkg::PkgSolve (true);
+ foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""),
+ {
+ if (pat["status"]:`none == `selected)
+ {
+ used_patterns = add (used_patterns, pat["name"]:"");
+ y2milestone ("selected pattern: %1", pat);
+ }
});
y2milestone("patterns + dependencies: %1", used_patterns);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.0/VERSION new/yast2-product-creator-2.18.1/VERSION
--- old/yast2-product-creator-2.18.0/VERSION 2009-03-04 13:30:56.000000000 +0100
+++ new/yast2-product-creator-2.18.1/VERSION 2009-03-16 14:56:09.000000000 +0100
@@ -1 +1 @@
-2.18.0
+2.18.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org