Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Thu Apr 8 15:34:55 CEST 2010.
--------
--- kiwi/kiwi.changes 2010-03-26 14:50:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-04-08 14:28:49.000000000 +0200
@@ -1,0 +2,23 @@
+Mon Mar 29 17:15:37 CEST 2010 - ms@suse.de
+
+- v4.27
+- fixed bootnext boot from harddrive feature (bnc #583212)
+- fixed --build option, glob check did not work (bnc #591889)
+- ovftool will create junks of data according to the image size
+ to allow better download performance. Because of this I changed
+ the call to create new files in a separate directory
+- also use the root filesystem type for the optional home
+ filesystem while in a OEM deployment process (bnc #594202)
+- make the recovery filesystem an ext2 filesystem
+- fixed createPartedInput() to always have a partition ID
+- added iputils package to 11.2 JeOS
+- added suse-11.3 boot and image templates. Also removed
+ suse-11.0 boot and image templates
+- cleaned up spec file, removed prebuild code and package
+ which is not used by anybody
+- added common functions resizeFilesystem() and
+ createFilesystem() in KIWILinuxRC.sh
+- removed SAP related code. This was only for a proof
+ of concept and never lead to anything useful
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.C9Ew8n/_old 2010-04-08 15:16:06.000000000 +0200
+++ /var/tmp/diff_new_pack.C9Ew8n/_new 2010-04-08 15:16:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 4.26)
+# spec file for package kiwi (Version 4.27)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -60,10 +60,10 @@
Requires: clicfs
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.26
+Version: 4.27
Release: 1
Group: System/Management
-License: GPLv2+
+License: GPLv2
Source: %{name}.tar.bz2
Source1: %{name}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -151,25 +151,6 @@
%ifarch %ix86 x86_64
-%package -n kiwi-pxeboot-prebuild
-License: GPLv2
-Requires: syslinux
-Summary: OpenSuSE - KIWI TFTP prebuild boot images
-Group: System/Management
-%if 0%{?suse_version} > 1120
-BuildArch: noarch
-%endif
-
-%description -n kiwi-pxeboot-prebuild
-This package contains the OpenSuSE - KIWI TFTP prebuild boot images
-
-Authors:
---------
- Marcus Schaefer
-%endif
-
-%ifarch %ix86 x86_64
-
%package -n kiwi-desc-isoboot
License: GPLv2+
Requires: kiwi = %{version}
@@ -325,88 +306,9 @@
%install
# build
-export K_USER=-1 # set to -1 to prevent building boot images, set to 0 to enable
-export K_ARCH=`uname -m | grep -q ^i && echo ix86 || uname -m`
-test -e /.buildenv || export K_USER=-1 # no buildenv, no boot image build
test -e /.buildenv && . /.buildenv
make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
-%ifarch %ix86 x86_64
-if [ "$UID" = "$K_USER" ];then
- # prepare and create prebuilt PXE boot images...
- (cd tools/dbuslock && make install)
- mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg
- mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/boot
- mkdir -p /usr/share/kiwi/modules
- mkdir -p /usr/share/kiwi/repo
- mkdir -p /usr/share/kiwi/image/netboot
- rm -f /usr/share/kiwi/modules/*
- for i in `find modules/ -type f`;do cp $i /usr/share/kiwi/modules;done
- cp -a system/suse-repo /usr/share/kiwi/repo
- cd modules
- pxedefault=$RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default.default
- echo "# /.../" > $pxedefault
- echo "# KIWI boot image setup" >> $pxedefault
- echo "# select boot label according to your system image" >> $pxedefault
- echo "# ..." >> $pxedefault
- echo "DEFAULT Local-Boot" >> $pxedefault
- images="
- netboot/suse-SLES10
- "
- for i in $images;do
- rootName=`echo $i | tr / -`
- rootName=`echo $rootName \(latest service pack\)`
- echo "#DEFAULT $rootName" >> $pxedefault
- done
- echo >> $pxedefault
- echo "LABEL Local-Boot" >> $pxedefault
- echo " localboot 0" >> $pxedefault
- for i in $images;do
- rootName=`echo $i | tr / -`
- ../kiwi.pl --root $RPM_BUILD_ROOT/root-$rootName --prepare ../system/boot/$K_ARCH/$i --logfile terminal
- ../kiwi.pl --create $RPM_BUILD_ROOT/root-$rootName \
- -d $RPM_BUILD_ROOT/srv/tftpboot/boot --logfile terminal
- rm -rf $RPM_BUILD_ROOT/root-$rootName*
- echo >> $pxedefault
- echo "LABEL $rootName" >> $pxedefault
- (
- pushd $RPM_BUILD_ROOT/srv/tftpboot/boot
- xenkernel=""
- xenloader=""
- initrd=""
- kernel=""
- for n in *$rootName*;do
- echo $n | grep -q xen$ && xenkernel=$n || true
- echo $n | grep -q xen.gz$ && xenloader=$n || true
- echo $n | grep -q [0-9].gz$ && initrd=$n || true
- echo $n | grep -q kernel && kernel=$n || true
- done
- popd
- ../kiwi.pl --setup-splash \
- $RPM_BUILD_ROOT/srv/tftpboot/boot/$initrd && \
- rm -f $RPM_BUILD_ROOT/srv/tftpboot/boot/$initrd && \
- initrd=`echo $initrd | sed -e "s@.gz@.splash.gz@"`
- pushd $RPM_BUILD_ROOT/srv/tftpboot/boot
- cd $RPM_BUILD_ROOT/srv/tftpboot/boot
- if [ -n "$xenkernel" ];then
- echo " kernel mboot.c32" >> $pxedefault
- echo " append boot/$xenloader --- boot/$xenkernel vga=0x314 ramdisk_size=512000 ramdisk_blocksize=4096 splash=silent showopts --- boot/$initrd" >> $pxedefault
- echo " IPAPPEND 2" >> $pxedefault
- else
- echo " kernel boot/$kernel" >> $pxedefault
- echo " append initrd=boot/$initrd vga=0x314 ramdisk_size=512000 ramdisk_blocksize=4096 splash=silent showopts" >> $pxedefault
- echo " IPAPPEND 2" >> $pxedefault
- fi
- popd
- )
- done
- rm -f $RPM_BUILD_ROOT/srv/tftpboot/boot/*.md5
- rm -f $RPM_BUILD_ROOT/srv/tftpboot/boot/*.kernel
- chmod 644 $pxedefault
-else
- echo "cannot build prebuild images without root privileges"
- true
-fi
-%endif
+
#install
cd $RPM_BUILD_DIR/kiwi
#mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
@@ -417,11 +319,10 @@
man_prefix=$RPM_BUILD_ROOT/%{_mandir} \
install
touch kiwi.loader
+
%ifarch %ix86 x86_64
-if [ ! "$UID" = "$K_USER" ];then
install -m 644 pxeboot/pxelinux.0.config \
$RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default.default
-fi
%else
# no PXE boot setup for non x86 archs
rm -rf $RPM_BUILD_ROOT/srv/tftpboot
@@ -463,10 +364,12 @@
%defattr(-, root, root)
%dir %{_datadir}/kiwi
%dir %{_datadir}/kiwi/image
+%exclude %{_datadir}/kiwi/image/suse-11.3-JeOS
%exclude %{_datadir}/kiwi/image/suse-11.2-JeOS
%exclude %{_datadir}/kiwi/image/suse-11.1-JeOS
%exclude %{_datadir}/kiwi/image/suse-SLE10-JeOS
%exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS
+%exclude %{_datadir}/kiwi/image/rhel-05.4-JeOS
%{_datadir}/kiwi/.revision
%{_datadir}/kiwi/modules
%{_datadir}/kiwi/locale
@@ -525,16 +428,6 @@
/srv/tftpboot/pxelinux.cfg/default.default
%endif
#=================================================
-# KIWI-pxeboot-prebuild files...
-# ------------------------------------------------
-%ifarch %ix86 x86_64
-
-%files -n kiwi-pxeboot-prebuild
-%defattr(-, root, root)
-%doc /srv/tftpboot/README.prebuild
-/srv/tftpboot/boot
-%endif
-#=================================================
# KIWI-tools files...
# ------------------------------------------------
@@ -604,6 +497,7 @@
%files -n kiwi-templates
%defattr(-, root, root)
+%{_datadir}/kiwi/image/suse-11.3-JeOS
%{_datadir}/kiwi/image/suse-11.2-JeOS
%{_datadir}/kiwi/image/suse-11.1-JeOS
%{_datadir}/kiwi/image/suse-SLE10-JeOS
++++++ kiwi.tar.bz2 ++++++
kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org