Hello community, here is the log from the commit of package kiwi-config-openSUSE checked in at Mon Nov 10 00:28:25 CET 2008. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2008-10-31 13:23:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2008-11-09 10:13:48.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Nov 9 10:13:42 CET 2008 - coolo@suse.de + +- several build fixes + +------------------------------------------------------------------- +Wed Nov 5 15:18:13 CET 2008 - coolo@suse.de + +- take the other release flavor for usb + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -18,14 +18,14 @@ Name: kiwi-config-openSUSE -BuildRequires: kiwi kiwi-desc-isoboot package-lists-openSUSE-all +BuildRequires: fdupes kiwi-desc-isoboot package-lists-openSUSE-all BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: libxslt opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: yast2-country Summary: KDE live CD Version: 11.1 -Release: 1 +Release: 2 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -87,6 +87,7 @@ sort -u $cdlist > wanted.list if test $type = usb; then sed -i -e "s,yast2-live-installer,yast2-firstboot," wanted.list + sed -i -e "s,release-livecd,release-usb," wanted.list fi install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat wanted.list | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ @@ -124,16 +125,10 @@ install -m 644 -D /CD1/control.xml etc/YaST2/control.xml /usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh 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 - if test $desktop = gnome; then - cat %{SOURCE7} >> tmp/config.patch - echo "distproduct=openSUSE-Live-Gnome" >> etc/zypp/products.d/openSUSE-release.prod - else - cat %{SOURCE6} >> tmp/config.patch - echo "distproduct=openSUSE-Live-KDE" >> etc/zypp/products.d/openSUSE-release.prod - fi + mkdir -p var/lib/zypp + 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 mkdir -p var/lib/YaST2 @@ -162,6 +157,7 @@ mkdir -p %{buildroot}/usr/share/openSUSE-kiwi mv livecd-kde livecd-gnome usb-kde usb-gnome %{buildroot}/usr/share/openSUSE-kiwi install -m 644 -D %{SOURCE1} %{buildroot}/%_docdir/%name/COPYING +%fdupes %{buildroot}/usr/share/openSUSE-kiwi %files %defattr(-, root, root) @@ -169,6 +165,10 @@ /usr/share/openSUSE-kiwi %changelog +* Sun Nov 09 2008 coolo@suse.de +- several build fixes +* Wed Nov 05 2008 coolo@suse.de +- take the other release flavor for usb * Fri Oct 31 2008 coolo@suse.de - use the yast data for langset (bnc#439822) * Wed Oct 29 2008 coolo@suse.de @@ -183,7 +183,7 @@ - fix build for build service * Tue Sep 30 2008 cthiel@suse.de - don't buildrequire smart anymore -* Fri Aug 22 2008 cthiel@suse.de +* Thu Aug 21 2008 cthiel@suse.de - fix config.sh * Tue Aug 19 2008 cthiel@suse.de - fix build_usb @@ -243,7 +243,7 @@ - update softlocks (bnc#390796) * Thu May 15 2008 coolo@suse.de - build the USB stick again -* Wed May 14 2008 coolo@suse.de +* Tue May 13 2008 coolo@suse.de - use sax2 again - too many problems not understood * Tue May 13 2008 coolo@suse.de - do not disable device mapper (bnc#389188) @@ -269,7 +269,7 @@ * Sat Apr 19 2008 coolo@suse.de - remove hack again and strictly check if zypper installed what we wanted to install -* Fri Apr 18 2008 ro@suse.de +* Thu Apr 17 2008 ro@suse.de - back to zypper but avoid kernel-source in repo * Thu Apr 17 2008 coolo@suse.de - had to switch to smart as zypper shows very weird bug tonight ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -92,6 +92,8 @@ rm -rf /var/cache/zypp/packages +#USB /usr/bin/correct_live_install usb + #====================================== # Umount kernel filesystems #-------------------------------------- ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -61,4 +61,3 @@ # bug 391798 sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",' /etc/sysconfig/displaymanager -#USB /usr/bin/correct_live_install usb ++++++ kiwi-config-iso.diff ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -1,14 +1,17 @@ ---- suse-11.0/config.xml 2008-07-24 11:15:39.000000000 +0000 -+++ myiso/config.xml 2008-08-11 10:57:22.000000000 +0000 -@@ -71,7 +71,6 @@ +--- suse-11.1.orig/config.xml 2008-10-07 12:08:06.000000000 +0200 ++++ myiso/config.xml 2008-11-05 17:22:37.000000000 +0100 +@@ -74,9 +74,8 @@ + </packages> <packages type="bootstrap"> <package name="filesystem"/> +- <package name="glibc@i586" arch="i686"/> ++ <package name="glibc"/> <package name="glibc-locale"/> - <package name="cracklib-dict-small"/> <package name="psmisc"/> <package name="bind-libs"/> <package name="bind-utils"/> -@@ -117,6 +116,7 @@ +@@ -122,6 +121,7 @@ <package name="bootsplash-branding-openSUSE"/> <package name="cpio"/> <package name="cyrus-sasl"/> ++++++ kiwi-config-oem.diff ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -1,14 +1,19 @@ ---- suse-11.1/config.xml 2008-07-24 11:15:14.000000000 +0000 -+++ myoem/config.xml 2008-08-12 15:11:31.000000000 +0000 -@@ -50,6 +50,7 @@ - <file name="drivers/parport/*"/> +--- suse-11.1.orig/config.xml 2008-10-07 12:08:04.000000000 +0200 ++++ myoem/config.xml 2008-11-05 20:39:26.000000000 +0100 +@@ -52,6 +52,7 @@ + <file name="drivers/char/lp.ko"/> <file name="drivers/acpi/dock.ko"/> - <file name="drivers/firmware/edd.ko"/> + <file name="drivers/firmware/edd.ko"/> + <file name="drivers/usb/*"/> </drivers> <repository type="yast2" status="replaceable"> <source path="/image/CDs/full-i386"/> -@@ -102,7 +103,7 @@ +@@ -107,11 +108,11 @@ + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> +- <package name="glibc@i586" arch="i686"/> ++ <package name="glibc"/> <package name="glibc-locale"/> <package name="diffutils"/> <package name="procps"/> @@ -17,23 +22,10 @@ </packages> <packages type="delete"> <package name="PolicyKit"/> -@@ -151,5 +152,6 @@ +@@ -160,5 +161,6 @@ <package name="fribidi"/> <package name="make"/> <package name="bootsplash-branding-openSUSE"/> + <package name="cracklib-dict-full"/> </packages> </image> ---- suse-11.1/root/preinit 2008-07-24 11:15:16.000000000 +0000 -+++ myoem/root/preinit 2008-08-12 15:12:05.000000000 +0000 -@@ -49,7 +49,9 @@ - #====================================== - # use distro initrd via mkinitrd - #-------------------------------------- -+ udevStart - setupSUSEInitrd -+ udevKill - else - #====================================== - # use kiwi initrd from RW partition - ++++++ langset.pl ++++++ --- /var/tmp/diff_new_pack.y30866/_old 2008-11-10 00:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.y30866/_new 2008-11-10 00:28:07.000000000 +0100 @@ -26,9 +26,9 @@ foreach $key (keys %values) { $value = $values{$key}; next if ($value eq ""); - system("sed -i -e 's,$key=\".*,$key=\"$value\",' /etc/sysconfig/language"); - system("sed -i -e 's,$key=\".*,$key=\"$value\",' /etc/sysconfig/keyboard"); - system("sed -i -e 's,$key=\".*,$key=\"$value\",' /etc/sysconfig/console"); + system("sed -i -e 's#$key=\".*#$key=\"$value\"#' /etc/sysconfig/language"); + system("sed -i -e 's#$key=\".*#$key=\"$value\"#' /etc/sysconfig/keyboard"); + system("sed -i -e 's#$key=\".*#$key=\"$value\"#' /etc/sysconfig/console"); } open(FH, ">/etc/langset.xkb"); print FH "$XKBLAYOUT\n"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org