Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Wed Nov 24 14:36:23 CET 2010. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2010-08-27 10:54:56.000000000 +0200 +++ kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2010-11-24 11:42:21.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 24 10:36:41 UTC 2010 - coolo@novell.com + +- /tmp should not be in root.tar because it overwrites permissions + +------------------------------------------------------------------- +Mon Oct 25 10:29:43 UTC 2010 - coolo@novell.com + +- bump version to 11.4, leave kiwi version at 11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.p2lqFi/_old 2010-11-24 14:36:10.000000000 +0100 +++ /var/tmp/diff_new_pack.p2lqFi/_new 2010-11-24 14:36:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi-config-openSUSE (Version 11.3) +# spec file for package kiwi-config-openSUSE (Version 11.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ BuildRequires: libxslt opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary: KDE live CD -Version: 11.3 -Release: 8 +Version: 11.4 +Release: 1 Group: System/Boot License: BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,15 +49,13 @@ ExcludeArch: ia64 ppc64 s390x s390 ppc %description -The package contains a huge ISO - - +The package contains various kiwi configs for openSUSE live media %prep %setup -T -c %build -kiwiversion=%version +kiwiversion=11.4 BASEDIR=$PWD rm -rf /tmp/locale-settings/ mkdir /tmp/locale-settings/ @@ -109,12 +107,11 @@ sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml fi rm wanted.list - suseversion=%{version} if test $type = usb; then sed -i -e 's,#USB ,,' config.sh fi sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml - sed -i -e "s,@VERSION@,$suseversion," config.xml + sed -i -e "s,@VERSION@,$kiwiversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml %ifarch x86_64 sed -i -e "s,@BOOTKERNEL@,desktop," config.xml @@ -130,20 +127,20 @@ tar czf ../config-cdroot.tgz * cd .. rm -rf config-cdroot - mkdir -p root/tmp + mkdir -p root/var/lib/livecd cd root install -m 644 /CD1/license.tar.gz . mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml - /usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh + /usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > var/lib/livecd/geturls.sh mkdir -p var/lib/zypp install -m 644 %{SOURCE27} var/lib/zypp/SoftLocks echo 0123456-7890-$desktop-$type-0123456 > var/lib/zypp/AnonymousUniqueId mkdir -p etc/smolt echo 0123456-7890-$desktop-$type-0123456 > etc/smolt/uuid if test $type = usb; then - cp %{SOURCE19} tmp/config-firstboot.patch + cp %{SOURCE19} var/lib/livecd/config-firstboot.patch mkdir -p var/lib/YaST2 touch var/lib/YaST2/reconfig_system # still needed due to a bug in yast2-installation @@ -163,9 +160,9 @@ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor if test $type != usb; then if test $desktop = kde; then - install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ + install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf var/lib/livecd/ else - install -m 644 /usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf tmp/ + install -m 644 /usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf var/lib/livecd/ fi fi arch=%{_target_cpu} ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.p2lqFi/_old 2010-11-24 14:36:10.000000000 +0100 +++ /var/tmp/diff_new_pack.p2lqFi/_new 2010-11-24 14:36:10.000000000 +0100 @@ -49,8 +49,8 @@ patch -p0 < /etc/YaST2/liveinstall.patch -if test -f /etc/YaST2/firstboot.xml -a -f /tmp/config-firstboot.patch; then - patch -f /etc/YaST2/firstboot.xml /tmp/config-firstboot.patch +if test -f /etc/YaST2/firstboot.xml -a -f /var/lib/livecd/config-firstboot.patch; then + patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch fi # disabled for now - if you reenable, don't forget correct_live_install @@ -68,8 +68,8 @@ rm -rf /var/cache/zypp/raw/* -bash -x /tmp/geturls.sh -rm /tmp/geturls.sh +bash -x /var/lib/livecd/geturls.sh +rm /var/lib/livecd/geturls.sh #====================================== # /etc/sudoers hack to fix #297695 @@ -88,12 +88,14 @@ : > /var/log/zypper.log -mv /tmp/*.pdf /home/linux || true +mv /var/lib/livecd/*.pdf /home/linux || true +rmdir /var/lib/livecd || true #====================================== # SuSEconfig #-------------------------------------- suseConfig +SuSEconfig --module permissions fdi=`ls -1 /usr/lib*/hal/hald-generate-fdi-cache || true` if test -x $fdi; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org