Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Fri Aug 8 17:20:25 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-08 02:09:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-08 17:19:33.651328000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 8 15:17:53 CEST 2008 - coolo@suse.de + +- take the repos out of the control.xml (to build it easily against + 11.0 and 11.1) + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- openSUSE-release.prod New: ---- geturls.xsl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.i16731/_old 2008-08-08 17:20:00.000000000 +0200 +++ /var/tmp/diff_new_pack.i16731/_new 2008-08-08 17:20:00.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 3 +Release: 4 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,13 +54,13 @@ Source12: correct_live_install Source13: SoftLocks Source14: config.oempartition -Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi Source18: myoem.diff Source19: config-usb.patch +Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc -%define build_usb 0 +%define build_usb 1 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -89,15 +89,16 @@ 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 +suseversion=11.0 %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 +suseversion=11.1 %endif +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem 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 +sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt @@ -112,15 +113,18 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml +install -m 644 %{SOURCE20} tmp/geturls.xsl install -m 644 %{SOURCE5} tmp/config.patch mkdir -p etc/zypp/products.d +echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod +echo "distversion=$suseversion" >> etc/zypp/products.d/openSUSE-release.prod # see above if test GNOME = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod + echo "distproduct=openSUSE-Live-Gnome" >> etc/zypp/products.d/openSUSE-release.prod else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod + echo "distproduct=openSUSE-Live-GNOME" >> etc/zypp/products.d/openSUSE-release.prod fi install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} @@ -143,11 +147,11 @@ cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir -kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config +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} -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck +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 zypper -n --root $PWD/tmp remove yast2-live-installer @@ -159,7 +163,7 @@ #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} -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +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 @@ -192,6 +196,9 @@ /usr/share/openSUSE %changelog +* Fri Aug 08 2008 coolo@suse.de +- take the repos out of the control.xml (to build it easily against + 11.0 and 11.1) * Thu Aug 07 2008 coolo@suse.de - make the usb image configurable - make the usb firstboot config work ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.i16731/_old 2008-08-08 17:20:00.000000000 +0200 +++ /var/tmp/diff_new_pack.i16731/_new 2008-08-08 17:20:00.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 3 +Release: 4 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,13 +54,13 @@ Source12: correct_live_install Source13: SoftLocks Source14: config.oempartition -Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi Source18: myoem.diff Source19: config-usb.patch +Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc -%define build_usb 0 +%define build_usb 1 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -89,15 +89,16 @@ 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 +suseversion=11.0 %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 +suseversion=11.1 %endif +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem 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 +sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt @@ -112,15 +113,18 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml +install -m 644 %{SOURCE20} tmp/geturls.xsl install -m 644 %{SOURCE5} tmp/config.patch mkdir -p etc/zypp/products.d +echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod +echo "distversion=$suseversion" >> etc/zypp/products.d/openSUSE-release.prod # see above if test KDE = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod + echo "distproduct=openSUSE-Live-Gnome" >> etc/zypp/products.d/openSUSE-release.prod else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod + echo "distproduct=openSUSE-Live-KDE" >> etc/zypp/products.d/openSUSE-release.prod fi install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} @@ -143,11 +147,11 @@ cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir -kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config +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} -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck +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 zypper -n --root $PWD/tmp remove yast2-live-installer @@ -159,7 +163,7 @@ #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} -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +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 @@ -192,6 +196,9 @@ /usr/share/openSUSE %changelog +* Fri Aug 08 2008 coolo@suse.de +- take the repos out of the control.xml (to build it easily against + 11.0 and 11.1) * Thu Aug 07 2008 coolo@suse.de - make the usb image configurable - make the usb firstboot config work ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-08-07 12:25:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-08-08 14:46:13.641435000 +0200 @@ -59,12 +59,8 @@ rm -rf /var/cache/zypp/raw/* -# TODO: take them directly out of control.xml -zypper addrepo -d http://download.opensuse.org/distribution/11.1/repo/oss/ "openSUSE-11.1-Oss" -zypper addrepo -d http://download.opensuse.org/distribution/11.1/repo/non-oss/ "openSUSE-11.1-Non-Oss" -zypper addrepo -d http://download.opensuse.org/update/11.1/ "openSUSE-11.1-Updates" - -rm -rf /var/cache/zypp/raw/* +xsltproc /tmp/geturls.xsl /etc/YaST2/control.xml | bash -x +rm /tmp/geturls.xsl #====================================== # /etc/sudoers hack to fix #297695 ++++++ config-usb.patch ++++++ --- /var/tmp/diff_new_pack.i16731/_old 2008-08-08 17:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.i16731/_new 2008-08-08 17:20:01.000000000 +0200 @@ -8,17 +8,21 @@ +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> +@@ -44,7 +44,7 @@ + <modules config:type="list"> + <module> + <label>Language</label> +- <enabled config:type="boolean">false</enabled> ++ <enabled config:type="boolean">true</enabled> + <name>firstboot_language</name> + </module> + <module> +@@ -93,7 +93,7 @@ </module> -+<!-- <module> <label>Users</label> - <enabled config:type="boolean">true</enabled> +- <enabled config:type="boolean">true</enabled> ++ <enabled config:type="boolean">false</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-08-07 15:20:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-08-08 15:15:26.825048000 +0200 @@ -1,14 +1,14 @@ <?xml version="1.0"?> -<image schemeversion="2.4" name="openSUSE-11.1"> +<image schemeversion="2.4" name="openSUSE-@VERSION@"> <description type="system"> <author>Stephan Kulow</author> <contact>coolo@novell.com</contact> - <specification>openSUSE 11.1 Live system</specification> + <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <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 primary="true" boot="isoboot/suse-@VERSION@" flags="unified">iso</type> + <type boot="vmxboot/suse-@VERSION@" filesystem="ext3" format="vmdk">vmx</type> + <type boot="xenboot/suse-@VERSION@" filesystem="ext3">xen</type> <!-- type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type --> <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> <version>2.7.0</version> @@ -24,16 +24,8 @@ <user name="root" pwd="" home="/root"/> </users> <repository type="rpm-md"> - <source path="/home/rpmdir"/> + <source path="/only-required-rpms"/> </repository> - <packages type="image" patternPackageType="onlyRequired"> <package name="yast2-live-installer"/> <package name="pam"/> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-08-07 15:17:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-08-08 13:36:04.445009000 +0200 @@ -50,7 +50,7 @@ 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 + for i in *; do sed -i -e "s,enabled=0,enabled=1," $i.repo done else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org