Changes of Revision 5
[-] | Changed | kiwi.changes |
x 1
2 ------------------------------------------------------------------- 3 +Thu Feb 28 12:42:42 CET 2013 - ms@suse.de 4 + 5 +- v5.04.56 released 6 + 7 +------------------------------------------------------------------- 8 +Thu Feb 28 12:40:22 CET 2013 - ms@suse.de 9 + 10 +- fixed KIWILinuxRC::installBootLoaderGrub2() 11 + + install grub2 only in BIOS mode, in EFI mode this doesn't make sense 12 + + make sure the grub2 config file also lands on the EFI (fat) partition 13 + when in UEFI mode the precompiled and signed grub.efi image searches 14 + there for the configuration 15 + 16 +------------------------------------------------------------------- 17 +Wed Feb 27 23:34:30 CET 2013 - ms@suse.de 18 + 19 +- v5.04.55 released 20 + 21 +------------------------------------------------------------------- 22 +Wed Feb 27 19:07:20 CET 2013 - ms@suse.de 23 + 24 +- fixed UEFI bootloader setup for grub2 based disk images 25 + + fixed creation of image install CDs in EFI mode 26 + + call findAndCopyMagicBlock only if hybrid is requested 27 + 28 +------------------------------------------------------------------- 29 +Mon Feb 25 09:50:01 CET 2013 - ms@suse.de 30 + 31 +- v5.04.54 released 32 + 33 +------------------------------------------------------------------- 34 +Mon Feb 25 09:47:51 CET 2013 - ms@suse.de 35 + 36 +- added vmxFlavour-uefi and xenFlavour-uefi profiles to the 37 + suse-SLE11-JeOS template image description. Given that 38 + SLE11 SP3 is used these profiles can be used to build 39 + UEFI images based on grub2 40 + 41 +------------------------------------------------------------------- 42 +Fri Feb 22 14:58:47 CET 2013 - ms@suse.de 43 + 44 +- v5.04.53 released 45 + 46 +------------------------------------------------------------------- 47 +Fri Feb 22 14:53:38 CET 2013 - ms@suse.de 48 + 49 +- fixed cleanMount function to work if $root dir can't be 50 + created. It might happen that at that point kiwi already 51 + mounted some stuff which can be released via cleanMount 52 + but cleanMount returned if no $root location was created. 53 + 54 +------------------------------------------------------------------- 55 +Fri Feb 22 14:52:28 CET 2013 - ms@suse.de 56 + 57 +- fixed creation of KIWICache object, was missing the xml pointer 58 + 59 +------------------------------------------------------------------- 60 +Thu Feb 21 15:50:51 CET 2013 - ms@suse.de 61 + 62 +- v5.04.52 released 63 + 64 +------------------------------------------------------------------- 65 +Thu Feb 21 15:41:21 CET 2013 - ms@suse.de 66 + 67 +- make sure the openSUSE 12.3 JeOS set the correct console 68 + based systemd target and fix some typos in config.sh too 69 + 70 +------------------------------------------------------------------- 71 +Thu Feb 21 15:40:07 CET 2013 - ms@suse.de 72 + 73 +- fixed default systemd target setup, baseSetRunlevel 74 + function a systemd target is not a number but something 75 + like multi-user.target or graphical.target 76 + 77 +------------------------------------------------------------------- 78 +Thu Feb 21 10:30:28 CET 2013 - ms@suse.de 79 + 80 +- v5.04.51 released 81 + 82 +------------------------------------------------------------------- 83 +Wed Feb 20 17:07:11 CET 2013 - ms@suse.de 84 + 85 +- v5.04.50 released 86 + 87 +------------------------------------------------------------------- 88 +Wed Feb 20 17:06:29 CET 2013 - adrian@suse.de 89 + 90 +- fix iso creation for non-EFI medias again 91 + 92 +------------------------------------------------------------------- 93 +Wed Feb 20 16:51:09 CET 2013 - ms@suse.de 94 + 95 +- make sure GRUB_TERMINAL is set in etc/default grub to make 96 + yast bootloader happy. if yast can't find this setting it 97 + switches to 'console' which deactivates the graphical grub2 98 + console (bnc #804725) 99 + 100 +------------------------------------------------------------------- 101 +Wed Feb 20 15:25:00 CET 2013 - ms@suse.de 102 + 103 +- v5.04.49 released 104 + 105 +------------------------------------------------------------------- 106 +Wed Feb 20 14:45:38 CET 2013 - adrian@suse.de 107 + 108 +- fix product media creation for non-x86_64 when EFI 109 + boot support is enabled (bnc #804428) 110 + 111 +------------------------------------------------------------------- 112 +Wed Feb 20 11:21:31 CET 2013 - ms@suse.de 113 + 114 +- v5.04.48 released 115 + 116 +------------------------------------------------------------------- 117 +Wed Feb 20 10:59:55 CET 2013 - ms@suse.de 118 + 119 +- added missing setup of etc/sysconfig/bootloader setup for grub2 120 +- fixed possible duplicate entries for quiet and splash= in 121 + etc/default/grub 122 + 123 +------------------------------------------------------------------- 124 +Tue Feb 19 17:12:35 CET 2013 - ms@suse.de 125 + 126 +- v5.04.47 released 127 + 128 +------------------------------------------------------------------- 129 +Tue Feb 19 17:01:02 CET 2013 - ms@suse.de 130 + 131 +- KIWIISOLinux fixes: 132 + + added addBootEFILive magic block creation to the source 133 + media KIWICollect code too 134 + + extend magic block lookup in findAndCopyMagicBlock() 135 + from 2 to 8 files and from 4 to 8 blocks (bnc #804428) 136 + 137 +------------------------------------------------------------------- 138 +Mon Feb 18 11:05:44 CET 2013 - ms@suse.de 139 + 140 +- v5.04.46 released 141 + 142 +------------------------------------------------------------------- 143 +Mon Feb 18 09:57:40 CET 2013 - ms@suse.de 144 + 145 +- switch back to firmware='bios' and print a warning if uefi 146 + is requested on another than the x86_64 architecture. on SUSE 147 + we provide signed loaders and kernels for x86_64 only 148 + 149 +------------------------------------------------------------------- 150 +Mon Feb 18 09:46:42 CET 2013 - ms@suse.de 151 + 152 +- secure boot grub commands are linuxefi and initrdefi 153 + fix this also for oem disk images 154 + 155 +------------------------------------------------------------------- 156 +Mon Feb 18 09:33:58 CET 2013 - ms@suse.de 157 + 158 +- fixed building of i386-efi (32bit) live EFI iso images 159 + 160 +------------------------------------------------------------------- 161 +Sun Feb 17 23:50:36 CET 2013 - ms@suse.de 162 + 163 +- check for grub2 conf tool name before using it. with 164 + openSUSE 12.3 the grub2-efi-... tool chain was removed 165 + thus kiwi needs to check this before calling the mkconfig 166 + command 167 + 168 +------------------------------------------------------------------- 169 +Sun Feb 17 23:45:14 CET 2013 - ms@suse.de 170 + 171 +- better logging messages for framebuffer device setup and 172 + initrd creation for reboot of the system by either dracut 173 + or mkinitrd 174 + 175 +------------------------------------------------------------------- 176 +Sun Feb 17 18:55:49 CET 2013 - ms@suse.de 177 + 178 +- increased default boot partition size to 200MB (+50M) 179 + the plymouth splash data is huge. Just to give an example 180 + 12.2 SUSE plymouth theme data is ~3M, 12.3 SUSE plymouth 181 + theme data is about 23M. That blows up the initrd and 182 + needs more space on the boot partition 183 + 184 +------------------------------------------------------------------- 185 +Sun Feb 17 18:41:30 CET 2013 - ms@suse.de 186 + 187 +- make sure temporary config.lxc is removed after execution 188 + 189 +------------------------------------------------------------------- 190 +Sun Feb 17 14:30:29 CET 2013 - ms@suse.de 191 + 192 +- EFI/UEFI fixes according to standard 193 + * EFI/BOOT is required instead of efi/boot 194 + * eltorito alternative loader path must be boot/<arch>/efi 195 + * secure boot grub commands are linuxefi and initrdefi 196 + * check for 64bit or 32bit efi module 197 + 198 +------------------------------------------------------------------- 199 +Sun Feb 17 14:28:04 CET 2013 - ms@suse.de 200 + 201 |
||
[-] | Changed | kiwi.spec ^ |
201 1
2 # 3 # spec file for package kiwi 4 # 5 -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. 6 +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. 7 # 8 # All modifications and additions to the file contributed by third parties 9 # remain the property of their copyright owners, unless otherwise agreed 10
11 # 12 13 14 +#perl_verion is not defined in centos/RHEL yet 15 +%if 0%{?rhel_version} 16 +%define perl_version %(eval "`%{__perl} -V:version`"; echo $version) 17 +%endif 18 + 19 Url: http://github.com/openSUSE/kiwi 20 Name: kiwi 21 Summary: openSUSE - KIWI Image System 22 License: GPL-2.0 23 Group: System/Management 24 -Version: 5.04.22 25 +Version: 5.04.56 26 Release: 0 27 # requirements to build packages 28 +BuildRequires: e2fsprogs 29 BuildRequires: gcc-c++ 30 BuildRequires: libxslt 31 BuildRequires: lvm2 32 BuildRequires: module-init-tools 33 BuildRequires: perl-Config-IniFiles 34 +BuildRequires: perl-JSON 35 BuildRequires: perl-XML-LibXML 36 BuildRequires: perl-libwww-perl 37 BuildRequires: screen 38 BuildRequires: zlib-devel 39 -%if %{suse_version} > 1020 40 +%if 0%{?suse_version} > 1020 41 BuildRequires: fdupes 42 %endif 43 %ifarch %ix86 x86_64 44 BuildRequires: syslinux 45 %endif 46 -%if %{suse_version} > 1030 47 +%if 0%{?suse_version} > 1030 48 BuildRequires: libexpat-devel 49 BuildRequires: rpm-devel 50 %endif 51 -%if %{suse_version} > 1140 52 +%if 0%{?suse_version} > 1140 53 BuildRequires: btrfsprogs 54 BuildRequires: cdrkit-cdrtools-compat 55 BuildRequires: genisoimage 56 +BuildRequires: perl-Class-Singleton 57 BuildRequires: perl-Readonly 58 BuildRequires: perl-Test-Unit 59 BuildRequires: squashfs 60
61 # requirements to run kiwi 62 Requires: checkmedia 63 Requires: coreutils 64 -Requires: kiwi-tools 65 +Requires: kiwi-tools >= %{version} 66 Requires: libxslt 67 +%if 0%{?rhel_version} 68 +# RHEL/CentOS seem to require the release info as well, 69 +# while matching the version. So the >= 70 +Requires: perl >= %{perl_version} 71 +%else 72 Requires: perl = %{perl_version} 73 +%endif 74 +Requires: lvm2 75 +Requires: perl-Class-Singleton 76 Requires: perl-Config-IniFiles 77 +Requires: perl-JSON 78 %if %{suse_version} > 1140 79 Requires: perl-Readonly 80 %endif 81
82 Requires: screen 83 Requires: util-linux 84 %ifarch %ix86 x86_64 85 -%if %{suse_version} > 1010 86 +%if 0%{?suse_version} > 1010 87 Requires: squashfs 88 %endif 89 %endif 90 -%if %{suse_version} > 1030 91 +%if 0%{?suse_version} > 1030 92 Requires: satsolver-tools 93 %endif 94 %ifarch %ix86 x86_64 95 Requires: master-boot-code 96 -%if %{suse_version} > 1110 97 +%if 0%{?suse_version} > 1110 98 Requires: clicfs >= 1.3.9 99 %endif 100 %endif 101
102 Recommends: zypper 103 Recommends: lxc 104 %endif 105 -%if %{suse_version} > 1140 106 +%if 0%{?suse_version} > 1140 107 Recommends: db45-utils 108 %endif 109 # obsoletes 110
111 Source2: %{name}-docu.tar.bz2 112 Source3: %{name}-repo.tar.bz2 113 Source4: %{name}-find-boot-requires.sh 114 -Patch0: fix-products.diff 115 # build root path 116 BuildRoot: %{_tmppath}/%{name}-%{version}-build 117 118
119 Authors: 120 -------- 121 Adrian Schroeter <adrian@suse.com> 122 - Jan Bornschlegel <jcborn@suse.com> 123 + Stephan Kulow <coolo@suse.com> 124 125 %package -n kiwi-doc 126 Summary: openSUSE - KIWI Image System Documentation 127
128 129 %package -n kiwi-pxeboot 130 PreReq: coreutils 131 +%ifarch %ix86 x86_64 132 Requires: syslinux 133 +%endif 134 Summary: openSUSE - KIWI Image System PXE boot structure 135 License: GPL-2.0+ 136 Group: System/Management 137
138 %package -n kiwi-desc-isoboot 139 Requires: e2fsprogs 140 Requires: kiwi = %{version} 141 +%ifarch %ix86 x86_64 142 Requires: syslinux 143 +%endif 144 +Requires: dosfstools 145 %if 0%{?suse_version} 146 Requires: genisoimage 147 Requires: virt-utils 148
149 %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 150 151 %package -n kiwi-desc-vmxboot 152 +Requires: dosfstools 153 +Requires: e2fsprogs 154 Requires: kiwi = %{version} 155 Requires: parted 156 %if 0%{?suse_version} 157
158 Requires: qemu-img 159 %endif 160 %ifarch %ix86 x86_64 161 +Requires: syslinux 162 %if 0%{?suse_version} >= 1220 163 Requires: grub2 164 %else 165
166 %ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm 167 168 %package -n kiwi-desc-oemboot 169 +Requires: dosfstools 170 +Requires: e2fsprogs 171 Requires: kiwi = %{version} 172 Requires: parted 173 %if 0%{?suse_version} 174
175 Requires: qemu-img 176 %endif 177 %ifarch %ix86 x86_64 178 +Requires: syslinux 179 %if 0%{?suse_version} >= 1220 180 Requires: grub2 181 %else 182
183 %if 0%{?suse_version} > 1210 184 Recommends: grub2-branding-openSUSE 185 %endif 186 +%ifarch x86_64 187 +%if 0%{?suse_version} > 1220 188 +Recommends: shim 189 +%endif 190 +%endif 191 %endif 192 193 %description -n kiwi-media-requires 194
195 %endif 196 197 %prep 198 -%setup -n %name -a2 -a3 199 -%patch0 -p1 200 +%setup -q -n %name -a2 -a3 201 |
||
[+] | Deleted | fix-products.diff ^ |
@@ -1,34 +0,0 @@ -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="5719b8bedb1c803b8296208ea3b7277d"> +<link project="openSUSE.org:Virtualization:Appliances" package="kiwi" baserev="f8dbca2dd6682d1a541eba880fb9d214"> <patches> <branch/> </patches> | ||
Changed | kiwi-docu.tar.bz2 ^ | |
Changed | kiwi.tar.bz2 ^ |