Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Wed Mar 4 15:10:10 CET 2009.
--------
--- yast2-product-creator/yast2-product-creator.changes 2009-02-11 14:48:44.000000000 +0100
+++ yast2-product-creator/yast2-product-creator.changes 2009-03-04 13:36:48.309347000 +0100
@@ -1,0 +2,13 @@
+Wed Mar 4 13:30:25 CET 2009 - jsuchome@suse.cz
+
+- add GPG key correctly to the installkey.gpg keyring inside initrd
+ (bnc#478975)
+- before signing a file check for its existence (bnc#481838)
+- 2.18.0
+
+-------------------------------------------------------------------
+Fri Feb 20 09:46:56 CET 2009 - jsuchome@suse.cz
+
+- adapted kiwi templates for 11.1 (bnc#477645)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.17.13.tar.bz2
New:
----
yast2-product-creator-2.18.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.c31536/_old 2009-03-04 15:09:10.000000000 +0100
+++ /var/tmp/diff_new_pack.c31536/_new 2009-03-04 15:09:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.17.13)
+# spec file for package yast2-product-creator (Version 2.18.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.17.13
-Release: 2
+Version: 2.18.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.17.13.tar.bz2
+Source0: yast2-product-creator-2.18.0.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
@@ -49,7 +49,7 @@
%prep
-%setup -n yast2-product-creator-2.17.13
+%setup -n yast2-product-creator-2.18.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,13 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Wed Mar 04 2009 jsuchome@suse.cz
+- add GPG key correctly to the installkey.gpg keyring inside initrd
+ (bnc#478975)
+- before signing a file check for its existence (bnc#481838)
+- 2.18.0
+* Fri Feb 20 2009 jsuchome@suse.cz
+- adapted kiwi templates for 11.1 (bnc#477645)
* Wed Feb 11 2009 coolo@suse.de
- buildrequire yast2-slp to fix build
* Fri Jan 30 2009 lslezak@suse.cz
++++++ yast2-product-creator-2.17.13.tar.bz2 -> yast2-product-creator-2.18.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/configure new/yast2-product-creator-2.18.0/configure
--- old/yast2-product-creator-2.17.13/configure 2009-02-11 14:49:09.000000000 +0100
+++ new/yast2-product-creator-2.18.0/configure 2008-10-31 13:28:19.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.17.13.
+# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.17.10.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.17.13'
-PACKAGE_STRING='yast2-product-creator 2.17.13'
+PACKAGE_VERSION='2.17.10'
+PACKAGE_STRING='yast2-product-creator 2.17.10'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-product-creator 2.17.13 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.17.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.17.13:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.17.10:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.17.13
+yast2-product-creator configure 2.17.10
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-product-creator $as_me 2.17.13, which was
+It was created by yast2-product-creator $as_me 2.17.10, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.17.13'
+ VERSION='2.17.10'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.17.13"
+VERSION="2.17.10"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
@@ -3452,7 +3452,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.17.13, which was
+This file was extended by yast2-product-creator $as_me 2.17.10, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-product-creator config.status 2.17.13
+yast2-product-creator config.status 2.17.10
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/configure.in new/yast2-product-creator-2.18.0/configure.in
--- old/yast2-product-creator-2.17.13/configure.in 2009-02-11 14:49:05.000000000 +0100
+++ new/yast2-product-creator-2.18.0/configure.in 2008-10-31 13:28:15.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.17.13, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.17.10, http://bugs.opensuse.org/, yast2-product-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.13"
+VERSION="2.17.10"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.18.0/src/data/kiwi_templates/iso/config.xml
--- old/yast2-product-creator-2.17.13/src/data/kiwi_templates/iso/config.xml 2009-02-11 14:48:25.000000000 +0100
+++ new/yast2-product-creator-2.18.0/src/data/kiwi_templates/iso/config.xml 2009-02-19 13:50:49.000000000 +0100
@@ -6,11 +6,11 @@
<specification>Template for system image configuration</specification>
</description>
<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="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>
+ <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type>
+ <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type>
+ <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type>
+ <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type>
+ <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type>
<version>1.0.0</version>
<size unit="M">2000</size>
<packagemanager>zypper</packagemanager>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/src/data/kiwi_templates/xen/config.xml new/yast2-product-creator-2.18.0/src/data/kiwi_templates/xen/config.xml
--- old/yast2-product-creator-2.17.13/src/data/kiwi_templates/xen/config.xml 2009-02-11 14:48:25.000000000 +0100
+++ new/yast2-product-creator-2.18.0/src/data/kiwi_templates/xen/config.xml 2009-02-19 13:50:52.000000000 +0100
@@ -6,7 +6,7 @@
<specification>Template for system image configuration</specification>
</description>
<preferences>
- <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type>
+ <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type>
<version>1.0.0</version>
<size unit="M">2000</size>
<packagemanager>zypper</packagemanager>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/src/kiwi_dialogs.ycp new/yast2-product-creator-2.18.0/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.17.13/src/kiwi_dialogs.ycp 2009-02-11 14:48:25.000000000 +0100
+++ new/yast2-product-creator-2.18.0/src/kiwi_dialogs.ycp 2009-02-20 09:47:53.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 52822 2008-11-03 09:31:53Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 55629 2009-02-20 08:47:53Z jsuchome $
*/
{
textdomain "product-creator";
@@ -22,6 +22,7 @@
import "ProductCreator";
import "SourceDialogs";
import "SourceManager";
+ import "String";
import "Summary";
import "URL";
import "Wizard";
@@ -1249,33 +1250,19 @@
ProductCreator::Config["taboo"] = maplist (
map pat, sw_contents["ignore"]:[], ``(pat["name"]:""));
}
-
map label2boot = $[
- "openSUSE 10.2" : "suse-10.2",
- "openSUSE 10.3" : "suse-10.3",
"openSUSE 11.0" : "suse-11.0",
- "SUSE Linux 10.1" : "suse-10.1",
+ "openSUSE 11.1" : "suse-11.1",
"SUSE Linux Enterprise Server 10" : "suse-SLES10",
"SUSE Linux Enterprise Desktop 10" : "suse-SLED10",
"SUSE Linux Enterprise Desktop 10 SP2" : "suse-SLED10-SP2",
"SUSE Linux Enterprise Server 10 SP2" : "suse-SLES10-SP2",
+ "SUSE Linux Enterprise Server 11" : "suse-SLES11",
+ "SUSE Linux Enterprise Desktop 11" : "suse-SLED11",
];
- map distproduct2boot = $[
- "openSUSE-10.2-CD-download" : "suse-10.2",
- "openSUSE-10.2-dvd5-download" : "suse-10.2",
- "openSUSE-10.3-dvd5-download" : "suse-10.3",
- "openSUSE-10.3-CD-download" : "suse-10.3",
- "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1",
- "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10",
- "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10",
- "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1",
- "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1",
- "SUSE-Linux-Enterprise-Server-SP2" : "suse-SLES10-SP2",
- "SUSE-Linux-Enterprise-Desktop-SP2" : "suse-SLED10-SP2",
- ];
- string boot_image = label2boot[content["LABEL"]:""]:"";
- if (boot_image == "")
- boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:"";
+ string contentlabel = String::CutBlanks (content["LABEL"]:"");
+ string boot_image = label2boot[contentlabel]:"";
+// FIXME this actually is not used at all, only the one from template... :-(
// guess some default boot image value
if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/src/ProductCreator.ycp new/yast2-product-creator-2.18.0/src/ProductCreator.ycp
--- old/yast2-product-creator-2.17.13/src/ProductCreator.ycp 2009-02-11 14:48:25.000000000 +0100
+++ new/yast2-product-creator-2.18.0/src/ProductCreator.ycp 2009-03-04 13:29:59.000000000 +0100
@@ -778,8 +778,11 @@
// sign the content file
boolean ret = GPG::SignAsciiDetached(keyid, dir + "/content", passphrase);
- // sign the product file
- ret = ret && GPG::SignAsciiDetached(keyid, dir + "/media.1/products", passphrase);
+ // sign the product file if exists
+ if (FileUtils::Exists (dir + "/media.1/products"))
+ {
+ ret = ret && GPG::SignAsciiDetached(keyid, dir + "/media.1/products", passphrase);
+ }
y2milestone("Signed source: %1", ret);
return ret;
@@ -2034,6 +2037,29 @@
ret = Exec(command);
if (!ret) return false;
+ if (new_file != "linuxrc.config")
+ {
+ // extract installkey.gpg from cpio archive
+ command = sformat ("cd '%1'; cpio -i -H newc -F '%2.cpio' installkey.gpg",
+ String::Quote(base), String::Quote(initrd_file));
+
+ ret = Exec(command);
+ if (!ret) return false;
+
+ // add our new key to installkey.gpg keyring
+ command = sformat ("cd '%1'; gpg --no-default-keyring --keyring ./installkey.gpg --import '%2'",
+ String::Quote(base), String::Quote(new_file));
+ ret = Exec(command);
+ if (!ret) return false;
+
+ // place new installkey.gpg back to the archive
+ command = sformat ("cd '%1' && echo installkey.gpg | cpio -o -H newc -A -F '%2.cpio'",
+ String::Quote(base), String::Quote(initrd_file));
+
+ ret = Exec(command);
+ if (!ret) return false;
+ }
+
// compress the archive, remove the temporary files
command = sformat("gzip --best < '%1.cpio' > '%1' && rm -f '%1.cpio' '%2'",
String::Quote(initrd_file), String::Quote(new_file));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.13/VERSION new/yast2-product-creator-2.18.0/VERSION
--- old/yast2-product-creator-2.17.13/VERSION 2009-02-11 14:48:25.000000000 +0100
+++ new/yast2-product-creator-2.18.0/VERSION 2009-03-04 13:30:56.000000000 +0100
@@ -1 +1 @@
-2.17.13
+2.18.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org