Hello community, here is the log from the commit of package kiwi checked in at Fri May 25 00:39:57 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-05-23 10:38:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-05-24 17:20:24.933373000 +0200 @@ -1,0 +2,10 @@ +Wed May 23 20:50:34 CEST 2007 - ms@suse.de + +- v1.37 +- added boot images for SLES10/SLED10 isoboot (#270881) +- added boot images for SLES10/SLED10 vmxboot (#270881) +- added boot images for SLES10/SLED10 xenboot (#270881) +- replaced tools restart and timed with reboot and read -t +- some package building changes to make rpmlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.hN2110/_old 2007-05-25 00:39:33.000000000 +0200 +++ /var/tmp/diff_new_pack.hN2110/_new 2007-05-25 00:39:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.36) +# spec file for package kiwi (Version 1.37) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux Requires: perl perl-XML-LibXML perl-libwww-perl screen Summary: OpenSuSE - KIWI Image System -Version: 1.36 -Release: 2 +Version: 1.37 +Release: 1 Group: System/Management License: GNU General Public License (GPL) Source: kiwi.tar.bz2 @@ -149,14 +149,10 @@ 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/image/netboot rm -f /usr/share/kiwi/modules/KIWIScheme.xsd cp -f modules/KIWIScheme.xsd /usr/share/kiwi/modules - for i in `find system/boot/ -name restart`;do - rm -f $i && cp -a tools/restart $i - done - for i in `find system/boot/ -name timed`;do - rm -f $i && cp -a tools/timed $i - done + cp -a system/boot/netboot/suse-sles-repo /usr/share/kiwi/image/netboot cd modules pxedefault=$RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default echo "# /.../" > $pxedefault @@ -207,6 +203,7 @@ 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 @@ -222,12 +219,12 @@ install touch kiwi.loader if [ ! "$UID" = "$K_USER" ];then - install -m 755 pxeboot/pxelinux.0.config \ + install -m 644 pxeboot/pxelinux.0.config \ $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default fi -test -L $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.0 && \ +test -f $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.0 && \ echo /srv/tftpboot/pxelinux.0 > kiwi.loader -test -L $RPM_BUILD_ROOT/srv/tftpboot/mboot.c32 && \ +test -f $RPM_BUILD_ROOT/srv/tftpboot/mboot.c32 && \ echo /srv/tftpboot/mboot.c32 >> kiwi.loader cat kiwi.loader #================================================= @@ -249,6 +246,7 @@ %files -n kiwi-pxeboot -f kiwi.loader %defattr(-, root, root) +%doc /srv/tftpboot/README /etc/permissions.d/kiwi %dir /srv/tftpboot %dir /srv/tftpboot/KIWI @@ -263,31 +261,52 @@ %files -n kiwi-desc-isoboot %defattr(-, root, root) -%{_datadir}/kiwi/image/isoboot -%{_datadir}/kiwi/image/isoinstboot +%dir %{_datadir}/kiwi/image/isoinstboot +%dir %{_datadir}/kiwi/image/isoboot +%doc %{_datadir}/kiwi/image/isoboot/README +%doc %{_datadir}/kiwi/image/isoinstboot/README +%{_datadir}/kiwi/image/isoboot/suse* +%{_datadir}/kiwi/image/isoinstboot/suse* %files -n kiwi-desc-vmxboot %defattr(-, root, root) -%{_datadir}/kiwi/image/vmxboot +%dir %{_datadir}/kiwi/image/vmxboot +%doc %{_datadir}/kiwi/image/vmxboot/README +%{_datadir}/kiwi/image/vmxboot/suse* %files -n kiwi-desc-usbboot %defattr(-, root, root) -%{_datadir}/kiwi/image/usbboot +%dir %{_datadir}/kiwi/image/usbboot +%doc %{_datadir}/kiwi/image/usbboot/README +%{_datadir}/kiwi/image/usbboot/suse* %files -n kiwi-desc-netboot %defattr(-, root, root) -%{_datadir}/kiwi/image/netboot +%dir %{_datadir}/kiwi/image/netboot +%doc %{_datadir}/kiwi/image/netboot/README +%{_datadir}/kiwi/image/netboot/suse* %files -n kiwi-desc-xennetboot %defattr(-, root, root) -%{_datadir}/kiwi/image/xennetboot +%dir %{_datadir}/kiwi/image/xennetboot +%doc %{_datadir}/kiwi/image/xennetboot/README +%{_datadir}/kiwi/image/xennetboot/suse* %files -n kiwi-desc-xenboot %defattr(-, root, root) -%{_datadir}/kiwi/image/xenboot +%dir %{_datadir}/kiwi/image/xenboot +%doc %{_datadir}/kiwi/image/xenboot/README +%{_datadir}/kiwi/image/xenboot/suse* %changelog * Wed May 23 2007 - ms@suse.de +- v1.37 +- added boot images for SLES10/SLED10 isoboot (#270881) +- added boot images for SLES10/SLED10 vmxboot (#270881) +- added boot images for SLES10/SLED10 xenboot (#270881) +- replaced tools restart and timed with reboot and read -t +- some package building changes to make rpmlint happy +* Wed May 23 2007 - ms@suse.de - fixed x86_64 build for SLES based products * Tue May 22 2007 - ms@suse.de - v1.36 ++++++ kiwi.tar.bz2 ++++++ ++++ 6573 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org