Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:11.1 checked in at Wed Dec 3 17:09:02 CET 2008. -------- --- old-versions/11.1/all/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2008-12-02 14:56:32.000000000 +0100 +++ /mounts/work_src_done/11.1/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2008-12-03 15:16:29.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Dec 3 15:16:16 CET 2008 - coolo@suse.de + +- fixes to make it possible to create livecd from online repos (preset + repos) + +------------------------------------------------------------------- +Wed Dec 3 12:17:32 CET 2008 - coolo@suse.de + +- do not overwrite the swap size +- do not overwrite sax defaults for language + +------------------------------------------------------------------- calling whatdependson for 11.1-i586 Old: ---- config.oempartition New: ---- README ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.YY4306/_old 2008-12-03 17:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.YY4306/_new 2008-12-03 17:08:56.000000000 +0100 @@ -25,7 +25,7 @@ BuildRequires: yast2-country Summary: KDE live CD Version: 11.1 -Release: 6 +Release: 7 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,10 +38,10 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source9: langset-xkb.pl +Source10: README Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks -Source14: config.oempartition Source16: boot.langset Source17: 99-ignore-live-usb.fdi Source18: kiwi-config-oem.diff @@ -103,7 +103,6 @@ cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem patch -l -p0 < %{SOURCE18} rm -f myoem/config.xml.orig - install -m 644 %{SOURCE14} myoem/root/config.oempartition /usr/sbin/kiwi --createhash myoem else cp -rL /usr/share/kiwi/image/isoboot/suse-$suseversion myiso @@ -113,6 +112,7 @@ 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,@FLAVOR@,$config," config.xml mkdir config-cdroot cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt @@ -155,7 +155,7 @@ install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch install -m 755 /usr/share/doc/packages/kiwi/examples/suse-11.1/suse-live-stick/root/etc/init.d/sax etc/init.d/sax - patch etc/init.d/sax %{SOURCE25} + #patch etc/init.d/sax %{SOURCE25} if test $desktop = kde; then install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ else @@ -167,6 +167,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 +install -m 644 -D %{SOURCE10} %{buildroot}/%_docdir/%name/README %fdupes %{buildroot}/usr/share/openSUSE-kiwi %files @@ -175,6 +176,12 @@ /usr/share/openSUSE-kiwi %changelog +* Wed Dec 03 2008 coolo@suse.de +- fixes to make it possible to create livecd from online repos (preset + repos) +* Wed Dec 03 2008 coolo@suse.de +- do not overwrite the swap size +- do not overwrite sax defaults for language * Tue Dec 02 2008 coolo@suse.de - fixed shell script to enable repos (bnc#441525) * Tue Nov 25 2008 coolo@suse.de ++++++ config.xml.in ++++++ --- /var/tmp/diff_new_pack.YY4306/_old 2008-12-03 17:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.YY4306/_new 2008-12-03 17:08:56.000000000 +0100 @@ -23,8 +23,11 @@ <users group="users"> <user name="root" pwd="" home="/root"/> </users> - <repository type="rpm-md"> - <source path="/only-required-rpms"/> + <repository type="yast2"> + <source path="http://download.opensuse.org/distribution/11.1/repo/oss/"/> + </repository> + <repository type="repo-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/11.1:/Live/standard/"/> </repository> <packages type="image" patternPackageType="onlyRequired"> <package name="yast2-live-installer"/> @@ -45,5 +48,7 @@ <package name="kernel-default"/> <package name="udev"/> <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-@FLAVOR@"/> </packages> </image> ++++++ README ++++++ # make sure the directory does not exist rm -rf /tmp/mypath # prepare the image directory based on the config # livecd-kde and livecd-gnome are easy, for usb images you need # to add --type oem kiwi --root /tmp/mypath --prepare /usr/share/openSUSE-kiwi/livecd-kde ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org