Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Wed Nov 10 18:48:05 CET 2010.
--------
--- yast2-product-creator/yast2-product-creator.changes 2010-10-12 16:54:32.000000000 +0200
+++ yast2-product-creator/yast2-product-creator.changes 2010-11-09 14:41:03.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 9 14:37:48 CET 2010 - jsuchome@suse.cz
+
+- added option to build i586 images on i686 system (bnc#644895)
+- 2.20.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.20.2.tar.bz2
New:
----
yast2-product-creator-2.20.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.pexUZJ/_old 2010-11-10 18:45:28.000000000 +0100
+++ /var/tmp/diff_new_pack.pexUZJ/_new 2010-11-10 18:45:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.20.2)
+# spec file for package yast2-product-creator (Version 2.20.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.20.2
+Version: 2.20.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.20.2.tar.bz2
+Source0: yast2-product-creator-2.20.3.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.20.2
+%setup -n yast2-product-creator-2.20.3
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.20.2.tar.bz2 -> yast2-product-creator-2.20.3.tar.bz2 ++++++
++++ 4597 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/VERSION new/yast2-product-creator-2.20.3/VERSION
--- old/yast2-product-creator-2.20.2/VERSION 2010-10-12 15:37:47.000000000 +0200
+++ new/yast2-product-creator-2.20.3/VERSION 2010-11-09 14:38:29.000000000 +0100
@@ -1 +1 @@
-2.20.2
+2.20.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/configure.in new/yast2-product-creator-2.20.3/configure.in
--- old/yast2-product-creator-2.20.2/configure.in 2010-10-12 16:53:54.000000000 +0200
+++ new/yast2-product-creator-2.20.3/configure.in 2010-01-25 19:41:40.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.20.2, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.19.2, 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.20.2"
+VERSION="2.19.2"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/Kiwi.ycp new/yast2-product-creator-2.20.3/src/Kiwi.ycp
--- old/yast2-product-creator-2.20.2/src/Kiwi.ycp 2010-05-31 21:34:14.000000000 +0200
+++ new/yast2-product-creator-2.20.3/src/Kiwi.ycp 2010-11-09 14:37:24.000000000 +0100
@@ -47,6 +47,9 @@
// target architecture of image (can be only i386 if different from current one)
global string image_architecture = "";
+ // if target architecture should be i586 instead of i686
+ global boolean target_i586 = false;
+
// directories with user-made templated
global list<string> templates_dirs = [];
@@ -566,9 +569,16 @@
}
string linux32 = "";
+ string target_arch = ""; // rather set target_arch only in one specific case
if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386")
+ {
linux32 = "linux32";
- string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32);
+ }
+ if (ProductCreator::GetArch () == "i386" && target_i586)
+ {
+ target_arch = "--target-arch i586";
+ }
+ string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal %4", chroot_dir, config_dir, linux32, target_arch);
if (selected_profiles != "" && selected_profiles != nil)
cmd = cmd + selected_profiles;
@@ -615,8 +625,8 @@
// now continue with creating
UI::ChangeWidget (`id(`log), `LastLine, "\n");
- cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal",
- chroot_dir, out_dir, linux32);
+ cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal %4",
+ chroot_dir, out_dir, linux32, target_arch);
y2milestone ("calling '%1'", cmd);
// label
UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image"))));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/kiwi_dialogs.ycp new/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.20.2/src/kiwi_dialogs.ycp 2010-09-30 18:20:20.000000000 +0200
+++ new/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp 2010-11-09 14:37:24.000000000 +0100
@@ -2276,11 +2276,15 @@
{
arch_term = `VBox (
// checkbox label
- `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"),
+ `CheckBox (`id (`i386), `opt (`notify, `hstretch), _("&32bit Architecture Image"),
Kiwi::image_architecture == "i386"),
`VSpacing (0.2)
);
}
+ arch_term = add (arch_term,
+ // checkbox label
+ `CheckBox (`id (`i586), `opt (`hstretch), _("Target is i586 only"), Kiwi::target_i586));
+ arch_term = add (arch_term, `VSpacing (0.2));
term contents = `VBox (
new_configuration ?
@@ -2367,6 +2371,10 @@
UI::ChangeWidget (`id (`import), `Enabled, false);
UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_");
}
+ if (Arch::architecture () == "x86_64")
+ {
+ UI::ChangeWidget (`id (`i586), `Enabled, Kiwi::image_architecture == "i386");
+ }
any ret = nil;
while (true)
{
@@ -2395,6 +2403,10 @@
UI::ChangeWidget (`id (`template), `Enabled, false);
UI::ChangeWidget (`id (`import), `Enabled, false);
}
+ if (ret == `i386)
+ {
+ UI::ChangeWidget (`id (`i586), `Enabled, UI::QueryWidget (`id (`i386), `Value));
+ }
if (ret == `import)
{
string dir = UI::AskForExistingDirectory (
@@ -2586,6 +2598,8 @@
}
}
+ Kiwi::target_i586 = Kiwi::image_architecture == "i386" && (boolean) UI::QueryWidget (`id (`i586), `Value);
+
if (size (repositories) > 0)
{
map current_sources = $[];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/routines.ycp new/yast2-product-creator-2.20.3/src/routines.ycp
--- old/yast2-product-creator-2.20.2/src/routines.ycp 2010-03-24 08:23:29.000000000 +0100
+++ new/yast2-product-creator-2.20.3/src/routines.ycp 2010-07-29 16:44:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of product-creator.
* Authors: Anas Nashif
*
- * $Id: routines.ycp 60526 2010-01-25 19:03:05Z jsuchome $
+ * $Id: routines.ycp 60523 2010-01-25 19:02:45Z jsuchome $
*/
{
@@ -45,12 +45,15 @@
if (typemap["primary"]:"false" == "true")
{
task = typemap[Kiwi::content_key]:task;
+ if (task == "" && typemap["image"]:"" != "")
+ task = typemap["image"]:"";
break;
}
});
if (task == "")
{
y2milestone ("no task found, setting to 'iso'");
+ task = "iso";
}
return task;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org