Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Fri May 22 00:36:43 CEST 2009. -------- --- yast2-product-creator/yast2-product-creator.changes 2009-04-22 08:16:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2009-05-21 12:31:10.000000000 +0200 @@ -1,0 +2,19 @@ +Thu May 21 09:46:38 CEST 2009 - jsuchome@suse.cz + +- merged changes from CODE11: +- added openssl-certs to default bootstrap section, so Update repos + can work (bnc#491475) +- read the whole kiwi process output (bnc#488799) +- make content file optional (for empty repos, bnc#500527) +- correct check for configuration type and version in templates + (bnc#498439) +- during configuration, do not throw away target image desctination + (bnc#499489) +- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE) +- added option to specify "additive" attribute to size (fate#305327) +- detect and report conflicts in selected and deleted package lists + (fate#305254) +- allow building i386 images on x86_64 system (fate#305327) +- 2.18.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.18.4.tar.bz2 New: ---- yast2-product-creator-2.18.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.s16002/_old 2009-05-22 00:35:40.000000000 +0200 +++ /var/tmp/diff_new_pack.s16002/_new 2009-05-22 00:35:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.18.4) +# spec file for package yast2-product-creator (Version 2.18.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-product-creator -Version: 2.18.4 +Version: 2.18.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.18.4.tar.bz2 +Source0: yast2-product-creator-2.18.5.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 @@ -55,7 +55,7 @@ Jiri Suchomel <jsuchome@suse.cz> %prep -%setup -n yast2-product-creator-2.18.4 +%setup -n yast2-product-creator-2.18.5 %build %{prefix}/bin/y2tool y2autoconf @@ -101,6 +101,22 @@ /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/sysconfig.product-creator %changelog +* Thu May 21 2009 jsuchome@suse.cz +- merged changes from CODE11: +- added openssl-certs to default bootstrap section, so Update repos + can work (bnc#491475) +- read the whole kiwi process output (bnc#488799) +- make content file optional (for empty repos, bnc#500527) +- correct check for configuration type and version in templates + (bnc#498439) +- during configuration, do not throw away target image desctination + (bnc#499489) +- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE) +- added option to specify "additive" attribute to size (fate#305327) +- detect and report conflicts in selected and deleted package lists + (fate#305254) +- allow building i386 images on x86_64 system (fate#305327) +- 2.18.5 * Wed Apr 22 2009 jsuchome@suse.cz - look primary into base product for isolinux.cfg (bnc#496263) - 2.18.4 ++++++ yast2-product-creator-2.18.4.tar.bz2 -> yast2-product-creator-2.18.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/configure new/yast2-product-creator-2.18.5/configure --- old/yast2-product-creator-2.18.4/configure 2008-10-31 13:28:19.000000000 +0100 +++ new/yast2-product-creator-2.18.5/configure 2009-05-21 09:50:20.000000000 +0200 @@ -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.10. +# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.18.5. # # 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.10' -PACKAGE_STRING='yast2-product-creator 2.17.10' +PACKAGE_VERSION='2.18.5' +PACKAGE_STRING='yast2-product-creator 2.18.5' 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.10 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.18.5 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.10:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.18.5:";; 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.10 +yast2-product-creator configure 2.18.5 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.10, which was +It was created by yast2-product-creator $as_me 2.18.5, 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.10' + VERSION='2.18.5' cat >>confdefs.h <<_ACEOF @@ -2511,9 +2511,9 @@ -VERSION="2.17.10" +VERSION="2.18.5" RPMNAME="yast2-product-creator" -MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" +MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig @@ -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.10, which was +This file was extended by yast2-product-creator $as_me 2.18.5, 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.10 +yast2-product-creator config.status 2.18.5 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.18.4/configure.in new/yast2-product-creator-2.18.5/configure.in --- old/yast2-product-creator-2.18.4/configure.in 2008-10-31 13:28:15.000000000 +0100 +++ new/yast2-product-creator-2.18.5/configure.in 2009-05-21 09:50:17.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-product-creator dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.17.10, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.18.5, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.10" +VERSION="2.18.5" RPMNAME="yast2-product-creator" -MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" +MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/Makefile.am new/yast2-product-creator-2.18.5/Makefile.am --- old/yast2-product-creator-2.18.4/Makefile.am 2008-10-31 13:28:15.000000000 +0100 +++ new/yast2-product-creator-2.18.5/Makefile.am 2009-05-21 09:50:17.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/Makefile.in new/yast2-product-creator-2.18.5/Makefile.in --- old/yast2-product-creator-2.18.4/Makefile.in 2008-10-31 13:28:20.000000000 +0100 +++ new/yast2-product-creator-2.18.5/Makefile.in 2009-05-21 09:50:22.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/commandline.ycp new/yast2-product-creator-2.18.5/src/commandline.ycp --- old/yast2-product-creator-2.18.4/src/commandline.ycp 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/commandline.ycp 2009-05-21 00:01:15.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Ladislav Slezak <lslezak@suse.cz> * - * $Id:$ + * $Id: commandline.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/complex.ycp new/yast2-product-creator-2.18.5/src/complex.ycp --- old/yast2-product-creator-2.18.4/src/complex.ycp 2009-04-14 15:47:56.000000000 +0200 +++ new/yast2-product-creator-2.18.5/src/complex.ycp 2009-05-21 09:43:00.000000000 +0200 @@ -261,10 +261,6 @@ y2error("unexpected retcode: %1", ret); continue; } - - if (ret == `kiwi) - { - } } return (symbol)ret; @@ -662,10 +658,15 @@ string name = config["name"]:d; // index by order, so we can handle more configs with same name Configurations[i] = config; + string unit = config["preferences",0,"size",0,"unit"]:"M"; + string i_size = get_preferences (config, "size", 0) + unit; + // with "additive", "size" has a different meaning + if (config["preferences",0,"size",0,"additive"]:"" == "true") + i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, get_preferences (config, "version", "1.0.0"), - get_preferences (config, "size", 0) + i_size )); i = i + 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/data/sysconfig.product-creator new/yast2-product-creator-2.18.5/src/data/sysconfig.product-creator --- old/yast2-product-creator-2.18.4/src/data/sysconfig.product-creator 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/data/sysconfig.product-creator 2009-05-21 09:43:38.000000000 +0200 @@ -30,3 +30,15 @@ # # SUPPORTED_BOOT_IMAGES="" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string(template) +## Default: none +# +# Default (preselected) architecture to build taget images for. If not specified, +# the default is the architeture of the build machine. +# Currently it has only sense to set "i386" on x86_64 machines. +# +# +DEFAULT_IMAGE_ARCHITECTURE="" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/kiwi_dialogs.ycp new/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.18.4/src/kiwi_dialogs.ycp 2009-02-20 09:47:53.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp 2009-05-21 09:40:31.000000000 +0200 @@ -9,6 +9,7 @@ { textdomain "product-creator"; + import "Arch"; import "CWM"; import "CWMTab"; import "Directory"; @@ -398,6 +399,14 @@ } /** + * initialize the value of 'additive' + */ + define void InitAdditiveCheckBox (string id) { + boolean additive = KiwiConfig["preferences",0,"size",0,"additive"]:"" == "true"; + UI::ChangeWidget (`id (id), `Value, additive); + } + + /** * initialize the value of version */ define void InitSize (string id) { @@ -412,7 +421,9 @@ define void StoreSize (string key, map event) { KiwiConfig["preferences",0,"size"] = [ $[ content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), - "unit" : UI::QueryWidget (`id ("sizeunit"), `Value) + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) + ? "true" : "false" ]]; } @@ -946,6 +957,47 @@ define boolean CreateImage (string key, map event) { if (event["ID"]:nil != `next) return true; + + // check the conflicts between packages selected and marked for deletion (fate#305254) + y2milestone ("checking list of selected packages..."); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + if (package["status"]:nil == `selected) + { + symbol transact_by = package["transact_by"]:`none; + string name = package["name"]:""; + if (transact_by == `solver || transact_by == `user) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + // yes/no popup + if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + return false; + boolean ret = true; map question = $[ // popup question @@ -1201,6 +1253,14 @@ // FIXME check if boot directories match current product (-> enable building // for product different from installed one) } + else + { + // existing defaultdestination needs to be used as iso-dirctory as well + // (correct iso-directory was replaced on import (bnc#499489) + string dest = get_preferences (KiwiConfig, "defaultdestination", ""); + if (dest != "") + KiwiConfig["iso-directory"] = dest; + } boolean primary_included = false; string boot_dir = ""; // set the primary building target according to kiwi_task @@ -1306,7 +1366,11 @@ `VSpacing (0.2), `HBox ( `HWeight (2, `HBox ( - "version", "size", "sizeunit" + "version", "size", "sizeunit", + `VBox ( + `Label (""), + "additive" + ) )), `HWeight (1, "compression") ), @@ -1323,7 +1387,7 @@ ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", "compression", + "size", "sizeunit", "additive", "compression", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1511,15 +1575,19 @@ ], "sizeunit" : $[ "widget" : `combobox, - // textentry label + // combo box label (MB/GB values) "label" : _("&Unit"), "no_help" : true, "items" : [], "init" : InitSizeUnitCombo, - /* - "store" : StoreGeneric, - "handle" : HandleGeneric, - */ + // stored and handled by "size" + ], + "additive" : $[ + "widget" : `checkbox, + // check box label + "label" : _("Additive"), + "no_help" : true,// FIXME the meaning of size is different...! + "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2009,10 +2077,22 @@ list template_items = maplist (string dir, map template, Kiwi::Templates, { return `item (`id (dir), sformat ( // combo box item, %1 is name, %2 version - _("%1, version %2"), template["name"]:"", template["version"]:"") + _("%1, version %2"), template["name"]:"", get_preferences (template, "version", "")) ); }); + term arch_term = `VBox (); + + if (Arch::architecture () == "x86_64") + { + arch_term = `VBox ( + // checkbox label + `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + Kiwi::image_architecture == "i386"), + `VSpacing (0.2) + ); + } + term contents = `VBox ( new_configuration ? `VBox ( @@ -2062,6 +2142,7 @@ ) ), `VSpacing (0.2), + arch_term, `Table (`id(`repositories), `opt (`notify), `header ( // table header _("Package Repository")) @@ -2290,6 +2371,16 @@ list<string> failed_repositories = []; map<string,map> new_repositories = $[]; + + ProductCreator::ResetArch(); + + if (Arch::architecture () == "x86_64" && + UI::QueryWidget (`id (`i386), `Value) == true) + { + Kiwi::image_architecture = "i386"; + ProductCreator::SetPackageArch ("i386"); + } + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; @@ -2306,8 +2397,12 @@ url = "dir://" + url; if (haskey (current_sources, url)) { +// integer srcid = current_sources[url]:-1; current_sources = remove (current_sources, url); return true; + // TODO is it correct to check architecture now? + // but why not to list repositories that won't be used... +// return CheckArchitecture (srcid); } integer source_ret = -1; string full_url = url; @@ -2322,7 +2417,13 @@ failed_repositories = add (failed_repositories, url); return false; } - else return true; + return true; + /* see above... + if (CheckArchitecture (source_ret)) + return true; + else + return false; + */ }); foreach (string url, integer srcid, current_sources, { Pkg::SourceDelete (srcid); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/Kiwi.ycp new/yast2-product-creator-2.18.5/src/Kiwi.ycp --- old/yast2-product-creator-2.18.4/src/Kiwi.ycp 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/Kiwi.ycp 2009-05-21 09:40:27.000000000 +0200 @@ -11,12 +11,14 @@ textdomain "product-creator"; + import "Arch"; import "Directory"; import "FileUtils"; import "Label"; import "Message"; import "Package"; import "Popup"; + import "ProductCreator"; import "Progress"; import "Report"; import "Security"; @@ -42,6 +44,9 @@ // bug 331733 global string supported_boot_images = ""; + // target architecture of image (can be only i386 if different from current one) + global string image_architecture = ""; + // directories with user-made templated global list<string> templates_dirs = []; @@ -446,7 +451,10 @@ UI::ChangeWidget (`id(`errlog), `LastLine, err + "\n"); } - string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); + string linux32 = ""; + 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 (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -462,6 +470,13 @@ if (SCR::Read(.process.running, id) != true) { update_output (); + // explicitely check the process buffer after exit (bnc#488799) + string buf = (string) SCR::Read (.process.read, id); + string err_buf = (string) SCR::Read (.process.read_stderr, id); + if (buf != nil && buf != "") + UI::ChangeWidget (`id(`log), `LastLine, buf + "\n"); + if (err_buf != nil && err_buf != "") + UI::ChangeWidget (`id(`errlog), `LastLine, err_buf + "\n"); integer status = (integer) SCR::Read (.process.status, id); if (status != 0) @@ -481,7 +496,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", + chroot_dir, out_dir, linux32); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); @@ -618,10 +634,10 @@ if (config != nil && config != $[]) { string name = config["name"]:""; - string ver = config["version"]:""; - if (config["image_type"]:"" != "system") + string ver = get_preferences (config, "version", ""); + if (config["description",0,"type"]:"" != "system") y2warning ("%1 not a 'system' image type, skipping", name); - else if (name_version[name]:"" == ver) + else if (name_version[name]:nil == ver) y2warning ("template %1,%2 already imported", name, ver); else { @@ -647,6 +663,13 @@ (string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES); if (supported_boot_images == nil) supported_boot_images = ""; + string architecture = + (string) SCR::Read (.sysconfig.product-creator.DEFAULT_IMAGE_ARCHITECTURE); + if (architecture == "" || architecture == nil) + architecture = ProductCreator::GetArch (); + if (architecture != "x86_64") // all i[456]86 are i386... + architecture = "i386"; + image_architecture = architecture; return ReadImageTemplates (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/ProductCreator.ycp new/yast2-product-creator-2.18.5/src/ProductCreator.ycp --- old/yast2-product-creator-2.18.4/src/ProductCreator.ycp 2009-04-20 13:28:05.000000000 +0200 +++ new/yast2-product-creator-2.18.5/src/ProductCreator.ycp 2009-05-21 09:40:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of product-creator, input and output functions. * Authors: Anas Nashif <nashif@suse.de> * - * $Id: ProductCreator.ycp 56152 2009-03-16 14:15:51Z jsuchome $ + * $Id: ProductCreator.ycp 56903 2009-04-22 06:16:30Z jsuchome $ * * Representation of the configuration of product-creator. * Input and output routines. @@ -435,7 +435,8 @@ return content_cache[srcid]:$[]; } - string content = Pkg::SourceProvideFile(srcid, 1, "content"); + // make content file optional (for empty repos, bnc#500527) + string content = Pkg::SourceProvideOptionalFile(srcid, 1, "content"); map<string,string> contentmap = (map<string,string>)SCR::Read(.content_file, content); if (contentmap == nil) contentmap = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/VERSION new/yast2-product-creator-2.18.5/VERSION --- old/yast2-product-creator-2.18.4/VERSION 2009-04-22 08:04:41.000000000 +0200 +++ new/yast2-product-creator-2.18.5/VERSION 2009-05-21 09:47:42.000000000 +0200 @@ -1 +1 @@ -2.18.4 +2.18.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org