Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:cgoncalves:LiveCD
kiwi-config-openSUSE
project4.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File project4.diff of Package kiwi-config-openSUSE
--- config-usb.patch.orig +++ config-usb.patch @@ -8,7 +8,18 @@ +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 -@@ -44,7 +44,7 @@ +@@ -48,7 +48,10 @@ + <stage>firstboot</stage> + <label>Hardware Configuration</label> + <proposal_modules config:type="list"> ++ <proposal_module>x11</proposal_module> + <proposal_module>printer</proposal_module> ++ <proposal_module>sound</proposal_module> ++ <proposal_module>bluetooth</proposal_module> + </proposal_modules> + </proposal> + <proposal> +@@ -74,7 +77,7 @@ <modules config:type="list"> <module> <label>Language</label> @@ -17,7 +28,7 @@ <name>firstboot_language</name> </module> <module> -@@ -93,7 +93,7 @@ +@@ -139,7 +142,7 @@ </module> <module> <label>Users</label> --- getcountrydata.ycp.orig +++ getcountrydata.ycp @@ -35,7 +35,7 @@ CONSOLE_MAGIC: %5 KEYTABLE: %6 YAST_KEYBOARD: %7 COMPOSETABLE: %8", - fqlanguage, font, unicodeMap, screenMap, magic, + fqlanguage, font, screenMap, unicodeMap, magic, Keyboard::keymap, yast_kbd, Keyboard::compose_table); if (lang == "zh_HK") --- kiwi-config-openSUSE.changes.orig +++ kiwi-config-openSUSE.changes @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Wed Dec 17 18:20:00 CET 2008 - coolo@suse.de + +- fix package lists again + +------------------------------------------------------------------- +Wed Dec 17 16:39:31 CET 2008 - coolo@suse.de + +- use factory repos for now + +------------------------------------------------------------------- +Mon Dec 8 11:47:59 CET 2008 - coolo@suse.de + +- let firstboot recreate X config + +------------------------------------------------------------------- +Sun Dec 7 20:07:14 CET 2008 - coolo@suse.de + +- fix bad typo - unicodeMap and screenmap was mixed (bnc#438964) + +------------------------------------------------------------------- Thu Dec 4 14:02:21 CET 2008 - coolo@suse.de - update documentation --- kiwi-config-openSUSE.spec.orig +++ kiwi-config-openSUSE.spec @@ -25,7 +25,7 @@ BuildRequires: libxslt opensuse-gnomequ BuildRequires: yast2-country Summary: KDE live CD Version: 11.1 -Release: 7 +Release: 8 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,7 +37,6 @@ Source5: config.patch Source6: config-kde.patch Source7: config-gnome.patch Source8: ifcfg-eth0 -Source9: langset-xkb.pl Source10: README Source11: configure-x.sh Source12: correct_live_install @@ -51,9 +50,7 @@ Source21: kiwi-config-iso.diff Source22: getcountrydata.ycp Source23: langset.pl Source24: boot.braille -Source25: boot.sax.diff ExcludeArch: ia64 ppc64 s390x s390 ppc -%define build_usb 0 %description The package contains a huge ISO @@ -79,7 +76,10 @@ for config in livecd-kde livecd-gnome li cd $config desktop=`echo $config | cut -d- -f2` type=`echo $config | cut -d- -f1` - cdlist=/usr/share/suse/packages/"$desktop"_cd.%{_target_cpu}.list + cdlist=/usr/share/suse/packages/"$desktop"_cd.%{_target_cpu}.list + if test "$desktop" = kde; then + cdlist=/usr/share/suse/packages/kde4_cd.%{_target_cpu}.list + fi test -f "$cdlist" || exit 1 sort -u $cdlist > wanted.list if test $type = usb; then @@ -139,10 +139,11 @@ for config in livecd-kde livecd-gnome li touch var/lib/YaST2/reconfig_system # still needed due to a bug in yast2-installation touch etc/reconfig_system + install -D -m 644 /usr/share/doc/packages/kiwi/examples/suse-11.1/suse-live-stick/root/etc/X11/xorg.conf etc/X11/xorg.conf + touch etc/dmidecode.md5 fi install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a /tmp/locale-settings/ etc/langset - install -m 755 %{SOURCE9} etc/langset-xkb.pl install -m 755 %{SOURCE23} etc/langset.pl install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 755 %{SOURCE24} etc/init.d/boot.braille @@ -151,7 +152,6 @@ for config in livecd-kde livecd-gnome li 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} if test $desktop = kde -o $desktop = kde3; then install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ else @@ -172,8 +172,12 @@ install -m 644 -D %{SOURCE10} %{buildroo /usr/share/openSUSE-kiwi %changelog +* Tue Jan 13 2009 cgoncalves@opensuse.org +- let firstboot recreate X config (from Factory) * Tue Dec 30 2008 cgoncalves@opensuse.org - include the kde3 usb config +* Sun Dec 07 2008 coolo@suse.de +- fix bad typo - unicodeMap and screenmap was mixed (bnc#438964) * Thu Dec 04 2008 coolo@suse.de - update documentation - also include the kde3 cd config --- langset.pl.orig +++ langset.pl @@ -30,9 +30,4 @@ foreach $key (keys %values) { 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 $values{"XkbLayout"} . "\n"; -print FH $values{"XkbModel"} . "\n"; -print FH $values{"XkbOptions"} . "\n"; -print FH $values{"XkbVariant"} . "\n"; -close(FH); +
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor