Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Fri Aug 22 00:24:51 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-16 00:25:42.000000000 +0200 +++ kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-22 00:24:16.963761000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 21 23:15:52 CEST 2008 - cthiel@suse.de + +- fix config.sh + +------------------------------------------------------------------- +Tue Aug 19 15:34:19 CEST 2008 - cthiel@suse.de + +- fix build_usb + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.k15970/_old 2008-08-22 00:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k15970/_new 2008-08-22 00:24:28.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 11 +Release: 12 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -160,7 +160,7 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config --add-repo /home/rpmdir --add-repotype rpm-md rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list -%if !%{build_usb} +%if %{build_usb} == 0 kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck --add-repo /home/rpmdir --add-repotype rpm-md %endif rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm @@ -172,7 +172,7 @@ touch $PWD/tmp/etc/reconfig_system #we only need this for squashfs images #install -D -m 644 %{SOURCE17} $PWD/tmp/usr/share/hal/fdi/policy/10osvendor/99-ignore-live-usb.fdi -%if %{build_usb} +%if %{build_usb} > 0 kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem --add-repo /home/rpmdir --add-repotype rpm-md %endif umount -f tmp/base-system/home/rpmdir || true @@ -184,12 +184,13 @@ sed -i -e 's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-gnome,' %{buildroot}/usr/share/openSUSE/kiwi-config-gnome/config.xml install -m 644 -D %{SOURCE1} %{buildroot}/%_docdir/kiwi-config-openSUSE-gnome/COPYING cd out -%if !%{build_usb} +%if %{build_usb} == 0 file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then echo "TOO LARGE" - exit 1 +# make a too large ISO non-fatal temporarily +# exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file %else @@ -207,6 +208,10 @@ /usr/share/openSUSE %changelog +* Fri Aug 22 2008 cthiel@suse.de +- fix config.sh +* Tue Aug 19 2008 cthiel@suse.de +- fix build_usb * Fri Aug 15 2008 coolo@suse.de - build CDs again * Wed Aug 13 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.k15970/_old 2008-08-22 00:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k15970/_new 2008-08-22 00:24:28.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 13 +Release: 14 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -160,7 +160,7 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config --add-repo /home/rpmdir --add-repotype rpm-md rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list -%if !%{build_usb} +%if %{build_usb} == 0 kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck --add-repo /home/rpmdir --add-repotype rpm-md %endif rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm @@ -172,7 +172,7 @@ touch $PWD/tmp/etc/reconfig_system #we only need this for squashfs images #install -D -m 644 %{SOURCE17} $PWD/tmp/usr/share/hal/fdi/policy/10osvendor/99-ignore-live-usb.fdi -%if %{build_usb} +%if %{build_usb} > 0 kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem --add-repo /home/rpmdir --add-repotype rpm-md %endif umount -f tmp/base-system/home/rpmdir || true @@ -184,12 +184,13 @@ sed -i -e 's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-kde,' %{buildroot}/usr/share/openSUSE/kiwi-config-kde/config.xml install -m 644 -D %{SOURCE1} %{buildroot}/%_docdir/kiwi-config-openSUSE-kde/COPYING cd out -%if !%{build_usb} +%if %{build_usb} == 0 file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then echo "TOO LARGE" - exit 1 +# make a too large ISO non-fatal temporarily +# exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file %else @@ -207,6 +208,10 @@ /usr/share/openSUSE %changelog +* Fri Aug 22 2008 cthiel@suse.de +- fix config.sh +* Tue Aug 19 2008 cthiel@suse.de +- fix build_usb * Fri Aug 15 2008 coolo@suse.de - build CDs again * Wed Aug 13 2008 coolo@suse.de ++++++ boot.create_xconf ++++++ --- arch/i686/kiwi-image-livecd-kde/boot.create_xconf 2008-08-07 12:26:11.000000000 +0200 +++ kiwi-image-livecd-kde/boot.create_xconf 2008-08-22 00:23:22.983767000 +0200 @@ -4,8 +4,8 @@ # ### BEGIN INIT INFO # Provides: create_xconf -# Required-Start: $local_fs -# Required-Stop: +# Required-Start: boot.localfs +# Required-Stop: boot.localfs # Default-Start: B # Should-Start: boot.blktrace boot.cleanup boot.clock boot.crypto boot.crypto-early boot.cycle boot.device-mapper boot.dmraid boot.evms boot.fuse boot.getclock boot.ipconfig boot.klog boot.ldconfig boot.loadmodulesboot.local boot.localfs boot.localnet boot.lvm boot.md boot.multipath boot.proc boot.rootfsck boot.sched boot.scpm boot.swap boot.sysctl boot.udev boot.udev_retry boot.videobios boot.langset # Default-Stop: ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-08-12 17:51:31.000000000 +0200 +++ kiwi-image-livecd-kde/config.sh 2008-08-21 18:11:13.690886000 +0200 @@ -14,10 +14,8 @@ test -f /.kconfig && . /.kconfig test -f /.profile && . /.profile -set -e - -exec > /var/log/config.log -exec 2>&1 +#exec > /var/log/config.log +#exec 2>&1 #====================================== # Greeting... @@ -92,10 +90,10 @@ test -x /usr/bin/kbuildsycoca4 && su - linux -c /usr/bin/kbuildsycoca4 -set +e +rm -rf /var/cache/zypp/packages + #====================================== # Umount kernel filesystems #-------------------------------------- baseCleanMount exit 0 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org