Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Fri Aug 8 02:10:46 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-02 04:36:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-08 02:09:08.320638000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 7 16:31:07 CEST 2008 - coolo@suse.de + +- make the usb image configurable +- make the usb firstboot config work + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- create_xconf New: ---- boot.create_xconf config-usb.patch myoem.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.g17932/_old 2008-08-08 02:09:26.000000000 +0200 +++ /var/tmp/diff_new_pack.g17932/_new 2008-08-08 02:09:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kiwi-image-livecd-gnome (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -29,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 2 +Release: 3 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +49,7 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source9: langset.tgz -Source10: create_xconf +Source10: boot.create_xconf Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks @@ -50,7 +57,10 @@ Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi +Source18: myoem.diff +Source19: config-usb.patch ExcludeArch: ia64 ppc64 s390x s390 ppc +%define build_usb 0 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -79,7 +89,12 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml +%if %suse_version > 1100 cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem +%else +cp -rL /usr/share/kiwi/image/oemboot/suse-11.0 myoem +%endif +patch myoem/config.xml %{SOURCE18} install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -110,7 +125,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks -install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE10} etc/init.d/boot.create_xconf install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -131,13 +146,21 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config 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} kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck -#rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm -#zypper -n --root $PWD/tmp remove yast2-live-installer -#chroot $PWD/tmp /usr/bin/correct_live_install usb -#touch $PWD/tmp/var/lib/YaST2/reconfig_system +%endif +rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm +zypper -n --root $PWD/tmp remove yast2-live-installer +cp %{SOURCE19} $PWD/tmp/tmp +chroot $PWD/tmp /usr/bin/correct_live_install usb +touch $PWD/tmp/var/lib/YaST2/reconfig_system +# still needed due to a bug in yast2-installation +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 -#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%if %{build_usb} +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%endif umount -f tmp/base-system/home/rpmdir || true %install @@ -147,6 +170,7 @@ 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} file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then @@ -154,8 +178,10 @@ exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file -#file=`ls -1 *.raw` -#bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%else +file=`ls -1 *.raw` +bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%endif %files %defattr(-, root, root) @@ -166,6 +192,9 @@ /usr/share/openSUSE %changelog +* Thu Aug 07 2008 coolo@suse.de +- make the usb image configurable +- make the usb firstboot config work * Wed Jul 23 2008 cthiel@suse.de - don't build usb image for now - disable boot.apparmor as a temporary workaround for Alpha1 ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.g17932/_old 2008-08-08 02:09:26.000000000 +0200 +++ /var/tmp/diff_new_pack.g17932/_new 2008-08-08 02:09:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kiwi-image-livecd-kde (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -29,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 2 +Release: 3 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +49,7 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source9: langset.tgz -Source10: create_xconf +Source10: boot.create_xconf Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks @@ -50,7 +57,10 @@ Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi +Source18: myoem.diff +Source19: config-usb.patch ExcludeArch: ia64 ppc64 s390x s390 ppc +%define build_usb 0 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -79,7 +89,12 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml +%if %suse_version > 1100 cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem +%else +cp -rL /usr/share/kiwi/image/oemboot/suse-11.0 myoem +%endif +patch myoem/config.xml %{SOURCE18} install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -110,7 +125,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks -install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE10} etc/init.d/boot.create_xconf install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -131,13 +146,21 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config 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} kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck -#rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm -#zypper -n --root $PWD/tmp remove yast2-live-installer -#chroot $PWD/tmp /usr/bin/correct_live_install usb -#touch $PWD/tmp/var/lib/YaST2/reconfig_system +%endif +rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm +zypper -n --root $PWD/tmp remove yast2-live-installer +cp %{SOURCE19} $PWD/tmp/tmp +chroot $PWD/tmp /usr/bin/correct_live_install usb +touch $PWD/tmp/var/lib/YaST2/reconfig_system +# still needed due to a bug in yast2-installation +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 -#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%if %{build_usb} +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%endif umount -f tmp/base-system/home/rpmdir || true %install @@ -147,6 +170,7 @@ 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} file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then @@ -154,8 +178,10 @@ exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file -#file=`ls -1 *.raw` -#bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%else +file=`ls -1 *.raw` +bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%endif %files %defattr(-, root, root) @@ -166,6 +192,9 @@ /usr/share/openSUSE %changelog +* Thu Aug 07 2008 coolo@suse.de +- make the usb image configurable +- make the usb firstboot config work * Wed Jul 23 2008 cthiel@suse.de - don't build usb image for now - disable boot.apparmor as a temporary workaround for Alpha1 ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-07-23 17:35:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-08-07 12:25:56.902530000 +0200 @@ -38,7 +38,7 @@ chkconfig cron off # enable create_xconf -chkconfig create_xconf on +chkconfig boot.create_xconf on chkconfig boot.langset on cd / @@ -99,6 +99,4 @@ #-------------------------------------- baseCleanMount -rm -rf /var/lib/smart - exit 0 ++++++ config-usb.patch ++++++ --- /etc/sysconfig/clock.orig 2008-08-07 10:36:55.000000000 +0200 +++ /etc/sysconfig/clock 2008-08-07 10:35:53.000000000 +0200 @@ -28,4 +28,4 @@ # Timezone (e.g. CET) # (this will set /usr/lib/zoneinfo/localtime) # -TIMEZONE="" +TIMEZONE="America/New_York" --- /etc/YaST2/firstboot.xml.orig 2008-08-07 11:51:37.000000000 +0200 +++ /etc/YaST2/firstboot.xml 2008-08-07 10:39:51.000000000 +0200 @@ -91,11 +91,13 @@ <enabled config:type="boolean">true</enabled> <name>inst_root</name> </module> +<!-- <module> <label>Users</label> <enabled config:type="boolean">true</enabled> <name>inst_auth</name> </module> +--> <module> <label>Users</label> <enabled config:type="boolean">true</enabled> ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-07-17 08:19:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-08-07 15:20:21.204337000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="openSUSE-11.1"> +<image schemeversion="2.4" name="openSUSE-11.1"> <description type="system"> <author>Stephan Kulow</author> <contact>coolo@novell.com</contact> @@ -9,9 +9,10 @@ <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> - <type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type> + <!-- type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type --> + <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> <version>2.7.0</version> - <size unit="M">780</size> + <size unit="M">2780</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>False</rpm-force> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-07-17 08:19:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-08-07 15:17:05.533215000 +0200 @@ -12,9 +12,9 @@ chkconfig sshd on chkconfig cron on if test "$is_usb" = 0; then - chkconfig create_xconf off - chkconfig boot.langset off + chkconfig boot.create_xconf off fi +chkconfig boot.langset off #====================================== # /etc/sudoers hack to fix #297695 @@ -39,6 +39,7 @@ rm -rf /etc/langset/ grep -v ^perl /etc/init.d/boot.local > /etc/init.d/boot.local.1 && mv /etc/init.d/boot.local.1 /etc/init.d/boot.local chmod 0755 /etc/init.d/boot.local +rm /etc/init.d/boot.langset cd / @@ -46,18 +47,17 @@ rm /etc/YaST2/policy.patch if test "$is_usb" = 0; then - rm /etc/init.d/create_xconf + rm /etc/init.d/boot.create_xconf + rm /usr/sbin/configure-x.sh + cd /etc/zypp/repos.d + for i in openSUSE-11.1-Oss openSUSE-11.1-Non-Oss openSUSE-11.1-Updates; do + sed -i -e "s,enabled=0,enabled=1," $i.repo + done +else + patch -p0 < /tmp/config-usb.patch + rm /tmp/config-usb.patch fi -rm -r /etc/langset* -rm /etc/init.d/boot.langset -rm /usr/sbin/configure-x.sh - -cd /etc/zypp/repos.d -for i in openSUSE-11.1-Oss openSUSE-11.1-Non-Oss openSUSE-11.1-Updates; do - sed -i -e "s,enabled=0,enabled=1," $i.repo -done - # bug 391798 sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",' /etc/sysconfig/displaymanager ++++++ myoem.diff ++++++ --- suse-11.0//config.xml 2008-07-24 13:15:09.000000000 +0200 +++ myoem//config.xml 2008-08-07 11:22:06.000000000 +0200 @@ -50,6 +42,7 @@ <file name="drivers/parport/*"/> <file name="drivers/char/lp.ko"/> <file name="drivers/acpi/dock.ko"/> + <file name="drivers/usb/*"/> </drivers> <repository type="yast2" status="replaceable"> <source path="/image/CDs/full-11.0-i386"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de