Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Mon Jun 9 00:15:38 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-06-03 15:54:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-06-09 00:15:06.774117000 +0200 @@ -1,0 +2,16 @@ +Sat Jun 7 22:29:17 CEST 2008 - coolo@suse.de + +- don't put the pdf in the root of the CD, but in $HOME + +------------------------------------------------------------------- +Sat Jun 7 22:19:32 CEST 2008 - coolo@suse.de + +- hide volumes mounted as /read-write and /read-only (bnc#391866) + +------------------------------------------------------------------- +Sat Jun 7 21:54:29 CEST 2008 - coolo@suse.de + +- do not use zypper out of live installer (zypp lock in the way, + bnc#398138) + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change New: ---- 99-ignore-live-usb.fdi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.x11112/_old 2008-06-09 00:15:18.000000000 +0200 +++ /var/tmp/diff_new_pack.x11112/_new 2008-06-09 00:15:18.000000000 +0200 @@ -18,17 +18,18 @@ BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE skelcd-openSUSE-CD +BuildRequires: opensuse-gnomequick_en-pdf yast2-firstboot # the following are listed as needed without a way for me to track it # without solving and I have no idea how to do that automatically. # simply remove them and try to build - kiwi/zypper will then complain BuildRequires: aufs BuildRequires: aufs-kmp-default BuildRequires: fribidi -BuildRequires: gfxboot +BuildRequires: boo gfxboot BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.0 -Release: 107 +Release: 110 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +48,7 @@ Source14: config.oempartition Source15: openSUSE-release.prod Source16: boot.langset +Source17: 99-ignore-live-usb.fdi ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -82,12 +84,6 @@ sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml mkdir config-cdroot cd config-cdroot -# I know this looks weird in the kde.spec, but GNOME is replaced with GNOME to generate gnome.spec -if test GNOME = GNOME; then - install -m 644 /usr/share/doc/manual/opensuse-manual_en-pdf/opensuse-gnomequick_en.pdf . -else - install -m 644 /usr/share/doc/manual/opensuse-manual_en-pdf/opensuse-kdequick_en.pdf . -fi install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt install -m 644 /CD1/README* /CD1/EULA.txt /CD1/SuSEgo.ico /CD1/autorun.inf . @@ -117,6 +113,8 @@ install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch +# I know this looks weird in the kde.spec, but GNOME is replaced with GNOME to generate gnome.spec +install -m 644 /usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf tmp/ %build . /.buildenv @@ -124,7 +122,7 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -132,6 +130,11 @@ 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 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 +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 umount -f tmp/base-system/home/rpmdir || true @@ -161,6 +164,13 @@ /usr/share/openSUSE %changelog +* Sun Jun 08 2008 coolo@suse.de +- don't put the pdf in the root of the CD, but in $HOME +* Sun Jun 08 2008 coolo@suse.de +- hide volumes mounted as /read-write and /read-only (bnc#391866) +* Sat Jun 07 2008 coolo@suse.de +- do not use zypper out of live installer (zypp lock in the way, + bnc#398138) * Tue Jun 03 2008 coolo@suse.de - fix build requires - remove most of the softlocks, should not be necessary any longer ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.x11112/_old 2008-06-09 00:15:18.000000000 +0200 +++ /var/tmp/diff_new_pack.x11112/_new 2008-06-09 00:15:18.000000000 +0200 @@ -18,17 +18,18 @@ BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE skelcd-openSUSE-CD +BuildRequires: opensuse-kdequick_en-pdf yast2-firstboot # the following are listed as needed without a way for me to track it # without solving and I have no idea how to do that automatically. # simply remove them and try to build - kiwi/zypper will then complain BuildRequires: aufs BuildRequires: aufs-kmp-default BuildRequires: fribidi -BuildRequires: gfxboot +BuildRequires: boo gfxboot BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.0 -Release: 107 +Release: 110 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +48,7 @@ Source14: config.oempartition Source15: openSUSE-release.prod Source16: boot.langset +Source17: 99-ignore-live-usb.fdi ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -82,12 +84,6 @@ sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml mkdir config-cdroot cd config-cdroot -# I know this looks weird in the kde.spec, but KDE is replaced with GNOME to generate gnome.spec -if test KDE = GNOME; then - install -m 644 /usr/share/doc/manual/opensuse-manual_en-pdf/opensuse-gnomequick_en.pdf . -else - install -m 644 /usr/share/doc/manual/opensuse-manual_en-pdf/opensuse-kdequick_en.pdf . -fi install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt install -m 644 /CD1/README* /CD1/EULA.txt /CD1/SuSEgo.ico /CD1/autorun.inf . @@ -117,6 +113,8 @@ install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch +# I know this looks weird in the kde.spec, but KDE is replaced with GNOME to generate gnome.spec +install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ %build . /.buildenv @@ -124,7 +122,7 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -132,6 +130,11 @@ 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 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 +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 umount -f tmp/base-system/home/rpmdir || true @@ -161,6 +164,13 @@ /usr/share/openSUSE %changelog +* Sun Jun 08 2008 coolo@suse.de +- don't put the pdf in the root of the CD, but in $HOME +* Sun Jun 08 2008 coolo@suse.de +- hide volumes mounted as /read-write and /read-only (bnc#391866) +* Sat Jun 07 2008 coolo@suse.de +- do not use zypper out of live installer (zypp lock in the way, + bnc#398138) * Tue Jun 03 2008 coolo@suse.de - fix build requires - remove most of the softlocks, should not be necessary any longer ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-06-02 08:59:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/kiwi-image-livecd-kde/config.sh 2008-06-08 12:27:14.613257000 +0200 @@ -62,6 +62,11 @@ zypper addrepo -d http://download.opensuse.org/distribution/11.0/repo/oss/ "openSUSE-11.0-Oss" zypper addrepo -d http://download.opensuse.org/distribution/11.0/repo/non-oss/ "openSUSE-11.0-Non-Oss" zypper addrepo -d http://download.opensuse.org/update/11.0/ "openSUSE-11.0-Updates" +zypper mr -p 120 "openSUSE-11.0-Oss" +zypper mr -p 120 "openSUSE-11.0-Non-Oss" +zypper mr -p 20 "openSUSE-11.0-Updates" + +rm -rf /var/cache/zypp/raw/* #====================================== # /etc/sudoers hack to fix #297695 @@ -80,6 +85,8 @@ : > /var/log/zypper.log +mv /tmp/*.pdf /home/linux + #====================================== # SuSEconfig #-------------------------------------- ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-06-02 08:59:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-06-08 19:49:18.082194000 +0200 @@ -4,10 +4,17 @@ # image. So the goal of this script is to fix whatever configs were changed for the # live system +is_usb=0 +if test "$1" = usb; then + is_usb=1 +fi + chkconfig sshd on chkconfig cron on -chkconfig create_xconf off -chkconfig boot.langset off +if test "$is_usb" = 0; then + chkconfig create_xconf off + chkconfig boot.langset off +fi #====================================== # /etc/sudoers hack to fix #297695 @@ -22,8 +29,10 @@ # reset pam config pam-config -d --nullok -# remove unneeded /license.tar.gz -rm /license.tar.gz +if test "$is_usb" = 0; then + # remove unneeded /license.tar.gz + rm /license.tar.gz +fi # remove langset stuff rm /etc/langset.pl @@ -36,14 +45,18 @@ # patch -R -p0 < /etc/YaST2/policy.patch rm /etc/YaST2/policy.patch -rm /etc/init.d/create_xconf +if test "$is_usb" = 0; then + rm /etc/init.d/create_xconf +fi + rm -r /etc/langset* rm /etc/init.d/boot.langset rm /usr/sbin/configure-x.sh -zypper mr -e -p 120 "openSUSE-11.0-Oss" -zypper mr -e -p 120 "openSUSE-11.0-Non-Oss" -zypper mr -e -p 20 "openSUSE-11.0-Updates" +cd /etc/zypp/repos.d +for i in openSUSE-11.0-Oss openSUSE-11.0-Non-Oss openSUSE-11.0-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 ++++++ pre_checkin.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/pre_checkin.sh 2008-05-17 21:51:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/kiwi-image-livecd-kde/pre_checkin.sh 2008-06-07 22:26:19.100181000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh cp kiwi-image-livecd-kde.changes kiwi-image-livecd-gnome.changes -sed -e "s,KDE,GNOME,; s,livecd-kde,livecd-gnome,; s,kiwi-config-kde,kiwi-config-gnome,g; s,openSUSE-kde,openSUSE-gnome,g" kiwi-image-livecd-kde.spec > kiwi-image-livecd-gnome.spec +sed -e "s,KDE,GNOME,; s,livecd-kde,livecd-gnome,; s,kiwi-config-kde,kiwi-config-gnome,g; s,openSUSE-kde,openSUSE-gnome,g; s,kdequick,gnomequick,g" kiwi-image-livecd-kde.spec > kiwi-image-livecd-gnome.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org