Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Fri Jul 3 17:06:17 CEST 2009.
--------
--- yast2-product-creator/yast2-product-creator.changes 2009-06-08 13:06:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2009-06-22 11:42:56.000000000 +0200
@@ -1,0 +2,24 @@
+Mon Jun 22 11:28:49 CEST 2009 - jsuchome@suse.cz
+
+- do not show "compression" widget for ext3 filesystems (bnc#510833)
+- 2.18.9
+
+-------------------------------------------------------------------
+Thu Jun 18 09:25:16 CEST 2009 - jsuchome@suse.cz
+
+- 2.18.8
+
+-------------------------------------------------------------------
+Tue Jun 16 14:27:48 CEST 2009 - mvidner@suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
+Fri Jun 12 14:29:07 CEST 2009 - jsuchome@suse.cz
+
+- do not forget to close opened windows on error (bnc#511436)
+- correctly set target 32bit architecture on x86_64 (bnc#510971)
+- with "additive", do not count the packages size (bnc#512358)
+- 2.18.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.18.5.tar.bz2
New:
----
yast2-product-creator-2.18.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.p15108/_old 2009-07-03 17:05:59.000000000 +0200
+++ /var/tmp/diff_new_pack.p15108/_new 2009-07-03 17:05:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.18.5)
+# spec file for package yast2-product-creator (Version 2.18.9)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.18.5
-Release: 2
-License: GPL v2 or later
+Version: 2.18.9
+Release: 1
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.18.5.tar.bz2
+Source0: yast2-product-creator-2.18.9.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
@@ -46,16 +46,8 @@
A wizard for creating your own product (installation images, live ISO,
XEN images etc.), based on existing installation sources.
-
-
-Authors:
---------
- Anas Nashif
- Ladislav Slezak
- Jiri Suchomel
-
%prep
-%setup -n yast2-product-creator-2.18.5
+%setup -n yast2-product-creator-2.18.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,7 +57,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -101,428 +95,3 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
-* Mon Jun 08 2009 jsuchome@suse.cz
-- updated help texts
-- fixed cross-architecture checks (bnc#503906)
-- 2.18.6
-* 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
-* Tue Apr 14 2009 jsuchome@suse.cz
-- Image Creator: install squashfs by default (bnc#485052)
-- 2.18.3
-* Wed Apr 01 2009 jsuchome@suse.cz
-- read the configured architecture with GetArch, which merges
- i586 and i686 to i386 (bnc#464727)
-- 2.18.2
-* Mon Mar 16 2009 jsuchome@suse.cz
-- 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.18.1
-* 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
-- unload all sources after changing a configuration to reset the
- internal state so the correct "cross-ppc-binutils" package is
- installed (bnc#469191)
-* Tue Jan 27 2009 lslezak@suse.cz
-- PPC boot files are optional (SLES11 does not contain 'inst32'
- file) (bnc#469272)
-* Wed Nov 19 2008 lslezak@suse.cz
-- fixed creating cross-arch PPC product (cross-ppc-binutils,
- updated lilo and util-linux packages are needed) (bnc#443859)
-- 2.17.13
-* Tue Nov 11 2008 lslezak@suse.cz
-- fixed architecture check of CODE11 repositories (bnc#438732)
-- 2.17.12
-* Fri Oct 31 2008 jsuchome@suse.cz
-- image-creator template: install pattern packages by default
- (bnc#404022)
-- 2.17.11
-* Fri Oct 31 2008 lslezak@suse.cz
-- read and set the product name (bnc#440609)
-* Fri Oct 24 2008 lslezak@suse.cz
-- File "/PS3/otheros/otheros.bld" is optional when creating a PPC
- product (bnc#438210)
-* Thu Oct 23 2008 lslezak@suse.cz
-- added a help text describing linuxrc option insecure=1
-* Wed Oct 15 2008 jsuchome@suse.cz
-- Image Creator: added widgets for locale, timezone and keytable
- (bnc#435208)
-- 2.17.10
-* Tue Oct 14 2008 lslezak@suse.cz
-- use Pkg::ResolvableProperties() instead of
- Pkg::PkgPropertiesAll() when verifying availablity of all
- packages, that's much faster
-- add 'Insecure: 1' to linuxrc.config file when the product is not
- signed (bnc#421571)
-- 2.17.9
-* Mon Oct 13 2008 lslezak@suse.cz
-- mark taboo packages when creating a product (bnc#421180)
-- 2.17.8
-* Mon Oct 13 2008 jsuchome@suse.cz
-- Image Creator: include packagemanager in templates (bnc#434692)
-* Mon Oct 13 2008 lslezak@suse.cz
-- fixed source ID checks (0 is a valid ID)
-- do not automatically add kernel-pae (i386 only) package into
- x86_64 product (bnc#421995)
-- properly convert repo URL to ID
-* Tue Sep 09 2008 jsuchome@suse.cz
-- merged texts from proofread
-- 2.17.7
-* Mon Aug 11 2008 lslezak@suse.cz
-- added cross-architecture support (e.g. create a PPC installation
- iso image on an i386 machine, but does not work in the kiwi part)
- (fate#301883)
-- 2.17.6
-* Fri Aug 01 2008 jsuchome@suse.cz
-- Image Creator: added GUI to configure image compression
-- 2.17.5
-* Fri Jul 25 2008 jsuchome@suse.cz
-- read the default information for new type from the template
-- .background agent replaced by .process
-* Thu Jul 24 2008 jsuchome@suse.cz
-- adapted to last version of ag_anyxml (bnc#409491)
-- Image Creator: allow more configurations with same name
-- added new image type that was not in previous config.xml
-- 2.17.4
-* Mon Jul 07 2008 jsuchome@suse.cz
-- create a path to the defaultroot directory if it doesn't exists
- (bnc#406731)
-- 2.17.3
-* Wed Jun 18 2008 jsuchome@suse.cz
-- handle pattern file with more patterns when deleting unused
- ones (bnc#393515)
-- do not delete patters required by selected ones
-- 2.17.2
-* Mon Jun 16 2008 jsuchome@suse.cz
-- image-creator: removed dependency on ag_kiwi, use generci ag_anyxml
- agent for reading config.xml
-- correctly handle plaindir repository type
-- 2.17.1
-* Wed Jun 11 2008 jsuchome@suse.cz
-- image-creator: added support for UID, GID and user's full name
-- 2.17.0
-* Tue Jun 03 2008 jsuchome@suse.cz
-- check if map key exists before removing it (bnc#396666)
-- 2.16.19
-* Thu May 22 2008 jsuchome@suse.cz
-- added support for profiles (bnc#343212)
-- do not install yast2-instserver
-- 2.16.18
-* Fri May 16 2008 jsrain@suse.cz
-- added categories Settings and System into desktop file
- (bnc #382778)
-* Fri May 16 2008 jsuchome@suse.cz
-- updated kiwi templates, added support for spit section,
- fixed handling of ignored and deleted packages (bnc#343212)
-- 2.16.17
-* Tue May 06 2008 ug@suse.de
-- set "implicit" to "1" in the isolinux.cfg
-* Wed Apr 30 2008 lslezak@suse.cz
-- added missing ')' in a help text (bnc#384166)
-- 2.16.16
-* Wed Apr 30 2008 jsuchome@suse.cz
-- fixed kiwi templates
-- text fixes (software selection labels)
-- 2.16.15
-* Tue Apr 29 2008 lslezak@suse.cz
-- do not require yast2-instserver package, ag_content agent is now
- in yast2 package (bnc#339126)
-- 2.16.14
-* Thu Apr 17 2008 lslezak@suse.cz
-- fixed texts ('CD Creator' -> 'Product Creator')
-* Wed Apr 16 2008 lslezak@suse.cz
-- use relurl:// schema in 'add_on_products' file instead of cd://,
- the addons will be used automatically also over FTP/HTTP/...
-* Fri Apr 04 2008 jsuchome@suse.cz
-- write the full URL into config.xml for https sources (bnc#376666)
-- 2.16.13
-* Wed Apr 02 2008 lslezak@suse.cz
-- adapted to the new callback registration scheme (fate#302296)
-- 2.16.12
-* Fri Mar 28 2008 jsuchome@suse.cz
-- use new ag_anyxml to read parts of config.xml (WIP)
-- show package lists in different kiwi profiles
-- neutralize package and pattern selection before opening package
- selector
-- do not return patterns selected by dependencies from package
- selector (requires transact_by in Pkg:ResolvableProperties)
-- 2.16.11
-* Tue Mar 25 2008 jsuchome@suse.cz
-- fixes for bnc#364838:
-- save modification of target image type
-- set the default value of format attribute for vmx image
-- check for kiwi-desc-* packages after selecting image type
-* Tue Mar 25 2008 lslezak@suse.cz
-- always update metadata in content files (bnc#368146)
-- 2.16.10
-* Mon Mar 17 2008 jsrain@suse.cz
-- added 'StartupNotify=true' to the desktop file (bnc #304964)
-* Wed Mar 12 2008 lslezak@suse.cz
-- do not use StorageDevices:: module, not needed anymore
-- fixed the architecture check
-- better check product dependency, added a new dialog for selecting
- the base product (#368580)
-* Tue Mar 11 2008 lslezak@suse.cz
-- adapted to the new ProgressDownload callback signature (#168935)
-- 2.16.9
-* Mon Feb 18 2008 lslezak@suse.cz
-- adapted to the new plaindir API in SourceDialogs module
- (use SourceDialogs::IsPlainDir() to get the plaindir flag)
-* Wed Feb 06 2008 jsuchome@suse.cz
-- save user password when importing configuration (bnc#357922)
-- 2.16.8
-* Fri Jan 25 2008 jsuchome@suse.cz
-- added support for keytable and timezone keys; save preferences
- section with correct ordering (#355568)
-- 2.16.7
-* Thu Jan 17 2008 jsuchome@suse.cz
-- support more user groups in kiwi configuration (#346501)
-* Fri Jan 04 2008 lslezak@suse.cz
-- do not call Pkg::SaveState() and Pkg::RestoreState(), the state
- is saved/restored by the package selector widget
-* Wed Dec 05 2007 jsuchome@suse.cz
-- added command line support (F302395)
-- fixed generating configuration path name (#346152)
-- 2.16.6
-* Mon Dec 03 2007 jsuchome@suse.cz
-- perl-XML-LibXML required for ag_kiwi
-- merged texts from proofread
-* Mon Nov 12 2007 lslezak@suse.cz
-- select the current language if there is no language selected,
- prevent the solver from allocating too much resources (#339756)
-- 2.16.5
-* Mon Nov 12 2007 jsuchome@suse.cz
-- image-creator:
- do not allow importing non-system configurations (#340495)
-* Fri Nov 09 2007 lslezak@suse.cz
-- y2mkiso - updated and enhanced help text (#336821)
-* Fri Nov 09 2007 lslezak@suse.cz
-- properly download /boot, /docu and slideshow files (#338625)
-- compress metadata if needed, replace the old one, support
- compressed patter files, generate packages.DU only up to
- the 3rd directory level (#335183)
-- copy PPC boot files in /suseboot, /ppc and /PS3 (#335177)
-- add GPG key to installation initrd on PPC architecture (#339449)
-- install required package createrepo (#331530), install additional
- packages on PPC
-- fixed ISO image creation on PPC when the path contained spaces
- (#335164)
-- skip isolinux configuration when the architecture is not i386
- or x86_64 (#335167)
-- display download callbacks in the main window, no flashing popups
- (#338626)
-* Fri Nov 02 2007 jsuchome@suse.cz
-- correctly escape strings which should be written to config.xml
- (seen in #338090)
-* Thu Nov 01 2007 jsuchome@suse.cz
-- fixed checking if repository has 'plaindir' format (#338115)
-- show which repositories YaST failed to add (#337618)
-- added support for "format" and "locale" tags in config.xml
-- added support for OEM image type
-- call kiwi with --nocolor to shorten the output
-- 2.16.4
-* Mon Oct 29 2007 jsuchome@suse.cz
-- package kernel-bigsmp has been renamed to kernel-pae
-- make a conflict with old yast2-storage
-- 2.16.3
-* Fri Oct 26 2007 jsuchome@suse.cz
-- fix the sequence for going to kiwi image from main summary
-- do not read the template name when going from main summary
-- 2.16.2
-* Thu Oct 25 2007 jsuchome@suse.cz
-- adapted for the API change of StorageDevices.ycp
-- merged features done in SLE10SP version 2.13.17, mostly the
- SLEPOS requirements (F302370, F302371) and related bugfixes:
- - allow more characters in the image name
- - fix modifying of repository (#334208)
- - check for duplicates in the list of boot images (#332581)
- - disable Delete button when there's nothing to delete (#334255)
- - update defaultroot only for new configurations (#327057)
- - check for absolute paths in boot image entry
- - fix initializing when going Back (#332581)
- - fix adding CD/DVD/SLP repositories (#333106)
- - show correct list of repositories when going back (#332253)
- - use system repositories when none is specified (#332253)
- - menubutton for adding system repositories (#332253)
- - added SUPPORTED_BOOT_IMAGES to /etc/sysconfig/product-creator:
- possibility to limit list of offered boot images (#331733)
- - append image name to defaultdestination and defaultroot (#327057)
- - copy whole content of imported kiwi config directory (#330052)
- - save defaultroot value to config.xml (#330059)
- - don't ignore 'inherit' tag (#330079)
- - added support for "this://" in repository paths (#330095)
- - destination directory specified in sysconfig file (#327055)
- - tell zypper to ignore zypp lock (#310581)
- - remove 'prepare' directory before calling kiwi (#325664)
- - added /etc/sysconfig/product-creator config file
-- 2.16.1
-* Thu Oct 04 2007 jsuchome@suse.cz
-- add a default user to the iso template (#328145)
-- new template based on current kiwi-desc-livesystem (#328003)
-- do not allow configuration without name (#328003)
-- 2.16.0
-* Thu Sep 27 2007 lslezak@suse.cz
-- fixed a typo in the description of "passphrase_file" option
- (#309537)
-* Mon Sep 24 2007 jsuchome@suse.cz
-- do not close module after kiwi failure (#327593)
-- check stderr and stdout after kiwi finish/failure (#327610)
-- count the maximum size in package selector (#327901)
-- kiwi.ycp requires kiwi-desc-*boot
-- simpler kiwi template for iso
-- 2.15.8
-* Sun Sep 02 2007 jsuchome@suse.cz
-- write schemeversion to config.xml
-- save new kiwi image configurations to vardir/product-creator
-- do not import already imported and modified configuration
-- enable modifications of configurations without creating images
-- require root for running yast2 kiwi (#309456)
-- 2.15.7
-* Tue Aug 28 2007 jsuchome@suse.cz
-- include the package from "post-packages" section of autoyast
- profile (#291776)
-* Mon Aug 27 2007 jsuchome@suse.cz
-- do not require packages with image descriptions, include required
- files (originally created by ms@suse.de for kiwi-desc-buildservice
- and kiwi-desc-livesystem) as templates (#289552)
-- show kiwi error output in separate window
-- enable Browse button for output directory
-- 2.15.6
-* Tue Aug 14 2007 jsuchome@suse.cz
-- enable double-clicks in tables
-- 2.15.5
-* Fri Aug 10 2007 jsuchome@suse.cz
-- helptext for kiwi UI
-- CLI option for gpg passphrase (patch by daniel.rahn and lslezak,
- [#287477])
-- 2.15.4
-* Thu Aug 09 2007 jsuchome@suse.cz
-- kiwi UI: enable creating config from scratch, with default
- YaST sources
-- 2.15.3
-* Wed Aug 08 2007 jsuchome@suse.cz
-- yet another fix for "Back" button behavior (#289524)
-- enable editing of isolinux.cfg in case of autoYaST usage (#287443)
-- 2.15.2
-* Thu Aug 02 2007 jsuchome@suse.cz
-- "installation source" changed to "repository"
-- mark the output product as "base"
-- added simplified UI for kiwi
-- 2.15.1
-* Wed Jul 25 2007 lslezak@suse.cz
-- fixed "Back" button behavior in the Isolinux configuration
- dialog (#289524)
-* Thu Jun 21 2007 jsuchome@suse.cz
-- new version for openSUSE
-- 2.15.0
-* Mon Jun 18 2007 jsuchome@suse.cz
-- changed "Create ISO image" button label, added missing help text
- (#284276)
-- 2.13.7
-* Wed Jun 13 2007 jsuchome@suse.cz
-- merged texts from proofreading
-- fixed the help text for signing (#283235)
-- 2.13.6
-* Tue Jun 05 2007 jsuchome@suse.cz
-- kiwi UI: create output directly in output directory to prevent
- problems with kernel symlink (#279981)
-- 2.13.5
-* Thu May 31 2007 lslezak@suse.cz
-- if the product is not bootable do not create /boot directory,
- skip isolinux.cfg configuration and display a warning message
- (#278731)
-- update directory.yast in /media.1 directory
-- display error message when a configured source is not found
-- 2.13.4
-* Wed May 30 2007 jsuchome@suse.cz
-- select the boot image automaticaly, according to the base product
- (#270881)
-- 2.13.3
-* Tue May 29 2007 lslezak@suse.cz
-- 2.13.2
-* Mon May 28 2007 lslezak@suse.cz
-- reinitialize the package manager before creating another image
-* Mon May 28 2007 lslezak@suse.cz
-- install "yast2-instserver" package (.content_file agent)
-- fixed signing of addon products
-- allow spaces in the file names (#275918)
-* Wed May 23 2007 lslezak@suse.cz
-- 2.13.1
-* Wed May 23 2007 lslezak@suse.cz
-- copy the downloaded packages (moving might fail due to restricted
- permissions)
-- use cd:/// URL scheme in add_on_products file to automatically
- add the addons during installation
-* Tue May 22 2007 lslezak@suse.cz
-- run the package selector when there is an unresolved dependency
- when creating installation ISO
-* Tue May 22 2007 lslezak@suse.cz
-- escape XML entities in URL when writing the config file
- (fixed saving of ISO file URL)
-* Mon May 21 2007 lslezak@suse.cz
-- fixed the default boot item in isolinux.cfg for AutoYast
- installation (#275911)
-* Mon May 21 2007 lslezak@suse.cz
-- fixed workflow: display the GPG dialog also if an AutoYast
- profile is used for package selection (#275913)
-* Mon May 21 2007 lslezak@suse.cz
-- always store isolinux.cfg into the config file, even if there
- is no change (#275914)
-* Wed May 16 2007 jsuchome@suse.cz
-- added widgets for 'root' and 'config' directory editation
-- updated 'type' value of config.xml to kiwi 1.33
-- 2.13.0
-* Fri Apr 27 2007 jsuchome@suse.cz
-- added support for virtual disk systems (qemu, VMware)
-* Thu Apr 26 2007 jsuchome@suse.cz
-- added support for USB stick images
-* Thu Apr 26 2007 lslezak@suse.cz
-- added runPackageSelector() function - general package selection
-- start "add" workflow if there is no configuration
-- added CDCreator::LoadConfig()/CommitConfig()
-* Thu Apr 26 2007 jsuchome@suse.cz
-- save the configuration to cd-creator xml
-- read the kiwi configuration from config.xml (ag_kiwi)
-- added support for more values (size, unit)
-- added XEN image support
-* Thu Apr 19 2007 jsuchome@suse.cz
-- run add-on-creator to create new installation sources
-- dialogs for Live ISO configuration (F301945)
-- install inst-source-utils instead of autoyast2-utils
-* Thu Apr 19 2007 lslezak@suse.cz
-- remember and set "taboo" packages
-- don't loose user selected packages when changing software selection
-- added content file cache - download each content file only once
-- detect base product
-- copy addons to Addons subdirectory
-- create "add_on_products" file
-- move downloaded packages (save space, might be faster)
-- fixed help text (network sources can be used as the package repository)
-- display source aliases
++++++ yast2-product-creator-2.18.5.tar.bz2 -> yast2-product-creator-2.18.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/autodocs-ycp.ami new/yast2-product-creator-2.18.9/autodocs-ycp.ami
--- old/yast2-product-creator-2.18.5/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-product-creator-2.18.9/autodocs-ycp.ami 2009-06-18 09:25:39.000000000 +0200
@@ -0,0 +1,29 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 57597 2009-06-16 14:43:27Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/configure new/yast2-product-creator-2.18.9/configure
--- old/yast2-product-creator-2.18.5/configure 2009-05-21 09:50:20.000000000 +0200
+++ new/yast2-product-creator-2.18.9/configure 2009-06-18 09:25:42.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.18.5.
+# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.18.8.
#
# 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.18.5'
-PACKAGE_STRING='yast2-product-creator 2.18.5'
+PACKAGE_VERSION='2.18.8'
+PACKAGE_STRING='yast2-product-creator 2.18.8'
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.18.5 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.18.8 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.18.5:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.18.8:";;
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.18.5
+yast2-product-creator configure 2.18.8
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.18.5, which was
+It was created by yast2-product-creator $as_me 2.18.8, 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.18.5'
+ VERSION='2.18.8'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.18.5"
+VERSION="2.18.8"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel "
@@ -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.18.5, which was
+This file was extended by yast2-product-creator $as_me 2.18.8, 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.18.5
+yast2-product-creator config.status 2.18.8
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.5/configure.in new/yast2-product-creator-2.18.9/configure.in
--- old/yast2-product-creator-2.18.5/configure.in 2009-05-21 09:50:17.000000000 +0200
+++ new/yast2-product-creator-2.18.9/configure.in 2009-06-18 09:25:39.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-product-creator
dnl
-dnl -- This file is generated by y2autoconf 2.18.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.18.5, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.18.8, 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.18.5"
+VERSION="2.18.8"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/doc/autodocs/Makefile.am new/yast2-product-creator-2.18.9/doc/autodocs/Makefile.am
--- old/yast2-product-creator-2.18.5/doc/autodocs/Makefile.am 2009-05-21 00:01:14.000000000 +0200
+++ new/yast2-product-creator-2.18.9/doc/autodocs/Makefile.am 2009-06-16 20:38:17.000000000 +0200
@@ -1,12 +1,3 @@
-#
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/doc/autodocs/Makefile.in new/yast2-product-creator-2.18.9/doc/autodocs/Makefile.in
--- old/yast2-product-creator-2.18.5/doc/autodocs/Makefile.in 2009-05-21 09:50:21.000000000 +0200
+++ new/yast2-product-creator-2.18.9/doc/autodocs/Makefile.in 2009-06-18 09:25:42.000000000 +0200
@@ -14,9 +14,20 @@
@SET_MAKE@
-#
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
+
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 57597 2009-06-16 14:43:27Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -37,8 +48,9 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/autodocs-ycp.ami
subdir = doc/autodocs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -132,7 +144,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -173,12 +185,12 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -357,8 +369,17 @@
uninstall-am uninstall-htmlDATA
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/src/complex.ycp new/yast2-product-creator-2.18.9/src/complex.ycp
--- old/yast2-product-creator-2.18.5/src/complex.ycp 2009-05-21 09:43:00.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/complex.ycp 2009-06-12 14:40:18.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 56775 2009-04-14 13:47:55Z jsuchome $
+ * $Id: complex.ycp 57551 2009-06-12 12:39:59Z jsuchome $
*/
{
@@ -64,9 +64,20 @@
// needed for creating kiwi images because kiwi cannot create cross-architecture images
boolean SameArchitecture()
{
- string arch = ProductCreator::GetArch ();
- string sysarch = Arch::architecture();
-
+ // current config's arch
+ string arch = ProductCreator::Config["arch"]:"";
+ if (contains(["i486", "i586", "i686"], arch))
+ arch = "i386";
+ // system's arch
+ string sysarch = ProductCreator::GetArch ();
+
+ // possible combination
+ if (arch == "i386" && sysarch == "x86_64")
+ {
+ // Kiwi.ycp asks if GetArch is i386
+ ProductCreator::SetPackageArch ("i686");
+ return true;
+ }
// is the target architecture different than the machine architecture?
if (arch != nil && arch != "" && arch != sysarch)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/src/dialogs.ycp new/yast2-product-creator-2.18.9/src/dialogs.ycp
--- old/yast2-product-creator-2.18.5/src/dialogs.ycp 2009-05-21 00:01:15.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/dialogs.ycp 2009-06-12 14:40:18.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 53182 2008-11-11 16:53:29Z lslezak $
+ * $Id: dialogs.ycp 57551 2009-06-12 12:39:59Z jsuchome $
*/
{
@@ -1500,6 +1500,7 @@
%1
"), details));
+ Wizard::CloseDialog();
return $["ui" : `failed];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp new/yast2-product-creator-2.18.9/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp 2009-05-21 09:40:31.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/kiwi_dialogs.ycp 2009-06-22 11:42:37.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 55629 2009-02-20 08:47:53Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 57675 2009-06-22 09:42:21Z jsuchome $
*/
{
textdomain "product-creator";
@@ -229,6 +229,9 @@
if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G")
mbytes = mbytes * 1024;
ProductCreator::max_size_mb = mbytes;
+ // no size check for "additive" (bnc#512358)
+ if (UI::QueryWidget (`id ("additive"), `Value) == true)
+ ProductCreator::max_size_mb = 999 * 1024 * 1024;
map ret_map = runPackageSelector ("",
maplist (map pat, sw_contents["opensusePattern"]:[],
@@ -1357,7 +1360,18 @@
// it is a function, to be able to adapt to actual state)
map tabs_descr () {
- return $[
+ boolean show_compression = true;
+
+ // 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["filesystem"]:"" == "ext3")
+ show_compression = false;
+ }
+ });
+
+ map ret = $[
"config.xml" : $[
// tab header
"header" : _("Image Configuration"),
@@ -1372,7 +1386,7 @@
"additive"
)
)),
- `HWeight (1, "compression")
+ show_compression ? `HWeight (1, "compression") : `HBox ()
),
`HBox (
`HWeight (2, `VBox (
@@ -1387,7 +1401,7 @@
), `HSpacing(1)),
"widget_names" : [
"version",
- "size", "sizeunit", "additive", "compression",
+ "size", "sizeunit", "additive",
"sw_selection",
"rt_sw", "configure_sw",
"delete_sw",
@@ -1475,6 +1489,10 @@
],
],
];
+ if (show_compression)
+ ret["config.xml","widget_names"] = add (
+ ret["config.xml","widget_names"]:[], "compression");
+ return ret;
}
map get_widget_description () {
@@ -1568,7 +1586,9 @@
"opt" : [ `hstretch ],
// textentry label
"label" : _("&Size"),
- "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>.</p>"),
+ // help text for "Size" field and "Additive" checkbox
+ "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>.
+If <b>Additive</b> is checked, the meaning of <b>Size</b> is different: it is the minimal free space available on the image.</p>"),
"init" : InitSize,
"store" : StoreSize,
"handle" : HandleSize,
@@ -1586,7 +1606,7 @@
"widget" : `checkbox,
// check box label
"label" : _("Additive"),
- "no_help" : true,// FIXME the meaning of size is different...!
+ "no_help" : true,
"init" : InitAdditiveCheckBox,
],
// ---------------- widgtes for directory structure
@@ -2321,6 +2341,8 @@
continue;
repositories = remove (repositories, selected);
update_repo_table ();
+ if (size (repositories) > 0)
+ UI::SetFocus (`id (`repositories));
}
else if (ret == `browse)
{
@@ -2378,7 +2400,9 @@
UI::QueryWidget (`id (`i386), `Value) == true)
{
Kiwi::image_architecture = "i386";
- ProductCreator::SetPackageArch ("i386");
+ ProductCreator::SetPackageArch ("i686");
+ // closing sources, so they are created again with correct arch (bnc#510971)
+ Pkg::SourceFinishAll ();
}
if (size (repositories) > 0)
@@ -2397,12 +2421,8 @@
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;
@@ -2418,12 +2438,6 @@
return false;
}
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.5/src/Kiwi.ycp new/yast2-product-creator-2.18.9/src/Kiwi.ycp
--- old/yast2-product-creator-2.18.5/src/Kiwi.ycp 2009-05-21 09:40:27.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/Kiwi.ycp 2009-05-21 09:53:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel
*
- * $Id: Kiwi.ycp 49414 2008-07-25 11:05:23Z jsuchome $
+ * $Id: Kiwi.ycp 57278 2009-05-21 07:53:48Z jsuchome $
*/
{
module "Kiwi";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/src/ProductCreator.ycp new/yast2-product-creator-2.18.9/src/ProductCreator.ycp
--- old/yast2-product-creator-2.18.5/src/ProductCreator.ycp 2009-05-21 09:40:23.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/ProductCreator.ycp 2009-05-21 09:53:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 56903 2009-04-22 06:16:30Z jsuchome $
+ * $Id: ProductCreator.ycp 57278 2009-05-21 07:53:48Z jsuchome $
*
* Representation of the configuration of product-creator.
* Input and output routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/src/wizards.ycp new/yast2-product-creator-2.18.9/src/wizards.ycp
--- old/yast2-product-creator-2.18.5/src/wizards.ycp 2009-05-21 00:01:15.000000000 +0200
+++ new/yast2-product-creator-2.18.9/src/wizards.ycp 2009-06-12 14:40:18.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Anas Nashif
*
- * $Id: wizards.ycp 49917 2008-08-11 10:02:47Z lslezak $
+ * $Id: wizards.ycp 57551 2009-06-12 12:39:59Z jsuchome $
*/
{
@@ -148,6 +148,8 @@
*/
symbol InitRepositories () {
+ // finish sources before next start, so 32bit and 64bit don't get mangled (bnc#510971)
+ Pkg::SourceFinishAll ();
Kiwi::initial_repositories = Kiwi::InitCurrentRepositories ();
Kiwi::Read ();
return `next;
@@ -209,7 +211,7 @@
],
"kiwi": $[
`abort : `abort,
- `next : "images_overview",
+ `next : "init_repositories",
],
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.5/VERSION new/yast2-product-creator-2.18.9/VERSION
--- old/yast2-product-creator-2.18.5/VERSION 2009-05-21 09:47:42.000000000 +0200
+++ new/yast2-product-creator-2.18.9/VERSION 2009-06-22 11:42:37.000000000 +0200
@@ -1 +1 @@
-2.18.5
+2.18.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org