Changes of Revision 4
| [-] | Changed | kiwi.changes |
|
x 1 2 -------------------------------------------------------------------3 +Fri Nov 2 16:24:42 CET 2012 - ms@suse.de4 +5 +- v5.04.22 released6 + 7 +-------------------------------------------------------------------8 +Fri Nov 2 16:17:32 CET 2012 - ms@suse.de9 + 10 +- removed vmxboot respectively image type vmx from arm code11 + branch. All arm images are oem's vmx is unused here12 + 13 +-------------------------------------------------------------------14 +Fri Nov 2 13:10:35 CET 2012 - ms@suse.de15 + 16 +- fixed device detection in the oemboot install code. The try to17 + remove the boot device from the list of possible install devices.18 + The sed statement used here caused a broken list of the substring19 + also matches other devices. The fix here changes this to exactly20 + match the device string of the boot device and nothing else21 + 22 +-------------------------------------------------------------------23 +Fri Nov 2 12:45:29 CET 2012 - ms@suse.de24 + 25 +- fixed etc/default/grub GRUB_DISTRIBUTOR name setup26 + 27 +-------------------------------------------------------------------28 +Fri Nov 2 11:49:54 CET 2012 - ms@suse.de29 + 30 +- include mdmon to handle raid array status changes if31 + a dmraid array is in use32 + 33 +-------------------------------------------------------------------34 +Fri Nov 2 11:20:32 CET 2012 - ms@suse.de35 + 36 +- fixed use of uninitialized values in the code now reported37 + due to the use of warnings at runtime38 + 39 +-------------------------------------------------------------------40 +Fri Nov 2 10:33:07 CET 2012 - ms@suse.de41 + 42 +- fixed setup of /etc/default/grub to contain the bootloader43 + setup in terms of boot title, timeout, etc... (bnc #786262)44 + 45 +-------------------------------------------------------------------46 +Fri Nov 2 01:18:30 CET 2012 - rjschwei@suse.de47 + 48 +- report an error when a <systemdisk> definition is specified in the49 + configuration and we cannot find the necessary command to obtain50 + LVM information51 +- implement consistency check for user settings52 + * if a user is specified in two <users> sections all given settings must53 + be the same54 + * the same user may not be specified twice in the same <users> section55 +- implement group setting consistency check56 + * a group id may only be used once57 + * a group name may only be used with one ID58 + 59 +-------------------------------------------------------------------60 +Thu Nov 1 05:54:36 CET 2012 - rjschwei@suse.de61 + 62 +- implement KIWIXMLUserData class to store user data63 +- implement unit test for new class64 +- implement unit tests for new methods65 +- tie new class into XML Class66 + * rename the following methods to *_legacy67 + __addVolume()68 + __populateImageTypeAndNode()69 + __updateDescriptionFromChangeSet()70 + __populateProfiledTypeInfo()71 + getUsers()72 + getTypes()73 + * add new getUsers method returning an array of UserData objects74 + * add new getType method return TypeData object for given type name75 +- fixup client code to call new _legacy methods76 +- update unit tests using _legacy77 + 78 +-------------------------------------------------------------------79 +Wed Oct 31 21:32:01 CET 2012 - guillaume.gardet@suse.de80 + 81 +- Added armv5 support82 + 83 +-------------------------------------------------------------------84 +Wed Oct 31 17:40:55 CET 2012 - ms@suse.de85 + 86 +- v5.04.21 released87 + 88 +-------------------------------------------------------------------89 +Wed Oct 31 17:39:51 CET 2012 - ms@suse.de90 + 91 +- fixed unit test, don't use remote URLs for a test they will92 + fail inside the buildservice because there is no network93 + access allowed94 + 95 +-------------------------------------------------------------------96 +Wed Oct 31 17:31:06 CET 2012 - ms@suse.de97 + 98 +- fixed spec file, added lvm2 to buildrequires. This is99 + required to let the unit tests work100 + 101 +-------------------------------------------------------------------102 +Wed Oct 31 17:30:18 CET 2012 - ms@suse.de103 + 104 +- fixed use of uninitialized values in the code now reported105 + due to the use of warnings at runtime106 + 107 +-------------------------------------------------------------------108 +Wed Oct 31 17:12:44 CET 2012 - ms@suse.de109 + 110 +- v5.04.20 released111 + 112 +-------------------------------------------------------------------113 +Tue Oct 30 20:46:59 CET 2012 - ms@suse.de114 + 115 +- fixed use of uninitialized values in the code now reported116 + due to the use of warnings at runtime117 + 118 +-------------------------------------------------------------------119 +Tue Oct 30 17:39:29 CET 2012 - ms@suse.de120 + 121 +- don't send data to a closed file descriptor122 + 123 +-------------------------------------------------------------------124 +Tue Oct 30 17:17:19 CET 2012 - ms@suse.de125 + 126 +- fixed use of uninitialized values in the code now reported127 + due to the use of warnings at runtime128 + 129 +-------------------------------------------------------------------130 +Tue Oct 30 16:28:28 CET 2012 - ms@suse.de131 + 132 +- fixed name for install media:133 + * install ISO has suffix: .install.iso134 + * install USB has suffix: .install.raw135 + * install PXE has suffix: .install.tgz136 + 137 +-------------------------------------------------------------------138 +Tue Oct 30 16:15:36 CET 2012 - ms@suse.de139 + 140 +- update pre-commit hook141 + 142 +-------------------------------------------------------------------143 +Tue Oct 30 16:12:57 CET 2012 - ms@suse.de144 + 145 +- put KIWIXML.pm to perl critic level 4146 + 147 +-------------------------------------------------------------------148 +Tue Oct 30 15:37:25 CET 2012 - ms@suse.de149 + 150 +- put KIWISharedMem.pm to perl critic level 4151 + 152 +-------------------------------------------------------------------153 +Tue Oct 30 15:27:27 CET 2012 - ms@suse.de154 + 155 +- put KIWISatSolver.pm to perl critic level 4156 + 157 +-------------------------------------------------------------------158 +Tue Oct 30 15:25:13 CET 2012 - ms@suse.de159 + 160 +- put KIWIRoot.pm to perl critic level 4161 + 162 +-------------------------------------------------------------------163 +Tue Oct 30 15:22:18 CET 2012 - ms@suse.de164 + 165 +- put KIWIRepoMetaHandler.pm to perl critic level 4166 + 167 +-------------------------------------------------------------------168 +Tue Oct 30 15:02:30 CET 2012 - ms@suse.de169 + 170 +- put KIWIProductData.pm to perl critic level 4171 + 172 +-------------------------------------------------------------------173 +Tue Oct 30 14:37:17 CET 2012 - ms@suse.de174 + 175 +- put KIWIMigrate.pm to perl critic level 4176 + 177 +-------------------------------------------------------------------178 +Tue Oct 30 14:24:24 CET 2012 - ms@suse.de179 + 180 +- put KIWIManager.pm to perl critic level 4181 + 182 +-------------------------------------------------------------------183 +Tue Oct 30 14:03:59 CET 2012 - rjschwei@suse.de184 + 185 +- add consistency check to verify a volume name is unique186 + within each <systemdisk> definition187 +- add unit test188 + 189 +-------------------------------------------------------------------190 +Tue Oct 30 11:18:50 CET 2012 - ms@suse.de191 + 192 +- put KIWILog.pm to perl critic level 4193 + 194 +-------------------------------------------------------------------195 +Tue Oct 30 11:02:00 CET 2012 - ms@suse.de196 + 197 +- put KIWIImage.pm to perl critic level 4198 + 199 +-------------------------------------------------------------------200 +Tue Oct 30 10:46:44 CET 2012 - ms@suse.de201 |
||
| [-] | Changed | kiwi.spec ^ |
|
201 1 2 #3 # spec file for package kiwi4 #5 -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.6 +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.7 #8 # All modifications and additions to the file contributed by third parties9 # remain the property of their copyright owners, unless otherwise agreed10 11 # Please submit bugfixes or comments via http://bugs.opensuse.org/12 #13 14 -# needsrootforbuild15 16 Url: http://github.com/openSUSE/kiwi17 -18 Name: kiwi19 -BuildRequires: perl-Config-IniFiles perl-XML-LibXML perl-libwww-perl20 -BuildRequires: module-init-tools screen zlib-devel21 -BuildRequires: gcc-c++ libxslt swig trang22 +Summary: openSUSE - KIWI Image System23 +License: GPL-2.024 +Group: System/Management25 +Version: 5.04.2226 +Release: 027 +# requirements to build packages28 +BuildRequires: gcc-c++29 +BuildRequires: libxslt30 +BuildRequires: lvm231 +BuildRequires: module-init-tools32 +BuildRequires: perl-Config-IniFiles33 +BuildRequires: perl-XML-LibXML34 +BuildRequires: perl-libwww-perl35 +BuildRequires: screen36 +BuildRequires: zlib-devel37 %if %{suse_version} > 102038 BuildRequires: fdupes39 %endif40 %ifarch %ix86 x86_6441 BuildRequires: syslinux42 %endif43 -%if %{suse_version} > 101044 -BuildRequires: libqt4 libqt4-devel45 -%else46 -BuildRequires: freetype2-devel libpng-devel qt qt-devel47 -%endif 48 %if %{suse_version} > 103049 -BuildRequires: libexpat-devel rpm-devel50 -%endif51 -%if %{suse_version} > 1030 && %{suse_version} <= 113052 -BuildRequires: libsatsolver-devel53 +BuildRequires: libexpat-devel54 +BuildRequires: rpm-devel55 %endif56 %if %{suse_version} > 114057 -BuildRequires: btrfsprogs perl-Test-Unit squashfs58 -BuildRequires: cdrkit-cdrtools-compat genisoimage zypper59 -%endif60 -%if %{suse_version} <= 101061 -Requires: qt62 +BuildRequires: btrfsprogs63 +BuildRequires: cdrkit-cdrtools-compat64 +BuildRequires: genisoimage65 +BuildRequires: perl-Readonly66 +BuildRequires: perl-Test-Unit67 +BuildRequires: squashfs68 +BuildRequires: zypper69 +%endif70 +# requirements to run kiwi71 +Requires: checkmedia72 +Requires: coreutils73 +Requires: kiwi-tools74 +Requires: libxslt75 +Requires: perl = %{perl_version}76 +Requires: perl-Config-IniFiles77 +%if %{suse_version} > 114078 +Requires: perl-Readonly79 %endif80 +Requires: perl-XML-LibXML81 +Requires: perl-XML-LibXML-Common82 +Requires: perl-XML-SAX83 +Requires: perl-libwww-perl84 +Requires: rsync85 +Requires: screen86 +Requires: util-linux87 %ifarch %ix86 x86_6488 %if %{suse_version} > 101089 Requires: squashfs90 %endif91 %endif92 -Requires: perl = %{perl_version}93 -Requires: perl-XML-LibXML perl-libwww-perl screen coreutils94 -Requires: perl-XML-LibXML-Common perl-XML-SAX perl-Config-IniFiles95 -Requires: kiwi-tools libxslt checkmedia util-linux rsync96 %if %{suse_version} > 103097 Requires: satsolver-tools98 %endif99 -%if %{suse_version} > 1130100 -Requires: perl-satsolver >= 0.42101 -%endif102 %ifarch %ix86 x86_64103 Requires: master-boot-code104 %if %{suse_version} > 1110105 Requires: clicfs >= 1.3.9106 %endif107 %endif108 -Summary: OpenSuSE - KIWI Image System109 -Version: 4.98.15110 -Release: 1111 -Group: System/Management112 -License: GPLv2113 +# recommended to run kiwi114 +%if 0%{?suse_version}115 +Recommends: perl-satsolver >= 0.42116 +Recommends: jing117 +Recommends: zypper118 +Recommends: lxc119 +%endif120 +%if %{suse_version} > 1140121 +Recommends: db45-utils122 +%endif123 +# obsoletes124 +Obsoletes: kiwi-desc-usbboot <= 4.81125 +# sources126 Source: %{name}.tar.bz2127 Source1: %{name}-rpmlintrc128 Source2: %{name}-docu.tar.bz2129 Source3: %{name}-repo.tar.bz2130 +Source4: %{name}-find-boot-requires.sh131 +Patch0: fix-products.diff132 +# build root path133 BuildRoot: %{_tmppath}/%{name}-%{version}-build134 +135 +# find out about the name scheme of the local system for -requieres packages136 %if 0%{?suse_version}137 -Recommends: jing138 -Recommends: zypper139 +%if 0%{?sles_version}140 +%define mysystems suse-SLES%{sles_version} suse-SLED%{sles_version}141 +%else142 +%define mysystems %(echo `export VER=%{suse_version}; [ "$VER" == "1230" ] && VER="1220"; echo "suse-${VER:0:2}.${VER:2:1}"`)143 +%endif144 +%endif145 +%if 0%{?rhel_version}146 +%define mysystems %(echo `VER=%{rhel_version} echo "rhel-0${VER:0:1}.${VER:1:2}"`)147 +%endif148 +# find out about my arch name, could be done also via symlinks149 +%define myarch %{_target_cpu}150 +%ifarch armv7l armv7hl151 +%define myarch armv7l152 +%endif153 +%ifarch %ix86154 +%define myarch ix86155 %endif156 -Obsoletes: kiwi-desc-usbboot <= 4.81157 158 %description159 -The OpenSuSE KIWI Image System provides a complete operating system160 +The openSUSE KIWI Image System provides a complete operating system161 image solution for Linux supported hardware platforms as well as for162 virtualization systems like Xen.163 164 Authors:165 --------166 - Marcus Schaefer <ms@novell.com>167 + Marcus Schaefer <ms@suse.com>168 169 %package -n kiwi-instsource170 -License: GPLv2171 +Requires: build172 +Requires: createrepo173 +Requires: inst-source-utils174 Requires: kiwi = %{version}175 -Requires: inst-source-utils createrepo build176 Summary: Installation Source creation177 +License: GPL-2.0178 Group: System/Management179 %if 0%{?suse_version} > 1120180 BuildArch: noarch181 182 183 Authors:184 --------185 - Adrian Schroeter <adrian@novell.com>186 - Jan Bornschlegel <jcborn@novell.com>187 + Adrian Schroeter <adrian@suse.com>188 + Jan Bornschlegel <jcborn@suse.com>189 190 %package -n kiwi-doc191 -License: LGPLv2.0+192 -Summary: OpenSuSE - KIWI Image System Documentation193 +Summary: openSUSE - KIWI Image System Documentation194 +License: LGPL-2.0+195 Group: Documentation/Howto196 %if 0%{?suse_version} > 1120197 BuildArch: noarch198 199 Marcus Schaefer200 201 |
||
| [+] | Added | fix-products.diff ^ |
| @@ -0,0 +1,34 @@ +diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm +index 84cd474..6f57aef 100644 +--- a/modules/KIWICollect.pm ++++ b/modules/KIWICollect.pm +@@ -634,7 +634,7 @@ sub Init + $this->{m_repos}->{$r}->{'srcdirs'} = undef; + } + } +- return; ++ return 1; + } + # /Init + +@@ -2596,7 +2596,7 @@ sub createBootPackageLinks + } + } + } +- $RPMLIST -> close(); ++ $RPMLIST -> close() if ($RPMLIST); + return $retval; + } + +diff --git a/modules/KIWIProductData.pm b/modules/KIWIProductData.pm +index 48a4f6a..98f78de 100644 +--- a/modules/KIWIProductData.pm ++++ b/modules/KIWIProductData.pm +@@ -61,6 +61,7 @@ sub new { + #========================================== + # Constructor setup + #------------------------------------------ ++ $this->{m_collect} = shift; + $this->{m_prodinfo_updated} = 0; + $this->{m_prodvars_updated} = 0; + $this->{m_prodopts_updated} = 0; | ||
| [+] | Changed | _link ^ |
| @@ -1,4 +1,4 @@ -<link project="openSUSE.org:Virtualization:Appliances" package="kiwi" baserev="fc9a513b6a1cd06b4d478a9ef2df9356"> +<link project="openSUSE.org:Virtualization:Appliances" package="kiwi" baserev="5719b8bedb1c803b8296208ea3b7277d"> <patches> <branch/> </patches> | ||
| Changed | kiwi-docu.tar.bz2 ^ | |
| [+] | Added | kiwi-find-boot-requires.sh ^ |
| @@ -0,0 +1,36 @@ +#!/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" | perl -e 'while (<STDIN>) { if ($_ =~ /.*package name="([^"]*)"( arch="([^"]*)")?.*/ ) { print $1." ".$3."\n"; }; }' + ) +done + +[ -z "$MISSING" ] || echo "ERROR_NO_DEPENDENCIES_FOUND" + +#cleanup +rm -rf kiwi | ||
| [+] | Added | kiwi-repo.tar.bz2/repo/armv5tel ^ |
| +(symlink to armv7l) | ||
| [+] | Added | kiwi-repo.tar.bz2/repo/armv7l ^ |
| +(directory) | ||
| [+] | Added | kiwi-repo.tar.bz2/repo/armv7l/README ^ |
| @@ -0,0 +1,4 @@ +# /.../ +# put the packages you need to provide with kiwi +# for the appropriate architecture here +# --- | ||
| [+] | Changed | kiwi-rpmlintrc ^ |
| @@ -7,6 +7,9 @@ # kiwi includes the SVN revision of this build as hidden file addFilter("hidden-file-or-dir /usr/share/kiwi/.revision") +# kiwi includes pub keys in .ssh as hidden file +addFilter("hidden-file-or-dir /usr/share/kiwi/image/.*/.*/root/root/.ssh") + # don't apply perl naming policy on kiwi addFilter("kiwi.* perl5-naming-policy-not-applied") | ||
| Changed | kiwi.tar.bz2 ^ | |