Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-06-01 22:31:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-05-26 09:26:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-06-01 22:31:58.000000000 +0200 @@ -1,0 +2,154 @@ +Fri Jun 1 10:04:20 CEST 2012 - [email protected] + +- v5.03.11 released + +------------------------------------------------------------------- +Thu May 31 17:19:31 CEST 2012 - [email protected] + +- unit test for XML validation of the volume element + test to verify that the combination of "size" and "freespace" + on the <volume> element is rejected. + +------------------------------------------------------------------- +Thu May 31 17:15:53 CEST 2012 - [email protected] + +- do not allow the use of the "size" and "freespace" attributes + in combination. At present a user can specify both the "size" + and "freespace" attributes on the <volume> element. In this + case the setting of the "freespace" attribute is ignored, + therefore allowing the combination of the attributes is + misleading and should be disallowed + +------------------------------------------------------------------- +Thu May 31 16:44:55 CEST 2012 - [email protected] + +- XML object unit tests for LVM related methods + +------------------------------------------------------------------- +Thu May 31 15:30:37 CEST 2012 - [email protected] + +- arm: renamed boot and JeOS images from suse-Factory to suse-12.2 + +------------------------------------------------------------------- +Thu May 31 15:23:34 CEST 2012 - [email protected] + +- removed rt kernel profile, there is no kernel-rt for openSUSE + +------------------------------------------------------------------- +Thu May 31 12:59:48 CEST 2012 - [email protected] + +- fixed handling of obs URL path within KIWIURL. if the + created obs path does not exist proceed and check again + as opensuse URL type. This was done only in KIWIRoot but + belongs to the URL module + +------------------------------------------------------------------- +Wed May 30 16:25:29 CEST 2012 - [email protected] + +- add empiric code to calculate size for btrfs images... not nice + +------------------------------------------------------------------- +Wed May 30 16:07:43 CEST 2012 - [email protected] + +- make sure btrfs based images provide a common subvolume + setup as explained in (bnc #764703) + +------------------------------------------------------------------- +Wed May 30 15:48:17 CEST 2012 - [email protected] + +- unit test for addStrip method of XML object + * verify error condition of improper call + * verify proper addition for delete, libs, and tools + +------------------------------------------------------------------- +Wed May 30 15:42:36 CEST 2012 - [email protected] + +- fix addStrip method of XML object + * when adding new strip information we need to check if an element + with the given type already exists, if yes the information needs + to be added to the existing type. If a new element is added with + the same type as an existing element the getStrip*() + implementations will not return the correct information. + This is a latent bug. + * also added a consitency check to ensure the method only adds + strip elements of supported types. + +------------------------------------------------------------------- +Wed May 30 15:02:02 CEST 2012 - [email protected] + +- add unit tests for XML getStrip* methods + +------------------------------------------------------------------- +Wed May 30 14:33:15 CEST 2012 - [email protected] + +- make the getStripFileList of the XML object "private", this is + an internal helper method and should not be called from other + KIWI modules + +------------------------------------------------------------------- +Wed May 30 13:15:08 CEST 2012 - [email protected] + +- v5.03.10 released + +------------------------------------------------------------------- +Wed May 30 12:07:49 CEST 2012 - [email protected] + +- Revert "- eliminate getXenDomain method from XML" + This breaks kiwi in KIWIXML.pm:getImageConfig() + This reverts commit a2a9509c6ef44f09cdf2b8a271387de4bec071dc. + +------------------------------------------------------------------- +Wed May 30 11:47:43 CEST 2012 - [email protected] + +- v5.03.9 released + +------------------------------------------------------------------- +Tue May 29 13:36:29 CEST 2012 - [email protected] + +- allow direct root tree access for btrfs and xfs when creating + the virtual disk. For those two filesystem we had the intermediate + step to create a filesystem image first which is then dumped + via dd on the virtual disk. + +------------------------------------------------------------------- +Tue May 29 12:13:56 CEST 2012 - [email protected] + +- enable PXE on arm platform, untested but PXE exists + there and it is fixing building kiwi + +------------------------------------------------------------------- +Tue May 29 12:13:28 CEST 2012 - [email protected] + +- create additional -requires packages for each boot + description to track dependencies automatically in + the openSUSE buildservice + +------------------------------------------------------------------- +Tue May 29 11:54:42 CEST 2012 - [email protected] + +- eliminate the use of expr and use shell's $((..)) expression instead + +------------------------------------------------------------------- +Sat May 26 22:17:32 CEST 2012 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Sat May 26 07:33:48 CEST 2012 - [email protected] + +- eliminate getXenDomain method from XML + the domain is patr of the Xen config and can be accessed + via getXenConfig we should not have multiple methods to + get the same data + +------------------------------------------------------------------- +Sat May 26 07:07:02 CEST 2012 - [email protected] + +- unit test for OVF data storage in the XML object + +------------------------------------------------------------------- +Fri May 25 22:02:30 CEST 2012 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- @@ -11,0 +166,9 @@ +Fri May 25 16:05:40 CEST 2012 - [email protected] + +- add a reference to the online and local schema documentation + * a recent discussion on the mailing list revealed that there is + no reference to the complete schema documentation in the docbook + doc and not all available elements are listed in the docbook + documentation + +------------------------------------------------------------------- @@ -17,0 +181,9 @@ + +------------------------------------------------------------------- +Fri May 25 15:48:12 CEST 2012 - [email protected] + +- DB: update documentation chapter 3 + * update the chapter w.r.t. content, spelling, grammar + * add section to chapter 3 explaining the use of pre-built boot images + in a recent discussion on the mailing list it was pointed out that + the use of pre-built boot images is not documented New: ---- kiwi-find-boot-requires.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.hsDh6Q/_old 2012-06-01 22:32:02.000000000 +0200 +++ /var/tmp/diff_new_pack.hsDh6Q/_new 2012-06-01 22:32:02.000000000 +0200 @@ -17,12 +17,11 @@ Url: http://github.com/openSUSE/kiwi - Name: kiwi Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.8 +Version: 5.03.11 Release: 0 # requirements to build packages BuildRequires: gcc-c++ @@ -45,26 +44,26 @@ %endif %if %{suse_version} > 1140 BuildRequires: btrfsprogs -BuildRequires: perl-Test-Unit -BuildRequires: squashfs BuildRequires: cdrkit-cdrtools-compat BuildRequires: genisoimage +BuildRequires: perl-Test-Unit +BuildRequires: squashfs BuildRequires: zypper %endif # requirements to run kiwi +Requires: checkmedia +Requires: coreutils +Requires: kiwi-tools +Requires: libxslt Requires: perl = %{perl_version} +Requires: perl-Config-IniFiles Requires: perl-XML-LibXML -Requires: perl-libwww-perl -Requires: screen -Requires: coreutils Requires: perl-XML-LibXML-Common Requires: perl-XML-SAX -Requires: perl-Config-IniFiles -Requires: kiwi-tools -Requires: libxslt -Requires: checkmedia -Requires: util-linux +Requires: perl-libwww-perl Requires: rsync +Requires: screen +Requires: util-linux %ifarch %ix86 x86_64 %if %{suse_version} > 1010 Requires: squashfs @@ -92,9 +91,30 @@ Source1: %{name}-rpmlintrc Source2: %{name}-docu.tar.bz2 Source3: %{name}-repo.tar.bz2 +Source4: %{name}-find-boot-requires.sh # build root path BuildRoot: %{_tmppath}/%{name}-%{version}-build +# find out about the name scheme of the local system for -requieres packages +%if 0%{?suse_version} +%if 0%{?sles_version} +%define mysystems suse-SLES%{sles_version} suse-SLED%{sles_version} +%else +%define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) +%endif +%endif +%if 0%{?rhel_version} +%define mysystems %(echo `VER=%{rhel_version} echo "rhel-0${VER:0:1}.${VER:1:2}"`) +%endif +# find out about my arch name, could be done also via symlinks +%define myarch %{_target_cpu} +%ifarch armv7l armv7hl +%define myarch armv7l +%endif +%ifarch %ix86 +%define myarch ix86 +%endif + %description The OpenSuSE KIWI Image System provides a complete operating system image solution for Linux supported hardware platforms as well as for @@ -105,8 +125,10 @@ Marcus Schaefer <[email protected]> %package -n kiwi-instsource +Requires: build +Requires: createrepo +Requires: inst-source-utils Requires: kiwi = %{version} -Requires: inst-source-utils createrepo build Summary: Installation Source creation License: GPL-2.0 Group: System/Management @@ -198,6 +220,17 @@ Authors: -------- Marcus Schaefer <[email protected]> + +%package -n kiwi-desc-isoboot-requires +Requires: kiwi-desc-isoboot = %{version} +Requires: %(echo `bash %{S:4} %{S:0} isoboot %{myarch} %{mysystems}`) +Summary: OpenSuSE - KIWI Image System ISO boot required packages +License: GPL-2.0+ +Group: System/Management + +%description -n kiwi-desc-isoboot-requires +Meta-package to pull in all requires to build a isoboot media. + %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -205,10 +238,12 @@ %package -n kiwi-desc-vmxboot Requires: kiwi = %{version} %if 0%{?suse_version} -Requires: multipath-tools parted +Requires: multipath-tools +Requires: parted %endif %if 0%{?rhel_version} -Requires: device-mapper-multipath parted +Requires: device-mapper-multipath +Requires: parted %endif %ifarch %ix86 x86_64 @@ -240,6 +275,17 @@ Authors: -------- Marcus Schaefer <[email protected]> + +%package -n kiwi-desc-vmxboot-requires +Requires: kiwi-desc-vmxboot = %{version} +Requires: %(echo `bash %{S:4} %{S:0} vmxboot %{myarch} %{mysystems}`) +Summary: OpenSuSE - KIWI Image System VMX boot required packages +License: GPL-2.0+ +Group: System/Management + +%description -n kiwi-desc-vmxboot-requires +Meta-package to pull in all requires to build a vmxboot media. + %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x @@ -259,6 +305,17 @@ Authors: -------- Marcus Schaefer <[email protected]> + +%package -n kiwi-desc-netboot-requires +Requires: kiwi-desc-netboot = %{version} +Requires: %(echo `bash %{S:4} %{S:0} netboot %{myarch} %{mysystems}`) +Summary: OpenSuSE - KIWI Image System NET boot required packages +License: GPL-2.0+ +Group: System/Management + +%description -n kiwi-desc-netboot-requires +Meta-package to pull in all requires to build a netboot media. + %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -279,10 +336,12 @@ %endif %endif %if 0%{?suse_version} -Requires: multipath-tools parted +Requires: multipath-tools +Requires: parted %endif %if 0%{?rhel_version} -Requires: device-mapper-multipath parted +Requires: device-mapper-multipath +Requires: parted %endif %ifarch %ix86 x86_64 @@ -308,6 +367,17 @@ Authors: -------- Marcus Schaefer <[email protected]> + +%package -n kiwi-desc-oemboot-requires +Requires: kiwi-desc-oemboot = %{version} +Requires: %(echo `bash %{S:4} %{S:0} oemboot %{myarch} %{mysystems}`) +Summary: OpenSuSE - KIWI Image System oem boot required packages +License: GPL-2.0+ +Group: System/Management + +%description -n kiwi-desc-oemboot-requires +Meta-package to pull in all requires to build a oemboot media. + %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -364,7 +434,6 @@ # empty because of rpmlint warning rpm-buildroot-usage %if %{suse_version} > 1140 - %check make KIWIVERBTEST=1 test %endif @@ -406,8 +475,17 @@ %endif cat kiwi.loader -%ifarch %ix86 x86_64 +for i in isoboot vmxboot netboot oemboot ; do + if [ -d $RPM_BUILD_ROOT/%{_datadir}/kiwi/image/$i ]; then + cat > $RPM_BUILD_ROOT/%{_datadir}/kiwi/image/$i/README.requires <<EOF +This is a meta package to pull in all dependencies required for $i kiwi +images. This is supposed to be used in Open Build Service in first place +to track the dependencies. +EOF + fi +done +%ifarch %ix86 x86_64 %post -n kiwi-pxeboot #============================================================ # create /srv/tftpboot/pxelinux.cfg/default only if not exist @@ -455,7 +533,7 @@ %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS %endif %ifarch %arm -%exclude %{_datadir}/kiwi/image/suse-Factory-JeOS +%exclude %{_datadir}/kiwi/image/suse-12.2-JeOS %endif %{_datadir}/kiwi/.revision %{_datadir}/kiwi/modules @@ -527,6 +605,10 @@ %doc %{_datadir}/kiwi/image/isoboot/README %{_datadir}/kiwi/image/isoboot/suse* %{_datadir}/kiwi/image/isoboot/rhel* + +%files -n kiwi-desc-isoboot-requires +%defattr(-, root, root) +%doc %{_datadir}/kiwi/image/isoboot/README.requires %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -539,6 +621,10 @@ %ifarch %ix86 x86_64 %{_datadir}/kiwi/image/vmxboot/rhel* %endif + +%files -n kiwi-desc-vmxboot-requires +%defattr(-, root, root) +%doc %{_datadir}/kiwi/image/vmxboot/README.requires %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x @@ -548,6 +634,10 @@ %dir %{_datadir}/kiwi/image/netboot %doc %{_datadir}/kiwi/image/netboot/README %{_datadir}/kiwi/image/netboot/suse* + +%files -n kiwi-desc-netboot-requires +%defattr(-, root, root) +%doc %{_datadir}/kiwi/image/netboot/README.requires %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -560,6 +650,10 @@ %ifarch %ix86 x86_64 %{_datadir}/kiwi/image/oemboot/rhel* %endif + +%files -n kiwi-desc-oemboot-requires +%defattr(-, root, root) +%doc %{_datadir}/kiwi/image/oemboot/README.requires %endif %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm @@ -579,7 +673,7 @@ %{_datadir}/kiwi/image/suse-SLE11-JeOS %endif %ifarch %arm -%{_datadir}/kiwi/image/suse-Factory-JeOS +%{_datadir}/kiwi/image/suse-12.2-JeOS %endif %ifarch ppc ppc64 %{_datadir}/kiwi/image/suse-SLE11-JeOS ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-find-boot-requires.sh ++++++ #!/bin/bash sourcearchive=$1 shift boottype=$1 shift architecture=$1 shift oses="$@" # extract files tar xfj $sourcearchive kiwi/system/boot/ >&/dev/null declare -i MISSING MISSING="1" for os in $oses; do file="kiwi/system/boot/$architecture/$boottype/$os/config.xml" [ -e "$file" ] || echo "ERROR_NO_BOOT_CONFIG_FILE_FOUND" # my professional enterprise ready xml parser: while read line; do l=($line) package=${l[0]} arch=${l[1]} if [ -z "$arch" -o "$arch" == "$architecture" ]; then echo -n "$package " unset MISSING fi done < <( sed '/<packages type="delete">/,/<\/packages>/d' "$file" | sed -En 's,.*package name="([^"]*)"( arch="([^"]*)")?.*,\1 \3,p' ) done [ -z "$MISSING" ] || echo "ERROR_NO_DEPENDENCIES_FOUND" #cleanup rm -rf kiwi ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 3870 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
