Mailinglist Archive: yast-commit (693 mails)

< Previous Next >
[yast-commit] r56150 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/ProductCreator.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Mon, 16 Mar 2009 14:11:12 -0000
  • Message-id: <E1LjDX6-0001BF-Ju@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Mon Mar 16 15:11:12 2009
New Revision: 56150

URL: http://svn.opensuse.org/viewcvs/yast?rev=56150&view=rev
Log:
- 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.17.17


Modified:
branches/SuSE-Code-11-Branch/product-creator/VERSION

branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp

Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/VERSION?rev=56150&r1=56149&r2=56150&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-Branch/product-creator/VERSION Mon Mar 16 15:11:12
2009
@@ -1 +1 @@
-2.17.16
+2.17.17

Modified:
branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes?rev=56150&r1=56149&r2=56150&view=diff
==============================================================================
---
branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
(original)
+++
branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
Mon Mar 16 15:11:12 2009
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Thu Mar 12 12:31:54 CET 2009 - jsuchome@xxxxxxx
+
+- 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.17.17
+
+-------------------------------------------------------------------
Wed Mar 4 13:20:33 CET 2009 - jsuchome@xxxxxxx

- add GPG key correctly to the installkey.gpg keyring inside initrd

Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp?rev=56150&r1=56149&r2=56150&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp
(original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Mon Mar
16 15:11:12 2009
@@ -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);

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages