Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Wed May 25 10:19:34 CEST 2011.
-------- --- yast2-product-creator/yast2-product-creator.changes 2011-05-13 10:01:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2011-05-24 10:37:51.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 24 10:11:06 CEST 2011 - jsuch...@suse.cz + +- updated to new kiwi version (fate#311430 "Update kiwi to 4.8") +- 2.21.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.21.2.tar.bz2 New: ---- yast2-product-creator-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.jT78ZQ/_old 2011-05-25 10:18:43.000000000 +0200 +++ /var/tmp/diff_new_pack.jT78ZQ/_new 2011-05-25 10:18:43.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-product-creator -Version: 2.21.2 +Version: 2.21.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.21.2.tar.bz2 +Source0: yast2-product-creator-2.21.3.tar.bz2 Prefix: /usr @@ -62,7 +62,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.21.2 +%setup -n yast2-product-creator-2.21.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.21.2.tar.bz2 -> yast2-product-creator-2.21.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/VERSION new/yast2-product-creator-2.21.3/VERSION --- old/yast2-product-creator-2.21.2/VERSION 2011-05-13 10:00:04.000000000 +0200 +++ new/yast2-product-creator-2.21.3/VERSION 2011-05-24 10:11:35.000000000 +0200 @@ -1 +1 @@ -2.21.2 +2.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/Kiwi.ycp new/yast2-product-creator-2.21.3/src/Kiwi.ycp --- old/yast2-product-creator-2.21.2/src/Kiwi.ycp 2011-05-13 09:59:36.000000000 +0200 +++ new/yast2-product-creator-2.21.3/src/Kiwi.ycp 2011-05-24 10:34:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <jsuch...@suse.cz> * - * $Id: Kiwi.ycp 63513 2011-03-04 13:27:24Z jsuchome $ + * $Id: Kiwi.ycp 64094 2011-05-24 08:34:00Z jsuchome $ */ { module "Kiwi"; @@ -233,10 +233,22 @@ y2warning ("no such file %1/config.xml", base_path); return ret; } + string file_path = base_path + "/config.xml"; + if (FileUtils::Exists ("/usr/share/kiwi/xsl/master.xsl")) + { + file_path = Directory::tmpdir + "/transformed-config.xml"; + map out = (map) SCR::Execute (.target.bash_output, sformat ( + "xsltproc /usr/share/kiwi/xsl/master.xsl %1/config.xml > %2", + base_path, file_path)); + if (out["exit"]:0 != 0) + { + y2error ("xslt transformation failed: %1", out); + } + } // read rest of config.xml using more generic agent map anyxml = (map) SCR::Read (.anyxml, $[ - "file" : base_path + "/config.xml", + "file" : file_path, "args" : $[ "ForceArray" : 1, "KeepRoot" : 1, @@ -249,7 +261,7 @@ // attributes of 'image' tag: ret["name"] = image["name"]:""; - ret["schemeversion"]= image["schemeversion"]:"2.0"; + ret["schemaversion"]= image["schemaversion"]:"5.2"; if (haskey (image, "inherit")) ret["inherit"] = image["inherit"]:""; @@ -289,7 +301,6 @@ list<string> split = splitstring (lang, "."); ret = save_preferences (ret, "locale", split[0]:lang); } - return ret; } @@ -310,8 +321,8 @@ KiwiConfig = save_preferences(KiwiConfig,"defaultroot",chroot_dir); } - string image_tag = sformat ("<image name=\"%1\" schemeversion=\"%2\"%3>", - KiwiConfig["name"]:"", KiwiConfig["schemeversion"]:"2.0", + string image_tag = sformat ("<image name=\"%1\" schemaversion=\"%2\"%3>", + KiwiConfig["name"]:"", KiwiConfig["schemaversion"]:"5.2", (KiwiConfig["inherit"]:"" == "" ? "" : sformat (" inherit=\"%1\"", KiwiConfig["inherit"]:"") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/complex.ycp new/yast2-product-creator-2.21.3/src/complex.ycp --- old/yast2-product-creator-2.21.2/src/complex.ycp 2011-03-11 15:11:21.000000000 +0100 +++ new/yast2-product-creator-2.21.3/src/complex.ycp 2011-05-24 10:34:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nas...@suse.de> * - * $Id: complex.ycp 63568 2011-03-11 14:11:21Z jsuchome $ + * $Id: complex.ycp 64094 2011-05-24 08:34:00Z jsuchome $ */ { @@ -697,10 +697,12 @@ 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; + map size_map = get_current_size_map (config, task); + string unit = size_map["unit"]:"M"; + string i_size = size_map[Kiwi::content_key]:"0" + unit; + // with "additive", "size" has a different meaning - if (config["preferences",0,"size",0,"additive"]:"" == "true") + if (size_map["additive"]:"" == "true") i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.21.3/src/data/kiwi_templates/iso/config.xml --- old/yast2-product-creator-2.21.2/src/data/kiwi_templates/iso/config.xml 2011-03-04 14:25:34.000000000 +0100 +++ new/yast2-product-creator-2.21.3/src/data/kiwi_templates/iso/config.xml 2011-05-24 10:26:42.000000000 +0200 @@ -1,735 +1,51 @@ -<?xml version="1.0"?> -<image schemeversion="2.4" name="kiwi-image-template"> - <description type="system"> - <author></author> - <contact></contact> - <specification>Template for system image configuration</specification> - </description> - <preferences> - <type primary="true" boot="isoboot/suse-11.2" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true">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> - <packagemanager>zypper</packagemanager> - <size unit="M">3000</size> - <boot-theme>openSUSE</boot-theme> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>false</rpm-force> - <locale>en_US</locale> - <oem-swap>false</oem-swap> - <oem-boot-title>USB</oem-boot-title> - <rpm-excludedocs>false</rpm-excludedocs> - </preferences> - <users group="users"> - <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> - <user name="root" pwd="" home="/root"/> - </users> - <repository type="rpm-md"> - <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> - </repository> - <packages type="image" patternPackageType="onlyRequired"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="yast2-live-installer"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="udev"/> - <package name="aaa_base"/> - <package name="tar"/> - <package name="patch"/> - <package name="zypper"/> - <!-- PACKAGES BEGIN --> - <package name="ConsoleKit"/> - <package name="ConsoleKit-x11"/> - <package name="DeviceKit-disks"/> - <package name="DirectFB"/> - <package name="ImageMagick"/> - <package name="Mesa"/> - <package name="MozillaSunbird"/> - <package name="MozillaSunbird-translations"/> - <package name="PolicyKit"/> - <package name="PolicyKit-doc"/> - <package name="SuSEfirewall2"/> - <package name="a2ps"/> - <package name="aaa_base"/> - <package name="acl"/> - <package name="acpica"/> - <package name="acpid"/> - <package name="adaptec-firmware"/> - <package name="alsa"/> - <package name="alsa-firmware"/> - <package name="alsa-oss"/> - <package name="alsa-plugins"/> - <package name="alsa-utils"/> - <package name="apparmor-parser"/> - <package name="apparmor-profiles"/> - <package name="apparmor-utils"/> - <package name="aria2"/> - <package name="aspell"/> - <package name="aspell-de"/> - <package name="aspell-en"/> - <package name="atk"/> - <package name="atmel-firmware"/> - <package name="attr"/> - <package name="audiofile"/> - <package name="audit"/> - <package name="audit-libs"/> - <package name="augeas-lenses"/> - <package name="autofs"/> - <package name="autoyast2-installation"/> - <package name="awesfx"/> - <package name="b43-fwcutter"/> - <package name="bash"/> - <package name="bc"/> - <package name="bind-libs"/> - <package name="bind-utils"/> - <package name="bluez-firmware"/> - <package name="bootsplash"/> - <package name="bootsplash-branding-openSUSE"/> - <package name="branding-openSUSE"/> - <package name="btrfsprogs"/> - <package name="bundle-lang-common-de"/> - <package name="bundle-lang-common-en"/> - <package name="bzip2"/> - <package name="cabextract"/> - <package name="cairo"/> - <package name="cdrkit-cdrtools-compat"/> - <package name="checkmedia"/> - <package name="cifs-mount"/> - <package name="command-not-found"/> - <package name="compcache"/> - <package name="compcache-kmp-desktop"/> - <package name="coreutils"/> - <package name="cpio"/> - <package name="cpp"/> - <package name="cpp44"/> - <package name="cracklib"/> - <package name="cracklib-dict-full"/> - <package name="crda"/> - <package name="cron"/> - <package name="cryptsetup"/> - <package name="cups"/> - <package name="cups-client"/> - <package name="cups-drivers"/> - <package name="cups-libs"/> - <package name="curl"/> - <package name="cyrus-sasl"/> - <package name="cyrus-sasl-crammd5"/> - <package name="cyrus-sasl-digestmd5"/> - <package name="cyrus-sasl-gssapi"/> - <package name="cyrus-sasl-plain"/> - <package name="db-utils"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> - <package name="dbus-1-x11"/> - <package name="ddrescue"/> - <package name="dejavu"/> - <package name="deltarpm"/> - <package name="desktop-data-openSUSE"/> - <package name="desktop-file-utils"/> - <package name="device-mapper"/> - <package name="dhcpcd"/> - <package name="dialog"/> - <package name="diffutils"/> - <package name="dirmngr"/> - <package name="dmidecode"/> - <package name="dmraid"/> - <package name="dosfstools"/> - <package name="dvb"/> - <package name="e2fsprogs"/> - <package name="eject"/> - <package name="elfutils"/> - <package name="esound-daemon"/> - <package name="espeak"/> - <package name="ethtool"/> - <package name="fam"/> - <package name="fbset"/> - <package name="file"/> - <package name="filesystem"/> - <package name="fillup"/> - <package name="findutils"/> - <package name="fontconfig"/> - <package name="fonts-config"/> - <package name="foomatic-filters"/> - <package name="freeglut"/> - <package name="freetype2"/> - <package name="fuse"/> - <package name="gawk"/> - <package name="gconf2"/> - <package name="gd"/> - <package name="gdbm"/> - <package name="genisoimage"/> - <package name="gettext-runtime"/> - <package name="gfxboot"/> - <package name="gfxboot-branding-openSUSE"/> - <package name="ghostscript-fonts-std"/> - <package name="ghostscript-library"/> - <package name="ghostscript-x11"/> - <package name="glib2"/> - <package name="glib2-branding-openSUSE"/> - <package name="glibc"/> - <package name="glibc-32bit"/> - <package name="glibc-locale"/> - <package name="glibc-locale-32bit"/> - <package name="gnome-icon-theme"/> - <package name="gnome-keyring"/> - <package name="gnome-vfs2"/> - <package name="gnutls"/> - <package name="gpart"/> - <package name="gpg2"/> - <package name="gpm"/> - <package name="grep"/> - <package name="groff"/> - <package name="grub"/> - <package name="gtk2"/> - <package name="gtk2-branding-openSUSE"/> - <package name="gtk2-engine-murrine"/> - <package name="gtk2-engines"/> - <package name="gtk2-metatheme-gilouche"/> - <package name="gtk2-metatheme-sonar"/> - <package name="gvfs"/> - <package name="gvfs-backends"/> - <package name="gvfs-fuse"/> - <package name="gzip"/> - <package name="hal"/> - <package name="hdparm"/> - <package name="hicolor-icon-theme"/> - <package name="hwinfo"/> - <package name="icedax"/> - <package name="icewm"/> - <package name="icewm-lite"/> - <package name="ifnteuro"/> - <package name="ifplugd"/> - <package name="info"/> - <package name="info2html"/> - <package name="initviocons"/> - <package name="input-utils"/> - <package name="insserv"/> - <package name="iproute2"/> - <package name="iptables"/> - <package name="iputils"/> - <package name="ipw-firmware"/> - <package name="irda"/> - <package name="irqbalance"/> - <package name="iw"/> - <package name="jfsutils"/> - <package name="kbd"/> - <package name="kernel-desktop"/> - <package name="kernel-firmware"/> - <package name="keyutils"/> - <package name="keyutils-libs"/> - <package name="klogd"/> - <package name="kpartx"/> - <package name="krb5"/> - <package name="krb5-client"/> - <package name="lcms"/> - <package name="less"/> - <package name="libFLAC8"/> - <package name="libHX18"/> - <package name="libMagickCore2"/> - <package name="libMagickWand2"/> - <package name="libSDL-1_2-0"/> - <package name="libacl"/> - <package name="libadns1"/> - <package name="libaio"/> - <package name="libapparmor1"/> - <package name="libarchive2"/> - <package name="libart_lgpl"/> - <package name="libasm1"/> - <package name="libasound2"/> - <package name="libatasmart4"/> - <package name="libatk-1_0-0"/> - <package name="libattr"/> - <package name="libaugeas0"/> - <package name="libavahi-client3"/> - <package name="libavahi-common3"/> - <package name="libavahi-glib1"/> - <package name="libblkid1"/> - <package name="libblocxx6"/> - <package name="libbluetooth3"/> - <package name="libbonobo"/> - <package name="libbonoboui"/> - <package name="libbonoboui-lang"/> - <package name="libbz2-1"/> - <package name="libcap2"/> - <package name="libcdio10"/> - <package name="libcdio_cdda0"/> - <package name="libcdio_paranoia0"/> - <package name="libcloog0"/> - <package name="libcom_err2"/> - <package name="libcryptsetup0"/> - <package name="libcurl4"/> - <package name="libdaemon0"/> - <package name="libdb-4_5"/> - <package name="libdns_sd"/> - <package name="libdrm"/> - <package name="libdw1"/> - <package name="libeggdbus-1-0"/> - <package name="libelf1"/> - <package name="liberation-fonts"/> - <package name="libesd0"/> - <package name="libevent-1_4-2"/> - <package name="libexif"/> - <package name="libexpat1"/> - <package name="libext2fs2"/> - <package name="libfprint0"/> - <package name="libfreebl3"/> - <package name="libfuse2"/> - <package name="libgcc44"/> - <package name="libgcrypt11"/> - <package name="libgdu0"/> - <package name="libgimpprint"/> - <package name="libgio-2_0-0"/> - <package name="libgio-fam"/> - <package name="libglade2"/> - <package name="libglib-2_0-0"/> - <package name="libgmodule-2_0-0"/> - <package name="libgmp3"/> - <package name="libgmpxx4"/> - <package name="libgnome"/> - <package name="libgnomecanvas"/> - <package name="libgnomecanvas-lang"/> - <package name="libgnomeui"/> - <package name="libgnomeui-lang"/> - <package name="libgnutls26"/> - <package name="libgobject-2_0-0"/> - <package name="libgomp44"/> - <package name="libgpg-error0"/> - <package name="libgphoto2"/> - <package name="libgssglue1"/> - <package name="libgthread-2_0-0"/> - <package name="libgudev-1_0-0"/> - <package name="libgvfscommon0"/> - <package name="libidl"/> - <package name="libidn"/> - <package name="libiw30"/> - <package name="libjasper"/> - <package name="libjpeg"/> - <package name="libksba"/> - <package name="liblcms1"/> - <package name="libldap-2_4-2"/> - <package name="libldapcpp1"/> - <package name="libltdl7"/> - <package name="liblua5_1"/> - <package name="liblzma0"/> - <package name="liblzo2-2"/> - <package name="libmng"/> - <package name="libmpfr1"/> - <package name="libmysqlclient_r16"/> - <package name="libncurses5"/> - <package name="libncurses5-32bit"/> - <package name="libncurses6"/> - <package name="libnetpbm10"/> - <package name="libnl"/> - <package name="libnscd"/> - <package name="libnsssharedhelper0"/> - <package name="libnuma1"/> - <package name="libogg0"/> - <package name="libopenct1"/> - <package name="libopensc2"/> - <package name="libopenssl0_9_8"/> - <package name="libpcap1"/> - <package name="libpciaccess0"/> - <package name="libpcre0"/> - <package name="libpixman-1-0"/> - <package name="libpng12-0"/> - <package name="libpolkit0"/> - <package name="libpoppler5"/> - <package name="libpopt0"/> - <package name="libppl7"/> - <package name="libppl_c2"/> - <package name="libproxy0"/> - <package name="libproxy0-config-gnome"/> - <package name="libproxy0-pacrunner-mozjs"/> - <package name="libproxy0-wpad-dns"/> - <package name="libpth20"/> - <package name="libpulse0"/> - <package name="libpython2_6-1_0"/> - <package name="libqt4"/> - <package name="libqt4-qt3support"/> - <package name="libqt4-sql"/> - <package name="libqt4-sql-mysql"/> - <package name="libqt4-x11"/> - <package name="libreadline6"/> - <package name="libreiserfs"/> - <package name="librpcsecgss"/> - <package name="libselinux1"/> - <package name="libsmbclient0"/> - <package name="libsmbios-bin"/> - <package name="libsmbios2"/> - <package name="libsndfile"/> - <package name="libsoup-2_4-1"/> - <package name="libsqlite3-0"/> - <package name="libstdc++44"/> - <package name="libstorage"/> - <package name="libtalloc1"/> - <package name="libtasn1"/> - <package name="libtasn1-3"/> - <package name="libtdb1"/> - <package name="libtiff3"/> - <package name="libtirpc1"/> - <package name="libudev0"/> - <package name="libusb-0_1-4"/> - <package name="libusb-1_0-0"/> - <package name="libuuid1"/> - <package name="libvorbis"/> - <package name="libwbclient0"/> - <package name="libx86"/> - <package name="libx86emu1"/> - <package name="libxcrypt"/> - <package name="libxml2"/> - <package name="libzio"/> - <package name="libzypp"/> - <package name="licenses"/> - <package name="limal"/> - <package name="limal-ca-mgm"/> - <package name="limal-ca-mgm-perl"/> - <package name="limal-nfs-server"/> - <package name="limal-nfs-server-perl"/> - <package name="limal-perl"/> - <package name="linux-atm-lib"/> - <package name="linux32"/> - <package name="login"/> - <package name="logrotate"/> - <package name="lomoco"/> - <package name="lsb-release"/> - <package name="lsof"/> - <package name="lsscsi"/> - <package name="lukemftp"/> - <package name="lvm2"/> - <package name="mailx"/> - <package name="man"/> - <package name="manufacturer-PPDs"/> - <package name="master-boot-code"/> - <package name="mc"/> - <package name="mdadm"/> - <package name="memtest86+"/> - <package name="mhash"/> - <package name="microcode_ctl"/> - <package name="mingetty"/> - <package name="mkinitrd"/> - <package name="module-init-tools"/> - <package name="mozilla-nspr"/> - <package name="mozilla-nss"/> - <package name="mpt-firmware"/> - <package name="mtools"/> - <package name="multipath-tools"/> - <package name="nano"/> - <package name="ncurses-utils"/> - <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-desktop"/> - <package name="net-tools"/> - <package name="netcat"/> - <package name="netcfg"/> - <package name="netpbm"/> - <package name="nfs-client"/> - <package name="nfsidmap"/> - <package name="nss_ldap"/> - <package name="ntfs-3g"/> - <package name="ntfsprogs"/> - <package name="ntp"/> - <package name="numactl"/> - <package name="numlockx"/> - <package name="obex-data-server"/> - <package name="openSUSE-build-key"/> - <package name="openSUSE-release"/> - <package name="openldap2-client"/> - <package name="openobex"/> - <package name="openslp"/> - <package name="openssh"/> - <package name="openssh-askpass"/> - <package name="openssl"/> - <package name="openssl-certs"/> - <package name="opensuse-manuals_en"/> - <package name="orbit2"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="pam_apparmor"/> - <package name="pam_fp"/> - <package name="pam_krb5"/> - <package name="pam_ldap"/> - <package name="pam_mount"/> - <package name="pango"/> - <package name="parted"/> - <package name="patterns-openSUSE-apparmor"/> - <package name="patterns-openSUSE-base"/> - <package name="patterns-openSUSE-enhanced_base"/> - <package name="patterns-openSUSE-fonts"/> - <package name="patterns-openSUSE-sw_management"/> - <package name="patterns-openSUSE-x11"/> - <package name="patterns-openSUSE-x11_yast"/> - <package name="patterns-openSUSE-yast2_basis"/> - <package name="patterns-openSUSE-yast2_install_wf"/> - <package name="pciutils"/> - <package name="pciutils-ids"/> - <package name="pcmciautils"/> - <package name="pcre"/> - <package name="perl"/> - <package name="perl-Bootloader"/> - <package name="perl-Business-ISBN"/> - <package name="perl-Business-ISBN-Data"/> - <package name="perl-Config-Crontab"/> - <package name="perl-Crypt-SSLeay"/> - <package name="perl-Crypt-SmbHash"/> - <package name="perl-DBD-SQLite"/> - <package name="perl-DBI"/> - <package name="perl-Digest-HMAC"/> - <package name="perl-Digest-MD4"/> - <package name="perl-Digest-SHA1"/> - <package name="perl-File-Tail"/> - <package name="perl-GD"/> - <package name="perl-GD-Barcode"/> - <package name="perl-HTML-Parser"/> - <package name="perl-HTML-Tagset"/> - <package name="perl-Net-Daemon"/> - <package name="perl-NetxAP"/> - <package name="perl-Parse-RecDescent"/> - <package name="perl-PlRPC"/> - <package name="perl-RPC-XML"/> - <package name="perl-TermReadKey"/> - <package name="perl-TimeDate"/> - <package name="perl-URI"/> - <package name="perl-WWW-Curl"/> - <package name="perl-X500-DN"/> - <package name="perl-XML-LibXML"/> - <package name="perl-XML-LibXML-Common"/> - <package name="perl-XML-NamespaceSupport"/> - <package name="perl-XML-Parser"/> - <package name="perl-XML-SAX"/> - <package name="perl-XML-Simple"/> - <package name="perl-XML-Writer"/> - <package name="perl-XML-XPath"/> - <package name="perl-base"/> - <package name="perl-gettext"/> - <package name="perl-libapparmor"/> - <package name="perl-libwww-perl"/> - <package name="permissions"/> - <package name="pinentry"/> - <package name="pkg-config"/> - <package name="pm-profiler"/> - <package name="pm-utils"/> - <package name="polkit"/> - <package name="polkit-default-privs"/> - <package name="poppler-tools"/> - <package name="postfix"/> - <package name="ppp"/> - <package name="pptp"/> - <package name="preload"/> - <package name="preload-kmp-desktop"/> - <package name="procps"/> - <package name="psmisc"/> - <package name="pullin-flash-player"/> - <package name="pullin-msttf-fonts"/> - <package name="pwdutils"/> - <package name="python"/> - <package name="python-base"/> - <package name="python-satsolver"/> - <package name="python-xml"/> - <package name="quota"/> - <package name="recode"/> - <package name="reiserfs"/> - <package name="release-notes-openSUSE"/> - <package name="rpcbind"/> - <package name="rpm"/> - <package name="rpm-python"/> - <package name="rsync"/> - <package name="rsyslog"/> - <package name="satsolver-tools"/> - <package name="sax2"/> - <package name="sax2-gui"/> - <package name="sax2-ident"/> - <package name="sax2-libsax"/> - <package name="sax2-libsax-perl"/> - <package name="sax2-tools"/> - <package name="sbl"/> - <package name="scout"/> - <package name="scpm"/> - <package name="sed"/> - <package name="setserial"/> - <package name="sg3_utils"/> - <package name="shared-mime-info"/> - <package name="slang"/> - <package name="smartmontools"/> - <package name="smp_utils"/> - <package name="smpppd"/> - <package name="splashy"/> - <package name="splashy-branding-openSUSE"/> - <package name="strace"/> - <package name="sudo"/> - <package name="suseRegister"/> - <package name="susehelp"/> - <package name="susehelp_de"/> - <package name="susehelp_en"/> - <package name="suspend"/> - <package name="sysconfig"/> - <package name="sysfsutils"/> - <package name="systemtap-runtime"/> - <package name="sysvinit"/> - <package name="tar"/> - <package name="tcpd"/> - <package name="terminfo-base"/> - <package name="tightvnc"/> - <package name="timezone"/> - <package name="translation-update"/> - <package name="translation-update-de"/> - <package name="udev"/> - <package name="ulimit"/> - <package name="unrar"/> - <package name="unscd"/> - <package name="unzip"/> - <package name="update-alternatives"/> - <package name="usbutils"/> - <package name="utempter"/> - <package name="util-linux"/> - <package name="vim"/> - <package name="vim-base"/> - <package name="virtualbox-ose-kmp-desktop"/> - <package name="w3m"/> - <package name="wdiff"/> - <package name="wget"/> - <package name="wireless-regdb"/> - <package name="wireless-tools"/> - <package name="wodim"/> - <package name="wpa_supplicant"/> - <package name="wvdial"/> - <package name="wvstreams"/> - <package name="x11-input-fujitsu"/> - <package name="x11-input-wacom"/> - <package name="x11-tools"/> - <package name="xdg-menu"/> - <package name="xdg-utils"/> - <package name="xfsdump"/> - <package name="xfsprogs"/> - <package name="xinetd"/> - <package name="xkeyboard-config"/> - <package name="xorg-x11"/> - <package name="xorg-x11-Xvnc"/> - <package name="xorg-x11-driver-input"/> - <package name="xorg-x11-driver-video"/> - <package name="xorg-x11-driver-video-radeonhd"/> - <package name="xorg-x11-driver-virtualbox-ose"/> - <package name="xorg-x11-fonts-core"/> - <package name="xorg-x11-libICE"/> - <package name="xorg-x11-libSM"/> - <package name="xorg-x11-libX11"/> - <package name="xorg-x11-libX11-ccache"/> - <package name="xorg-x11-libXau"/> - <package name="xorg-x11-libXdmcp"/> - <package name="xorg-x11-libXext"/> - <package name="xorg-x11-libXfixes"/> - <package name="xorg-x11-libXmu"/> - <package name="xorg-x11-libXp"/> - <package name="xorg-x11-libXpm"/> - <package name="xorg-x11-libXprintUtil"/> - <package name="xorg-x11-libXrender"/> - <package name="xorg-x11-libXt"/> - <package name="xorg-x11-libXv"/> - <package name="xorg-x11-libfontenc"/> - <package name="xorg-x11-libs"/> - <package name="xorg-x11-libxcb"/> - <package name="xorg-x11-libxkbfile"/> - <package name="xorg-x11-server"/> - <package name="xorg-x11-xauth"/> - <package name="xstroke"/> - <package name="xterm"/> - <package name="xz"/> - <package name="yast2"/> - <package name="yast2-add-on"/> - <package name="yast2-apparmor"/> - <package name="yast2-backup"/> - <package name="yast2-bootloader"/> - <package name="yast2-branding-openSUSE"/> - <package name="yast2-control-center"/> - <package name="yast2-control-center-qt"/> - <package name="yast2-core"/> - <package name="yast2-country"/> - <package name="yast2-country-data"/> - <package name="yast2-dbus-client"/> - <package name="yast2-fingerprint-reader"/> - <package name="yast2-firewall"/> - <package name="yast2-hardware-detection"/> - <package name="yast2-inetd"/> - <package name="yast2-installation"/> - <package name="yast2-irda"/> - <package name="yast2-iscsi-client"/> - <package name="yast2-kerberos-client"/> - <package name="yast2-ldap"/> - <package name="yast2-ldap-client"/> - <package name="yast2-libyui"/> - <package name="yast2-mail"/> - <package name="yast2-metapackage-handler"/> - <package name="yast2-mouse"/> - <package name="yast2-ncurses"/> - <package name="yast2-ncurses-pkg"/> - <package name="yast2-network"/> - <package name="yast2-nfs-client"/> - <package name="yast2-nfs-common"/> - <package name="yast2-nis-client"/> - <package name="yast2-ntp-client"/> - <package name="yast2-online-update"/> - <package name="yast2-online-update-frontend"/> - <package name="yast2-packager"/> - <package name="yast2-packager-webpin"/> - <package name="yast2-pam"/> - <package name="yast2-perl-bindings"/> - <package name="yast2-pkg-bindings"/> - <package name="yast2-printer"/> - <package name="yast2-profile-manager"/> - <package name="yast2-qt"/> - <package name="yast2-qt-pkg"/> - <package name="yast2-registration"/> - <package name="yast2-registration-branding-openSUSE"/> - <package name="yast2-repair"/> - <package name="yast2-restore"/> - <package name="yast2-runlevel"/> - <package name="yast2-samba-client"/> - <package name="yast2-samba-server"/> - <package name="yast2-scanner"/> - <package name="yast2-security"/> - <package name="yast2-slp"/> - <package name="yast2-sound"/> - <package name="yast2-storage"/> - <package name="yast2-sudo"/> - <package name="yast2-sysconfig"/> - <package name="yast2-theme-openSUSE"/> - <package name="yast2-trans-de"/> - <package name="yast2-trans-en_US"/> - <package name="yast2-trans-stats"/> - <package name="yast2-transfer"/> - <package name="yast2-tune"/> - <package name="yast2-tv"/> - <package name="yast2-update"/> - <package name="yast2-users"/> - <package name="yast2-vm"/> - <package name="yast2-x11"/> - <package name="yast2-xml"/> - <package name="yast2-ycp-ui-bindings"/> - <package name="yp-tools"/> - <package name="ypbind"/> - <package name="zd1211-firmware"/> - <package name="zip"/> - <package name="zisofs-tools"/> - <package name="zlib"/> - <package name="zypper"/> - <!-- PACKAGES END --> - </packages> - <packages type="bootstrap"> - <package name="filesystem"/> - <package name="bundle-lang-common-en"/> - <package name="openSUSE-release"/> - <package name="openSUSE-release-livecd-x11"/> - </packages> - <split> - <temporary> - <!-- allow read/write access to: --> - <file name="/var"/> - <file name="/var/*"/> - <file name="/etc"/> - <file name="/etc/*"/> - </temporary> - </split> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-image-template"> + <description type="system"> + <author/> + <contact/> + <specification>Template for system image configuration</specification> + </description> + <preferences> + <type image="iso" primary="true" boot="isoboot/suse-11.4" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true"> + <size unit="M">3000</size> + </type> + <type image="vmx" boot="vmxboot/suse-11.4" filesystem="ext3" format="vmdk"> + <size unit="M">3000</size> + </type> + <type image="usb" boot="usbboot/suse-11.4" filesystem="ext3"> + <size unit="M">3000</size> + </type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">3000</type> + <type image="oem" boot="oemboot/suse-11.4" filesystem="ext3" flags="unified"> + <size unit="M">3000</size> + <oemconfig> + <oem-boot-title>USB</oem-boot-title> + <oem-swap>false</oem-swap> + </oemconfig> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <boot-theme>openSUSE</boot-theme> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> + <locale>en_US</locale> + <rpm-excludedocs>false</rpm-excludedocs> + </preferences> + <users group="users"> + <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> + <user name="root" pwd="" home="/root"/> + </users> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> + </repository> + <packages type="image"> + <opensusePattern name="Minimal"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-livecd-x11"/> + </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/data/kiwi_templates/xen/config.xml new/yast2-product-creator-2.21.3/src/data/kiwi_templates/xen/config.xml --- old/yast2-product-creator-2.21.2/src/data/kiwi_templates/xen/config.xml 2009-02-27 12:24:13.000000000 +0100 +++ new/yast2-product-creator-2.21.3/src/data/kiwi_templates/xen/config.xml 2011-05-24 10:10:45.000000000 +0200 @@ -1,31 +1,31 @@ -<?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-xen-image-template"> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-xen-image-template"> <description type="system"> - <author></author> - <contact></contact> + <author/> + <contact/> <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">2000</type> <version>1.0.0</version> - <size unit="M">2000</size> <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>True</rpm-force> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> </preferences> <users group="users"> - <user home="/home/linux" name="linux"/> - <user home="/root" name="root"/> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> </users> <packages type="image"> - <package name="OpenIPMI"/> + <package name="OpenIPMI"/> <package name="lvm2"/> <package name="aaa_base"/> <package name="aaa_skel"/> <package name="acl"/> <package name="acpid"/> <package name="attr"/> - <!-- for x86_64 only --> +<!-- for x86_64 only --> <package name="linux32" arch="x86_64"/> <package name="bash"/> <package name="bc"/> @@ -167,7 +167,7 @@ <package name="portmap"/> <package name="cron"/> </packages> - <packages type="xen" memory="512" disk="/dev/sda"> + <packages type="xen"> <package name="kernel-xen"/> <package name="xen"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/kiwi_dialogs.ycp new/yast2-product-creator-2.21.3/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.21.2/src/kiwi_dialogs.ycp 2011-05-13 09:59:37.000000000 +0200 +++ new/yast2-product-creator-2.21.3/src/kiwi_dialogs.ycp 2011-05-24 10:34:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <jsuch...@suse.cz> * - * $Id: kiwi_dialogs.ycp 63568 2011-03-11 14:11:21Z jsuchome $ + * $Id: kiwi_dialogs.ycp 64094 2011-05-24 08:34:00Z jsuchome $ */ { textdomain "product-creator"; @@ -73,7 +73,7 @@ string current_method = "none"; foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { current_method = typemap["flags"]:current_method; } @@ -98,7 +98,7 @@ KiwiConfig["preferences",0,"type"] = maplist (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (selected == "none") { @@ -361,29 +361,6 @@ } /** - * initialize the value of compress checkbox - */ - define void InitCompressCheckBox (string id) { - UI::ChangeWidget (`id (id), `Enabled, false); - UI::ChangeWidget (`id (id), `Value, KiwiConfig["compressed"]:false); - } - - /** - * store the value of compress checkbox - */ - define void StoreCompressCheckBox (string key, map event) { - KiwiConfig["compressed"] = (boolean) UI::QueryWidget(`id(key), `Value); - } - /** - * handler for compress checkbox - */ - define symbol HandleCompressCheckBox (string key, map event) { - // store the value on exiting - if (event["ID"]:nil == `next) StoreCompressCheckBox (key, event); - return nil; - } - - /** * initialize the value of version */ define void InitVersion (string id) { @@ -411,42 +388,40 @@ } /** - * initialize the value of size unit + * initialize the values of "size", "sizeunit" and "additive" widgets */ - define void InitSizeUnitCombo (string id) { - string unit = KiwiConfig["preferences",0,"size",0,"unit"]:"M"; - UI::ChangeWidget (`id (id), `Items, maplist (string u, [ "M", "G" ], ``( - `item (`id (u), u + "B", unit == u)) - )); - } + define void InitSize (string id) { - /** - * 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); - } + map size_map = get_current_size_map (KiwiConfig, kiwi_task); - /** - * initialize the value of version - */ - define void InitSize (string id) { - integer siz = tointeger (get_preferences (KiwiConfig, "size", "2000")); - if (siz == nil) siz = 2000; - UI::ChangeWidget (`id (id), `Value, siz); + integer siz = tointeger (size_map[Kiwi::content_key]:"0"); + if (siz == nil) siz = 0; + UI::ChangeWidget (`id ("size"), `Value, siz); + UI::ChangeWidget (`id ("additive"), `Value, size_map["additive"]:"" == "true"); + UI::ChangeWidget (`id ("sizeunit"), `Items, maplist (string u, [ "M", "G" ], ``( + `item (`id (u), u + "B", size_map["unit"]:"M" == u)) + )); } /** - * store the size value + * store the values of "size", "sizeunit" and "additive" widgets */ 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), - "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) - ? "true" : "false" - ]]; + + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap["image"]:"" == kiwi_task) + { + typemap["size"] = [ $[ + content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) ? "true" : "false", + ] ]; + } + return typemap; + }); + } /** @@ -1322,22 +1297,10 @@ if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) { - if (kiwi_task == "usb" && false) - { - // additional question (yes/no) - if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" -Save the image to the stick now?"))) - { - NotImplementedHandler ("", $[ "ID" : ""]); - } - } - else - { - // default popup message, %1 is a dir - Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in + // default popup message, %1 is a dir + Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in %1 directory."), out_dir)); - } } else { @@ -1502,8 +1465,8 @@ KiwiConfig["preferences",0,"type"] = maplist ( map typemap, (list<map>)pref[0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" && type != kiwi_task) + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" && type != kiwi_task) typemap = remove (typemap, "primary"); else if (type == kiwi_task) { @@ -1527,7 +1490,7 @@ map<string,any> def_map = Kiwi::ReadConfigXML (default_dir); foreach (map typemap, (list<map>)def_map["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { KiwiConfig["preferences",0,"type"] = add ( KiwiConfig["preferences",0,"type"]:[], typemap); @@ -1595,7 +1558,7 @@ // compression not allowed in most cases (bnc#510833) foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (typemap["filesystem"]:"" == "ext3") show_compression = false; @@ -1735,16 +1698,6 @@ "validate_function" : CreateImage, "no_help" : true, ], - // widgets for config.xml tab - "compressed" : $[ - "widget" : `checkbox, - // textentry label - "label" : _("Co&mpress"), - "help" : _("<p>Check <b>Compress</b> if the final image should be based \non the squashfs compressed file system."), - "init" : InitCompressCheckBox, - "store" : StoreCompressCheckBox, - "handle" : HandleCompressCheckBox, - ], "compression" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], @@ -1830,7 +1783,6 @@ "label" : _("&Unit"), "no_help" : true, "items" : [], - "init" : InitSizeUnitCombo, // stored and handled by "size" ], "additive" : $[ @@ -1838,7 +1790,6 @@ // check box label "label" : _("Additive"), "no_help" : true, - "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2256,7 +2207,7 @@ list type_its = []; //solve `back here (=no import) foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; + string type = typemap["image"]:""; type_its = add (type_its, `item (`id (type), task2label[type]:type, type == kiwi_task)); }); @@ -2331,8 +2282,8 @@ kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" || kiwi_task == "") + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" || kiwi_task == "") kiwi_task = type; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.2/src/routines.ycp new/yast2-product-creator-2.21.3/src/routines.ycp --- old/yast2-product-creator-2.21.2/src/routines.ycp 2010-11-09 14:40:40.000000000 +0100 +++ new/yast2-product-creator-2.21.3/src/routines.ycp 2011-05-24 10:34:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of product-creator. * Authors: Anas Nashif <nas...@suse.de> * - * $Id: routines.ycp 62770 2010-11-09 13:40:39Z jsuchome $ + * $Id: routines.ycp 64094 2011-05-24 08:34:00Z jsuchome $ */ { @@ -41,12 +41,10 @@ string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { if (task == "") // take the 1st one if none is default - task = typemap[Kiwi::content_key]:task; - if (typemap["primary"]:"false" == "true") + task = typemap["image"]:task; + if (tolower (typemap["primary"]:"false") == "true") { - task = typemap[Kiwi::content_key]:task; - if (task == "" && typemap["image"]:"" != "") - task = typemap["image"]:""; + task = typemap["image"]:task; break; } }); @@ -58,12 +56,24 @@ return task; } +// return the size info for current image type +map get_current_size_map (map config, string task) { + + map ret = $[]; + foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { + if (task == typemap["image"]:"") + ret = typemap["size",0]:$[]; + }); + return ret; +} + + // get the value of boot image directory string get_bootdir (map config, string task) { string dir = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - if (task == typemap[Kiwi::content_key]:"") + if (task == typemap["image"]:"") { dir = typemap["boot"]:""; break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org