Hello community,
here is the log from the commit of package kiwi
checked in at Tue Jun 3 00:58:58 CEST 2008.
--------
--- arch/i386/kiwi/kiwi.changes 2008-05-29 15:26:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2008-06-02 11:15:47.119077000 +0200
@@ -1,0 +2,17 @@
+Sat May 31 12:18:53 CEST 2008 - ms@suse.de
+
+- fixed USB stick identification code
+
+-------------------------------------------------------------------
+Fri May 30 11:23:39 CEST 2008 - ms@suse.de
+
+- make kiwi build on all archs. This does _not_ mean it
+ has full functionality on other archs than ix86 and x86_64
+ Support for other archs is still work in progress !
+- fixed find command in baseSetupPlainTextGITRepository
+- create generic bootloader functions which calls specific
+ bootloader code according to the architecture. At the moment
+ only x*86 and x86_64 have code for it
+- fixed grub title setup if multiple kernels are installed
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.q31861/_old 2008-06-03 00:58:26.000000000 +0200
+++ /var/tmp/diff_new_pack.q31861/_new 2008-06-03 00:58:26.000000000 +0200
@@ -43,13 +43,12 @@
Provides: kiwi2 = 2.14
Obsoletes: kiwi2 = 2.14
Version: 2.38
-Release: 61
+Release: 62
Group: System/Management
License: GPL v2 or later
Source: %{name}.tar.bz2
Source1: %{name}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ia64 ppc64 s390x s390 ppc
Recommends: smart zypper
%description
@@ -63,6 +62,8 @@
--------
Marcus Schaefer
+%ifarch %ix86 x86_64
+
%package -n kiwi-pxeboot
License: GPL v2 or later
Requires: syslinux
@@ -80,6 +81,8 @@
--------
Marcus Schaefer
+%endif
+
%package -n kiwi-tools
License: GPL v2 or later
Summary: OpenSuSE - KIWI tools collection
@@ -97,6 +100,8 @@
--------
Marcus Schaefer
+%ifarch %ix86 x86_64
+
%package -n kiwi-pxeboot-prebuild
License: GPL v2 only
Requires: syslinux
@@ -114,6 +119,9 @@
--------
Marcus Schaefer
+%endif
+%ifarch %ix86 x86_64
+
%package -n kiwi-desc-isoboot
License: GPL v2 or later
Requires: kiwi syslinux mkisofs
@@ -214,6 +222,8 @@
+%endif
+
%package -n kiwi-doc
License: LGPL v2.0 or later
Summary: OpenSuSE - KIWI Image System Documentation
@@ -260,8 +270,9 @@
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 boot images...
+ # 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
@@ -335,6 +346,7 @@
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
@@ -345,10 +357,18 @@
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
fi
+%else
+ # no boot image descriptions for non x86 archs
+ rm -rf $RPM_BUILD_ROOT/%{_datadir}/kiwi/image/*
+ # no PXE boot setup for non x86 archs
+ rm -rf $RPM_BUILD_ROOT/srv/tftpboot
+ rm -rf $RPM_BUILD_ROOT/etc/permissions.d/kiwi
+%endif
test -f $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.0 && \
echo /srv/tftpboot/pxelinux.0 > kiwi.loader
test -f $RPM_BUILD_ROOT/srv/tftpboot/mboot.c32 && \
@@ -420,6 +440,7 @@
#=================================================
# KIWI-pxeboot files...
# ------------------------------------------------
+%ifarch %ix86 x86_64
%files -n kiwi-pxeboot -f kiwi.loader
%defattr(-, root, root)
@@ -432,14 +453,17 @@
%dir /srv/tftpboot/upload
%dir /srv/tftpboot/boot
/srv/tftpboot/pxelinux.cfg/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...
# ------------------------------------------------
@@ -451,6 +475,7 @@
#=================================================
# KIWI-desc-*...
# ------------------------------------------------
+%ifarch %ix86 x86_64
%files -n kiwi-desc-isoboot
%defattr(-, root, root)
@@ -487,8 +512,20 @@
%dir %{_datadir}/kiwi/image/oemboot
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
+%endif
%changelog
+* Sat May 31 2008 ms@suse.de
+- fixed USB stick identification code
+* Fri May 30 2008 ms@suse.de
+- make kiwi build on all archs. This does _not_ mean it
+ has full functionality on other archs than ix86 and x86_64
+ Support for other archs is still work in progress !
+- fixed find command in baseSetupPlainTextGITRepository
+- create generic bootloader functions which calls specific
+ bootloader code according to the architecture. At the moment
+ only x*86 and x86_64 have code for it
+- fixed grub title setup if multiple kernels are installed
* Thu May 29 2008 ms@suse.de
- make NFSROOT work together with UNIONFS_CONFIG. The read-only
device in the UNIONFS_CONFIG setup will be replaced by the
++++++ kiwi.tar.bz2 ++++++
arch/i386/kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: byte 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