Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-02-11 20:48:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-02-07 10:26:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-02-11 20:48:04.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 11 11:13:14 UTC 2013 - [email protected] + +- Make Live-CD volume name string more indicative (bnc#802870) + +------------------------------------------------------------------- +Fri Feb 8 10:09:00 UTC 2013 - [email protected] + +- take out uefi for !x86_64 archs + +------------------------------------------------------------------- +Thu Feb 7 09:01:33 UTC 2013 - [email protected] + +- make it boot with efi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.BjVzTi/_old 2013-02-11 20:48:06.000000000 +0100 +++ /var/tmp/diff_new_pack.BjVzTi/_new 2013-02-11 20:48:06.000000000 +0100 @@ -123,21 +123,26 @@ sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml sed -i -e "s,@VERSION@,$kiwiversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml + volid="openSUSE 12.3 Live" case $desktop in gnome) sed -i -e "s,@PLIST@,GNOME-cd," config.xml + volid="openSUSE 12.3 GNOME Live" ;; kde) sed -i -e "s,@PLIST@,KDE-cd," config.xml + volid="openSUSE 12.3 KDE Live" ;; x11) sed -i -e "s,@PLIST@,X11-cd," config.xml ;; esac + sed -i -e "s,@VOLID@,$volid," config.xml %ifarch x86_64 sed -i -e "s,@BOOTKERNEL@,desktop," config.xml %else sed -i -e "s,@BOOTKERNEL@,std," config.xml + sed -i -e 's,firmware="uefi",,' config.xml %endif jing /usr/share/kiwi/modules/KIWISchema.rng config.xml @@ -170,8 +175,6 @@ 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} var/lib/livecd/config-firstboot.patch mkdir -p var/lib/YaST2 @@ -192,21 +195,13 @@ mkdir -p var/lib/zypp/ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor -if false; then - 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 var/lib/livecd/ - else - install -m 644 /usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf var/lib/livecd/ - fi - fi -fi arch=%{_target_cpu} plfile=/usr/share/suse/packages/$config-$arch if test -f $plfile; then mkdir -p var/cache/preload gzip -c $plfile > var/cache/preload/trace.gz fi + done %install ++++++ config.xml.in ++++++ --- /var/tmp/diff_new_pack.BjVzTi/_old 2013-02-11 20:48:06.000000000 +0100 +++ /var/tmp/diff_new_pack.BjVzTi/_new 2013-02-11 20:48:06.000000000 +0100 @@ -6,7 +6,7 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="clic" hybrid="true" hybridpersistent="false" image="iso" editbootconfig="isopatch.sh" firmware="uefi"/> <!-- type:livecd --> + <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="clic" hybrid="true" hybridpersistent="false" image="iso" editbootconfig="isopatch.sh" firmware="uefi" volid="@VOLID@"/> <!-- type:livecd --> <type boot="oemboot/suse-@VERSION@" filesystem="ext4" image="oem"> <!-- type:usb --> <oemconfig> <!-- type:usb --> <oem-swap>false</oem-swap> <!-- type:usb --> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
