Changes - j0ke.net Open Build Service

Changes of Revision 8

[-] [+]	Changed	kiwi.changes
@@ -1,33 +1,1421 @@ ------------------------------------------------------------------- -Thu Feb 28 12:42:42 CET 2013 - ms@suse.de +Fri May 17 14:07:55 CEST 2013 - ms@suse.de -- v5.04.56 released +- v5.05.15 released ------------------------------------------------------------------- -Thu Feb 28 12:40:22 CET 2013 - ms@suse.de +Fri May 17 11:46:35 CEST 2013 - ms@suse.de + +- fixed structure of unpacked image tree when build with a cache + In order to avoid any conflicts concerning code operating on + the unpacked image tree it's required that the structure with + and without using a base cache image is the same + +------------------------------------------------------------------- +Thu May 16 15:40:00 CEST 2013 - ms@suse.de + +- v5.05.14 released + +------------------------------------------------------------------- +Thu May 16 15:38:41 CEST 2013 - ms@suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Thu May 16 15:37:16 CEST 2013 - ms@suse.de + +- Revert "- DB: update documentation, changed cache location" + This reverts commit: 5e8a4ba11f6a8b29e2a60df91bd16e0c27adca35 + +------------------------------------------------------------------- +Thu May 16 15:33:32 CEST 2013 - ms@suse.de + +- Revert "- moved default kiwi cache image location" according + to FHS /var/tmp/kiwicache is not allowed. This reverts + commit: 5d667b7bb2d1774fe02835e378788638fcf9c582 + +------------------------------------------------------------------- +Thu May 16 11:10:45 CEST 2013 - ms@suse.de + +- v5.05.13 released + +------------------------------------------------------------------- +Wed May 15 21:29:08 CEST 2013 - ms@suse.de + +- fixes for openSUSE 13.1 boot descriptions + * removed support for legacy grub + * add Mesa to delete list, for some reason that gets + pulled in now so we make sure it will be removed + +------------------------------------------------------------------- +Wed May 15 16:48:18 CEST 2013 - ms@suse.de + +- use xz compressor for live iso's based on overlayfs + +------------------------------------------------------------------- +Wed May 15 16:34:39 CEST 2013 - ms@suse.de + +- fixed suseGFXBoot to work correctly if a two bootloader + setup is requested like it is the case with EFI capable + hybrid iso's. They use isolinux/gfxboot for the bios boot + case and grub2/grub2-branding for the EFI boot. Thus the + branding data needs to be handled for both and not only + one loader + +------------------------------------------------------------------- +Wed May 15 16:08:47 CEST 2013 - ms@suse.de + +- update default strip data to make the initrd a bit smaller + * remove /usr/share/grub2/backgrounds + * remove /usr/share/kbd + * remove /usr/lib/rpm + +------------------------------------------------------------------- +Wed May 15 15:27:23 CEST 2013 - ms@suse.de + +- improved/changed image caching system + * switched from btrfs to overlayfs + * no loop mounts involved anymore, thus one layer less + * using native kernel overlay filesystem which performs + better than fuse based filesystems. btrfs has turned out + to work unstable when using loop devices and I could not + find a noticeable performance difference between + btrfs seed devices and the overlayfs upper/lower system + * no cache files but cache trees. full freedom for the user + to store those data on NFS, tmpfs, read-only locations... + * all package solver tasks now done via satsolver, solvables + will also be cached, no hacky ignore of packages in the + cache selection code + * following the keep it simple principle. the caching code + is now pretty straight forward + +------------------------------------------------------------------- +Wed May 15 10:36:23 CEST 2013 - ms@suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Wed May 15 10:35:07 CEST 2013 - ms@suse.de + +- DB: update documentation, changed cache location + +------------------------------------------------------------------- +Wed May 15 10:25:15 CEST 2013 - ms@suse.de + +- allow options for mksquashfs in createImageSquashFS + +------------------------------------------------------------------- +Tue May 14 21:35:58 CEST 2013 - ms@suse.de + +- cache creation fixes: + * make sure there are no // in path spec of kiwi-root.cache + * ignore warning about missing auxiliary vector + +------------------------------------------------------------------- +Tue May 14 21:32:41 CEST 2013 - ms@suse.de + +- moved default kiwi cache image location to /var/tmp/kiwicache + instead of /var/cache/kiwi. I found problems with bind mounts + into the same directory level + +------------------------------------------------------------------- +Tue May 14 17:10:12 CEST 2013 - ms@suse.de + +- v5.05.12 released + +------------------------------------------------------------------- +Tue May 14 15:36:05 CEST 2013 - ms@suse.de + +- if a targetdevice is used instead of a loop we need to wait + for udev to finish the event loop in the same way as it is + done in bindDiskPartitions() when binding the partitions of + a loop device (bnc #819772) + +------------------------------------------------------------------- +Fri May 10 10:19:28 CEST 2013 - ms@suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Fri May 10 10:18:41 CEST 2013 - ms@suse.de + +- DB: update documentation + + added some notes about new postHWdetect hook + + added some notes about how software raid works in kiwi images + +------------------------------------------------------------------- +Fri May 10 09:50:51 CEST 2013 - ms@suse.de + +- add hook entry point called: postHWdetect + * it allows to create/modify your own representation of the + deviceDisks array containing the found install disk devices + +------------------------------------------------------------------- +Fri May 10 09:44:51 CEST 2013 - ms@suse.de + +- allow to control whether kiwi searches for ata raid + controllers or not using the dmraid utility. This is + useful if an alternative control tool exists or the + raid should be ignored in any case: + + <oem-ataraid-scan>true\|false</oem-ataraid-scan> + + By default the search and activation happens if dmraid + is installed. Implemented by user feedback + request (bnc #815206) + +------------------------------------------------------------------- +Tue May 7 16:01:44 CEST 2013 - ms@suse.de + +- fixed gettext import, the import was done prior to the + export of the LANG environment which caused some texts + to be in the wrong language + +------------------------------------------------------------------- +Tue May 7 15:15:09 CEST 2013 - ms@suse.de + +- make sure there is an active boot/root partition after + the oem code has repartitioned the disk + +------------------------------------------------------------------- +Tue May 7 14:46:59 CEST 2013 - ms@suse.de + +- allow alternative grub2 search path lib/grub and share/grub + as it is packaged on Fedora + +------------------------------------------------------------------- +Tue May 7 11:59:39 CEST 2013 - ms@suse.de + +- fixed setupLocale to work with locale list separated by ',' + +------------------------------------------------------------------- +Sun May 5 21:23:18 CEST 2013 - mkoegler@suse.de + +- fixed CD/DVD boot of live iso images with activated hybridpersistent + option. kiwi will try to create the read-write partition but will + fail if this image is booted from a read-only medium. Thus it should x 1 @@ -1,33 +1,1421 @@ 2 ------------------------------------------------------------------- 3 -Thu Feb 28 12:42:42 CET 2013 - ms@suse.de 4 +Fri May 17 14:07:55 CEST 2013 - ms@suse.de 5 6 -- v5.04.56 released 7 +- v5.05.15 released 8 9 ------------------------------------------------------------------- 10 -Thu Feb 28 12:40:22 CET 2013 - ms@suse.de 11 +Fri May 17 11:46:35 CEST 2013 - ms@suse.de 12 + 13 +- fixed structure of unpacked image tree when build with a cache 14 + In order to avoid any conflicts concerning code operating on 15 + the unpacked image tree it's required that the structure with 16 + and without using a base cache image is the same 17 + 18 +------------------------------------------------------------------- 19 +Thu May 16 15:40:00 CEST 2013 - ms@suse.de 20 + 21 +- v5.05.14 released 22 + 23 +------------------------------------------------------------------- 24 +Thu May 16 15:38:41 CEST 2013 - ms@suse.de 25 + 26 +- DB: rebuild documentation 27 + 28 +------------------------------------------------------------------- 29 +Thu May 16 15:37:16 CEST 2013 - ms@suse.de 30 + 31 +- Revert "- DB: update documentation, changed cache location" 32 + This reverts commit: 5e8a4ba11f6a8b29e2a60df91bd16e0c27adca35 33 + 34 +------------------------------------------------------------------- 35 +Thu May 16 15:33:32 CEST 2013 - ms@suse.de 36 + 37 +- Revert "- moved default kiwi cache image location" according 38 + to FHS /var/tmp/kiwicache is not allowed. This reverts 39 + commit: 5d667b7bb2d1774fe02835e378788638fcf9c582 40 + 41 +------------------------------------------------------------------- 42 +Thu May 16 11:10:45 CEST 2013 - ms@suse.de 43 + 44 +- v5.05.13 released 45 + 46 +------------------------------------------------------------------- 47 +Wed May 15 21:29:08 CEST 2013 - ms@suse.de 48 + 49 +- fixes for openSUSE 13.1 boot descriptions 50 + * removed support for legacy grub 51 + * add Mesa to delete list, for some reason that gets 52 + pulled in now so we make sure it will be removed 53 + 54 +------------------------------------------------------------------- 55 +Wed May 15 16:48:18 CEST 2013 - ms@suse.de 56 + 57 +- use xz compressor for live iso's based on overlayfs 58 + 59 +------------------------------------------------------------------- 60 +Wed May 15 16:34:39 CEST 2013 - ms@suse.de 61 + 62 +- fixed suseGFXBoot to work correctly if a two bootloader 63 + setup is requested like it is the case with EFI capable 64 + hybrid iso's. They use isolinux/gfxboot for the bios boot 65 + case and grub2/grub2-branding for the EFI boot. Thus the 66 + branding data needs to be handled for both and not only 67 + one loader 68 + 69 +------------------------------------------------------------------- 70 +Wed May 15 16:08:47 CEST 2013 - ms@suse.de 71 + 72 +- update default strip data to make the initrd a bit smaller 73 + * remove /usr/share/grub2/backgrounds 74 + * remove /usr/share/kbd 75 + * remove /usr/lib/rpm 76 + 77 +------------------------------------------------------------------- 78 +Wed May 15 15:27:23 CEST 2013 - ms@suse.de 79 + 80 +- improved/changed image caching system 81 + * switched from btrfs to overlayfs 82 + * no loop mounts involved anymore, thus one layer less 83 + * using native kernel overlay filesystem which performs 84 + better than fuse based filesystems. btrfs has turned out 85 + to work unstable when using loop devices and I could not 86 + find a noticeable performance difference between 87 + btrfs seed devices and the overlayfs upper/lower system 88 + * no cache files but cache trees. full freedom for the user 89 + to store those data on NFS, tmpfs, read-only locations... 90 + * all package solver tasks now done via satsolver, solvables 91 + will also be cached, no hacky ignore of packages in the 92 + cache selection code 93 + * following the keep it simple principle. the caching code 94 + is now pretty straight forward 95 + 96 +------------------------------------------------------------------- 97 +Wed May 15 10:36:23 CEST 2013 - ms@suse.de 98 + 99 +- DB: rebuild documentation 100 + 101 +------------------------------------------------------------------- 102 +Wed May 15 10:35:07 CEST 2013 - ms@suse.de 103 + 104 +- DB: update documentation, changed cache location 105 + 106 +------------------------------------------------------------------- 107 +Wed May 15 10:25:15 CEST 2013 - ms@suse.de 108 + 109 +- allow options for mksquashfs in createImageSquashFS 110 + 111 +------------------------------------------------------------------- 112 +Tue May 14 21:35:58 CEST 2013 - ms@suse.de 113 + 114 +- cache creation fixes: 115 + * make sure there are no // in path spec of kiwi-root.cache 116 + * ignore warning about missing auxiliary vector 117 + 118 +------------------------------------------------------------------- 119 +Tue May 14 21:32:41 CEST 2013 - ms@suse.de 120 + 121 +- moved default kiwi cache image location to /var/tmp/kiwicache 122 + instead of /var/cache/kiwi. I found problems with bind mounts 123 + into the same directory level 124 + 125 +------------------------------------------------------------------- 126 +Tue May 14 17:10:12 CEST 2013 - ms@suse.de 127 + 128 +- v5.05.12 released 129 + 130 +------------------------------------------------------------------- 131 +Tue May 14 15:36:05 CEST 2013 - ms@suse.de 132 + 133 +- if a targetdevice is used instead of a loop we need to wait 134 + for udev to finish the event loop in the same way as it is 135 + done in bindDiskPartitions() when binding the partitions of 136 + a loop device (bnc #819772) 137 + 138 +------------------------------------------------------------------- 139 +Fri May 10 10:19:28 CEST 2013 - ms@suse.de 140 + 141 +- DB: rebuild documentation 142 + 143 +------------------------------------------------------------------- 144 +Fri May 10 10:18:41 CEST 2013 - ms@suse.de 145 + 146 +- DB: update documentation 147 + + added some notes about new postHWdetect hook 148 + + added some notes about how software raid works in kiwi images 149 + 150 +------------------------------------------------------------------- 151 +Fri May 10 09:50:51 CEST 2013 - ms@suse.de 152 + 153 +- add hook entry point called: postHWdetect 154 + * it allows to create/modify your own representation of the 155 + deviceDisks array containing the found install disk devices 156 + 157 +------------------------------------------------------------------- 158 +Fri May 10 09:44:51 CEST 2013 - ms@suse.de 159 + 160 +- allow to control whether kiwi searches for ata raid 161 + controllers or not using the dmraid utility. This is 162 + useful if an alternative control tool exists or the 163 + raid should be ignored in any case: 164 + 165 + <oem-ataraid-scan>true\|false</oem-ataraid-scan> 166 + 167 + By default the search and activation happens if dmraid 168 + is installed. Implemented by user feedback 169 + request (bnc #815206) 170 + 171 +------------------------------------------------------------------- 172 +Tue May 7 16:01:44 CEST 2013 - ms@suse.de 173 + 174 +- fixed gettext import, the import was done prior to the 175 + export of the LANG environment which caused some texts 176 + to be in the wrong language 177 + 178 +------------------------------------------------------------------- 179 +Tue May 7 15:15:09 CEST 2013 - ms@suse.de 180 + 181 +- make sure there is an active boot/root partition after 182 + the oem code has repartitioned the disk 183 + 184 +------------------------------------------------------------------- 185 +Tue May 7 14:46:59 CEST 2013 - ms@suse.de 186 + 187 +- allow alternative grub2 search path lib/grub and share/grub 188 + as it is packaged on Fedora 189 + 190 +------------------------------------------------------------------- 191 +Tue May 7 11:59:39 CEST 2013 - ms@suse.de 192 + 193 +- fixed setupLocale to work with locale list separated by ',' 194 + 195 +------------------------------------------------------------------- 196 +Sun May 5 21:23:18 CEST 2013 - mkoegler@suse.de 197 + 198 +- fixed CD/DVD boot of live iso images with activated hybridpersistent 199 + option. kiwi will try to create the read-write partition but will 200 + fail if this image is booted from a read-only medium. Thus it should 201
[-] [+]	Changed	kiwi.spec ^
@@ -26,20 +26,17 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.56 +Version: 5.05.15 Release: 0 # requirements to build packages +BuildRequires: diffutils BuildRequires: e2fsprogs BuildRequires: gcc-c++ BuildRequires: libxslt BuildRequires: lvm2 +BuildRequires: lxc BuildRequires: module-init-tools -BuildRequires: perl-Config-IniFiles -%if 0%{?suse_version} > 1140 -BuildRequires: perl-JSON -%endif -BuildRequires: perl-XML-LibXML -BuildRequires: perl-libwww-perl +BuildRequires: rsync BuildRequires: screen BuildRequires: zlib-devel %if 0%{?suse_version} > 1020 @@ -57,8 +54,14 @@ BuildRequires: cdrkit-cdrtools-compat BuildRequires: genisoimage BuildRequires: perl-Class-Singleton +BuildRequires: perl-Config-IniFiles +BuildRequires: perl-Digest-SHA1 +BuildRequires: perl-File-Slurp +BuildRequires: perl-JSON BuildRequires: perl-Readonly BuildRequires: perl-Test-Unit +BuildRequires: perl-XML-LibXML +BuildRequires: perl-libwww-perl BuildRequires: squashfs BuildRequires: zypper %endif @@ -77,10 +80,10 @@ Requires: lvm2 Requires: perl-Class-Singleton Requires: perl-Config-IniFiles -%if %{suse_version} > 1140 -Requires: perl-Readonly +Requires: perl-Digest-SHA1 +Requires: perl-File-Slurp Requires: perl-JSON -%endif +Requires: perl-Readonly Requires: perl-XML-LibXML Requires: perl-XML-LibXML-Common Requires: perl-XML-SAX @@ -128,7 +131,7 @@ %if 0%{?sles_version} %define mysystems suse-SLES%{sles_version} suse-SLED%{sles_version} %else -%define mysystems %(echo `export VER=%{suse_version}; [ "$VER" == "1230" ] && VER="1220"; echo "suse-${VER:0:2}.${VER:2:1}"`) +%define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) %endif %endif %if 0%{?rhel_version} @@ -270,7 +273,7 @@ %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 %package -n kiwi-desc-vmxboot Requires: dosfstools @@ -356,7 +359,7 @@ %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 %package -n kiwi-desc-oemboot Requires: dosfstools @@ -380,7 +383,7 @@ Requires: grub %endif %endif -%ifarch %arm +%ifarch %arm aarch64 Requires: u-boot-tools %endif Summary: openSUSE - KIWI image descriptions @@ -411,7 +414,7 @@ %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 %package -n kiwi-templates PreReq: coreutils @@ -432,7 +435,7 @@ Marcus Schaefer %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 %package -n kiwi-media-requires Summary: openSUSE - packages which should be part of the DVD @@ -468,6 +471,20 @@ Marcus Schaefer %endif +%package -n kiwi-test +Requires: kiwi = %{version} +Requires: perl-Test-Unit +Summary: Unit tests for kiwi +License: GPL-2.0 +Group: System/Management +%if 0%{?suse_version} > 1120 +BuildArch: noarch +%endif + +%description -n kiwi-test +This package contains the unit tests executed during package build and +used for development testing. + %prep %setup -q -n %name -a2 -a3 @@ -513,6 +530,7 @@ %fdupes $RPM_BUILD_ROOT/usr/share/kiwi/image %fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/examples %fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/schema +%fdupes $RPM_BUILD_ROOT/usr/share/kiwi/tests/unit/data %endif cat kiwi.loader @@ -565,6 +583,7 @@ %exclude %{_datadir}/kiwi/image/suse-12.1-JeOS %exclude %{_datadir}/kiwi/image/suse-12.2-JeOS %exclude %{_datadir}/kiwi/image/suse-12.3-JeOS +%exclude %{_datadir}/kiwi/image/suse-13.1-JeOS %exclude %{_datadir}/kiwi/image/suse-SLE10-JeOS %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS %exclude %{_datadir}/kiwi/image/rhel-05.4-JeOS @@ -573,11 +592,14 @@ %ifarch s390 s390x %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS %endif -%ifarch %arm +%ifarch %arm aarch64 %exclude %{_datadir}/kiwi/image/suse-12.2-JeOS +%exclude %{_datadir}/kiwi/image/suse-12.3-JeOS +%exclude %{_datadir}/kiwi/image/suse-13.1-JeOS %endif %{_datadir}/kiwi/.revision %{_datadir}/kiwi/modules +%{_datadir}/kiwi/livestick %{_datadir}/kiwi/editing %{_datadir}/kiwi/locale %{_datadir}/kiwi/repo @@ -588,6 +610,7 @@ %exclude %{_datadir}/kiwi/modules/KIWIUtil.pm %{_datadir}/kiwi/xsl %{_sbindir}/kiwi +/usr/bin/livestick #================================================= # KIWI doc... #------------------------------------------------- @@ -620,6 +643,7 @@ %files -n kiwi-pxeboot -f kiwi.loader %defattr(-, root, root) +%dir %attr(0750,tftp,tftp) /srv/tftpboot %doc /srv/tftpboot/README %dir /srv/tftpboot %dir /srv/tftpboot/KIWI @@ -636,6 +660,7 @@ %files -n kiwi-tools %defattr(-, root, root) %doc %{_defaultdocdir}/kiwi/README.tools +%exclude /usr/bin/livestick /usr/bin/* #================================================= # KIWI-desc-* and templates... @@ -683,7 +708,7 @@ %doc %{_datadir}/kiwi/image/netboot/README.requires %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 %files -n kiwi-desc-oemboot %defattr(-, root, root) @@ -699,7 +724,7 @@ %doc %{_datadir}/kiwi/image/oemboot/README.requires %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 201 1 @@ -26,20 +26,17 @@ 2 Summary: openSUSE - KIWI Image System 3 License: GPL-2.0 4 Group: System/Management 5 -Version: 5.04.56 6 +Version: 5.05.15 7 Release: 0 8 # requirements to build packages 9 +BuildRequires: diffutils 10 BuildRequires: e2fsprogs 11 BuildRequires: gcc-c++ 12 BuildRequires: libxslt 13 BuildRequires: lvm2 14 +BuildRequires: lxc 15 BuildRequires: module-init-tools 16 -BuildRequires: perl-Config-IniFiles 17 -%if 0%{?suse_version} > 1140 18 -BuildRequires: perl-JSON 19 -%endif 20 -BuildRequires: perl-XML-LibXML 21 -BuildRequires: perl-libwww-perl 22 +BuildRequires: rsync 23 BuildRequires: screen 24 BuildRequires: zlib-devel 25 %if 0%{?suse_version} > 1020 26 @@ -57,8 +54,14 @@ 27 BuildRequires: cdrkit-cdrtools-compat 28 BuildRequires: genisoimage 29 BuildRequires: perl-Class-Singleton 30 +BuildRequires: perl-Config-IniFiles 31 +BuildRequires: perl-Digest-SHA1 32 +BuildRequires: perl-File-Slurp 33 +BuildRequires: perl-JSON 34 BuildRequires: perl-Readonly 35 BuildRequires: perl-Test-Unit 36 +BuildRequires: perl-XML-LibXML 37 +BuildRequires: perl-libwww-perl 38 BuildRequires: squashfs 39 BuildRequires: zypper 40 %endif 41 @@ -77,10 +80,10 @@ 42 Requires: lvm2 43 Requires: perl-Class-Singleton 44 Requires: perl-Config-IniFiles 45 -%if %{suse_version} > 1140 46 -Requires: perl-Readonly 47 +Requires: perl-Digest-SHA1 48 +Requires: perl-File-Slurp 49 Requires: perl-JSON 50 -%endif 51 +Requires: perl-Readonly 52 Requires: perl-XML-LibXML 53 Requires: perl-XML-LibXML-Common 54 Requires: perl-XML-SAX 55 @@ -128,7 +131,7 @@ 56 %if 0%{?sles_version} 57 %define mysystems suse-SLES%{sles_version} suse-SLED%{sles_version} 58 %else 59 -%define mysystems %(echo `export VER=%{suse_version}; [ "$VER" == "1230" ] && VER="1220"; echo "suse-${VER:0:2}.${VER:2:1}"`) 60 +%define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) 61 %endif 62 %endif 63 %if 0%{?rhel_version} 64 @@ -270,7 +273,7 @@ 65 66 %endif 67 68 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 69 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 70 71 %package -n kiwi-desc-vmxboot 72 Requires: dosfstools 73 @@ -356,7 +359,7 @@ 74 75 %endif 76 77 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 78 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 79 80 %package -n kiwi-desc-oemboot 81 Requires: dosfstools 82 @@ -380,7 +383,7 @@ 83 Requires: grub 84 %endif 85 %endif 86 -%ifarch %arm 87 +%ifarch %arm aarch64 88 Requires: u-boot-tools 89 %endif 90 Summary: openSUSE - KIWI image descriptions 91 @@ -411,7 +414,7 @@ 92 93 %endif 94 95 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 96 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 97 98 %package -n kiwi-templates 99 PreReq: coreutils 100 @@ -432,7 +435,7 @@ 101 Marcus Schaefer 102 %endif 103 104 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 105 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 106 107 %package -n kiwi-media-requires 108 Summary: openSUSE - packages which should be part of the DVD 109 @@ -468,6 +471,20 @@ 110 Marcus Schaefer 111 %endif 112 113 +%package -n kiwi-test 114 +Requires: kiwi = %{version} 115 +Requires: perl-Test-Unit 116 +Summary: Unit tests for kiwi 117 +License: GPL-2.0 118 +Group: System/Management 119 +%if 0%{?suse_version} > 1120 120 +BuildArch: noarch 121 +%endif 122 + 123 +%description -n kiwi-test 124 +This package contains the unit tests executed during package build and 125 +used for development testing. 126 + 127 %prep 128 %setup -q -n %name -a2 -a3 129 130 @@ -513,6 +530,7 @@ 131 %fdupes $RPM_BUILD_ROOT/usr/share/kiwi/image 132 %fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/examples 133 %fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/schema 134 +%fdupes $RPM_BUILD_ROOT/usr/share/kiwi/tests/unit/data 135 %endif 136 cat kiwi.loader 137 138 @@ -565,6 +583,7 @@ 139 %exclude %{_datadir}/kiwi/image/suse-12.1-JeOS 140 %exclude %{_datadir}/kiwi/image/suse-12.2-JeOS 141 %exclude %{_datadir}/kiwi/image/suse-12.3-JeOS 142 +%exclude %{_datadir}/kiwi/image/suse-13.1-JeOS 143 %exclude %{_datadir}/kiwi/image/suse-SLE10-JeOS 144 %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS 145 %exclude %{_datadir}/kiwi/image/rhel-05.4-JeOS 146 @@ -573,11 +592,14 @@ 147 %ifarch s390 s390x 148 %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS 149 %endif 150 -%ifarch %arm 151 +%ifarch %arm aarch64 152 %exclude %{_datadir}/kiwi/image/suse-12.2-JeOS 153 +%exclude %{_datadir}/kiwi/image/suse-12.3-JeOS 154 +%exclude %{_datadir}/kiwi/image/suse-13.1-JeOS 155 %endif 156 %{_datadir}/kiwi/.revision 157 %{_datadir}/kiwi/modules 158 +%{_datadir}/kiwi/livestick 159 %{_datadir}/kiwi/editing 160 %{_datadir}/kiwi/locale 161 %{_datadir}/kiwi/repo 162 @@ -588,6 +610,7 @@ 163 %exclude %{_datadir}/kiwi/modules/KIWIUtil.pm 164 %{_datadir}/kiwi/xsl 165 %{_sbindir}/kiwi 166 +/usr/bin/livestick 167 #================================================= 168 # KIWI doc... 169 #------------------------------------------------- 170 @@ -620,6 +643,7 @@ 171 172 %files -n kiwi-pxeboot -f kiwi.loader 173 %defattr(-, root, root) 174 +%dir %attr(0750,tftp,tftp) /srv/tftpboot 175 %doc /srv/tftpboot/README 176 %dir /srv/tftpboot 177 %dir /srv/tftpboot/KIWI 178 @@ -636,6 +660,7 @@ 179 %files -n kiwi-tools 180 %defattr(-, root, root) 181 %doc %{_defaultdocdir}/kiwi/README.tools 182 +%exclude /usr/bin/livestick 183 /usr/bin/* 184 #================================================= 185 # KIWI-desc-* and templates... 186 @@ -683,7 +708,7 @@ 187 %doc %{_datadir}/kiwi/image/netboot/README.requires 188 %endif 189 190 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 191 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 192 193 %files -n kiwi-desc-oemboot 194 %defattr(-, root, root) 195 @@ -699,7 +724,7 @@ 196 %doc %{_datadir}/kiwi/image/oemboot/README.requires 197 %endif 198 199 -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 200 +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm aarch64 201
[-] [+]	Changed	_link ^
@@ -1,4 +1,4 @@ -<link project="openSUSE.org:Virtualization:Appliances" package="kiwi" baserev="f8dbca2dd6682d1a541eba880fb9d214"> +<link project="openSUSE.org:Virtualization:Appliances" package="kiwi" baserev="4e5746555a354e55f11091a210b6c4e1"> <patches> <branch/> </patches>
	Changed	kiwi-docu.tar.bz2 ^
[-] [+]	Added	kiwi-repo.tar.bz2/repo/aarch64 ^
+(symlink to armv7l)
[-] [+]	Added	kiwi-repo.tar.bz2/repo/armv5el ^
+(symlink to armv7l)
[-] [+]	Added	kiwi-repo.tar.bz2/repo/armv6l ^
+(symlink to armv7l)
[-] [+]	Changed	kiwi-rpmlintrc ^
@@ -36,3 +36,6 @@ # kiwi master package can't be noarch if sub packages are arch specific addFilter("W: no-binary"); + +# allow hidden kiwirc file for the tests +addFilter("W: hidden-file-or-dir /usr/share/kiwi/tests/unit/.kiwirc")
	Changed	kiwi.tar.bz2 ^