[Erp5-report] r7873 - /spec/mandriva/2006.0/mklivecd/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 19 17:25:48 CEST 2006
Author: kevin
Date: Mon Jun 19 17:25:46 2006
New Revision: 7873
URL: http://svn.erp5.org?rev=7873&view=rev
Log:
Commit mklivecd-0.5.9-0.10mdk spec files and patches
Added:
spec/mandriva/2006.0/mklivecd/
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-hw.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-ln_s.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-service.patch
spec/mandriva/2006.0/mklivecd/mklivecd.spec
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-hw.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-hw.patch?rev=7873&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-hw.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-hw.patch Mon Jun 19 17:25:46 2006
@@ -1,0 +1,69 @@
+--- ./src/mklivecd.in.hw 2005-02-08 17:39:30.000000000 +0100
++++ ./src/mklivecd.in 2005-02-08 17:40:47.504672008 +0100
+@@ -74,6 +74,7 @@
+ ### command-line options
+ my $o_verbose;
+ my $o_workdir;
++my $o_lang;
+ my $o_root = "/";
+ my $o_tmp = "/tmp";
+ my $o_looptype = "sqfs";
+@@ -1007,15 +1008,49 @@
+ parse_options();
+
+ create_initrd();
+-# if (-e "$o_root/etc/init.d/harddrake") {
+-# Storable::store({ dummy => 'nothing' } , "$o_root/etc/sysconfig/harddrake2/previous_hw");
+-# run_program::rooted($o_root, "chkconfig", "--add", "harddrake");
+-# }
+-# {
+-# local $::prefix = $o_root;
+-# require keyboard;
+-# keyboard::write(keyboard::lang2keyboard($o_keyboard));
+-# }
++ if (-e "$o_root/etc/init.d/harddrake") {
++ Storable::store({ dummy => 'nothing' } , "$o_root/etc/sysconfig/harddrake2/previous_hw");
++ run_program::rooted($o_root, "chkconfig", "--del", "harddrake");
++ run_program::rooted($o_root, "chkconfig", "--add", "harddrake");
++ }
++ {
++ local $::prefix = $o_root;
++ require any;
++ require lang;
++ require keyboard;
++ # configure keyboard:
++ keyboard::write(keyboard::lang2keyboard($o_keyboard));
++ # configure i18n:
++ my $country = uc($o_keyboard);
++ lang::write({
++ country => member($country, lang::list_countries()) ? $country : 'US',
++ lang => member($o_lang, lang::list_langs()) ? $o_lang : 'en_US',
++ }, 0, 'dont_touch_kde_files');
++ # add at least one user:
++ my $user = 'guest';
++ any::add_users(
++ #any::addUsers(
++ [
++ {
++ 'name' => $user,
++ 'realname' => $user,
++ 'icon' => 'default',
++ 'uid' => '501',
++ 'gid' => '501',
++ 'shell' => '/bin/bash',
++ 'home' => '/home/guest',
++ 'password' => '',
++ 'password2' => '',
++ 'pw' => '',
++ 'groups' => [],
++ },
++ ],
++ { md5 => 1, },
++ );
++ any::set_autologin($user, 'KDE');
++ require Xconfig::various;
++ Xconfig::various::runlevel(5);
++ }
+
+ do_cmd("ln -sf $o_root/var/lib/xkb $o_root/usr/X11R6/lib/X11/xkb/compiled");
+ do_cmd("ln -sf $o_root/var/lib/xdm $o_root/usr/X11R6/lib/X11/xdm/authdir");
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-ln_s.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-ln_s.patch?rev=7873&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-ln_s.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-ln_s.patch Mon Jun 19 17:25:46 2006
@@ -1,0 +1,18 @@
+Index: src/mklivecd.in
+===================================================================
+RCS file: /cvsroot/livecd/mklivecd/src/mklivecd.in,v
+retrieving revision 1.143
+diff -u -r1.143 mklivecd.in
+--- src/mklivecd.in 3 Mar 2005 16:34:27 -0000 1.143
++++ src/mklivecd.in 2 Sep 2005 21:16:21 -0000
+@@ -1019,8 +1019,8 @@
+
+ do_cmd("rm -f $o_root/usr/X11R6/lib/X11/xkb/compiled");
+ do_cmd("rm -f $o_root/usr/X11R6/lib/X11/xdm/authdir");
+- do_cmd("ln -sf $o_root/var/lib/xkb $o_root/usr/X11R6/lib/X11/xkb/compiled");
+- do_cmd("ln -sf $o_root/var/lib/xdm $o_root/usr/X11R6/lib/X11/xdm/authdir");
++ do_cmd("cd $o_root && ln -sf /var/lib/xkb usr/X11R6/lib/X11/xkb/compiled");
++ do_cmd("cd $o_root && ln -sf /var/lib/xdm usr/X11R6/lib/X11/xdm/authdir");
+
+ create_compressed();
+ create_isolinux();
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-service.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-service.patch?rev=7873&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-service.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-service.patch Mon Jun 19 17:25:46 2006
@@ -1,0 +1,11 @@
+--- src/rc.sysinit.in 2004-12-23 23:29:46.998370656 +0100
++++ src/rc.sysinit.in 2004-12-23 20:07:34.000000000 +0100
+@@ -219,8 +220,6 @@
+
+ rm -rf /etc/mtab && ln -s /proc/mounts /etc/mtab
+ rm -rf /etc/modules.conf && touch /etc/modules.conf
+- rm -rf /etc/rc.d/rc3.d/S05harddrake
+- rm -rf /etc/rc.d/rc5.d/S05harddrake
+
+ printok
+ set_progress
Added: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7873&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:25:46 2006
@@ -1,0 +1,128 @@
+# $Id: mklivecd.spec.in,v 1.12 2003/10/04 10:03:28 jaco Exp $
+
+%define name mklivecd
+%define version 0.5.9
+%define release 0.10mdk
+
+%define Summary Builds a LiveCD from an existing Mandrakelinux installation
+
+Summary: %{Summary}
+Name: %{name}
+Version: %{version}
+Release: %{release}
+License: GPL
+Group: System/Configuration/Boot and Init
+URL: http://livecd.berlios.de/
+Source0: %{name}-%{version}.tar.bz2
+Patch1: mklivecd-0.5.9-hw.patch.bz2
+Patch2: mklivecd-0.5.9-service.patch.bz2
+Patch3: mklivecd-0.5.9-ln_s.patch.bz2
+Requires: busybox cloop-utils mkisofs drakxtools-newt
+Requires: squashfs-tools mediacheck
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Buildarch: noarch
+
+%description
+%{Summary}
+
+%prep
+%setup -q -n %{name}
+%patch1 -p0 -b .hw
+%patch2 -p0 -b .service
+%patch3 -p0
+
+%build
+%make
+
+%install
+rm -rf %{buildroot}
+# fix cdrom.ko lookup when building with kernel < 2.6.10-1mdk
+perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
+%makeinstall_std
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS CHANGELOG FAQ README* TODO
+%{_sbindir}/mklivecd
+%{_sbindir}/hwdetect
+%{_datadir}/mklivecd/
+
+%changelog
+* Fri Feb 3 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.10mdk
+- rebuilt for Mandriva 2006
+
+* Fri Sep 2 2005 Yoshinori Okuji <yo at nexedi.com> 0.5.9-0.9mdk
+- fix the symbolic links for keyboard configuration
+
+* Tue Mar 22 2005 Nicolas Lécureuil <neoclust at mandrake.org> 0.5.9-0.8mdk
+- rebuild
+
+* Tue Mar 22 2005 Per Øyvind Karlsen <peroyvind at linux-mandrake.com> 0.5.9-0.7mdk
+- update docs
+
+* Tue Mar 22 2005 Per Øyvind Karlsen <peroyvind at linux-mandrake.com> 0.5.9-0.6mdk
+- add another missing dependency; mediacheck
+- update from cvs
+
+* Tue Mar 22 2005 Per Øyvind Karlsen <peroyvind at linux-mandrake.com> 0.5.9-0.5mdk
+- update url
+- add missing dependency on squashfs-tools
+
+* Thu Feb 10 2005 Thierry Vignaud <tvignaud at mandrakesoft.com> 0.5.9-0.4mdk
+- 20050208 CVS snapshot (fix shell)
+
+* Tue Feb 08 2005 Thierry Vignaud <tvignaud at mandrakesoft.com> 0.5.9-0.3mdk
+- 20050208 CVS snapshot (sata update, sync with udev)
+- fix cdrom now build into kernel core
+- rediff patch 1
+- merge patch 3 into patch 1
+
+* Fri Dec 24 2004 Frederic Lepied <flepied at mandrakesoft.com> 0.5.9-0.2mdk
+- fix undefined variable
+
+* Fri Dec 24 2004 Thierry Vignaud <tvignaud at mandrakesoft.com> 0.5.9-0.1mdk
+- CVS snapshot (mdk10.x aware)
+- kill useless patch 0
+- patch 1: preconfigure keyboard, i18n, user, ... so that harddrake is able to
+ autoconfigure everything
+- patch 2: let harddrake service work
+
+* Thu Jun 17 2004 Michael Scherer <misc at mandrake.org> 0.5.6-5mdk
+- fix Summary
+
+* Tue May 04 2004 Thierry Vignaud <tvignaud at mandrakesoft.com> 0.5.6-4mdk
+- patch 0: fix deps killed by latest drakxtools
+
+* Mon Dec 22 2003 Thierry Vignaud <tvignaud at mandrakesoft.com> 0.5.6-3mdk
+- rebuild for new deps
+
+* Wed Dec 03 2003 Per Øyvind Karlsen <peroyvind at linux-mandrake.com> 0.5.6-2mdk
+- spec fixes
+- fix unowned dir
+
+* Mon Oct 6 2003 Jaco Greeff <jaco at linuxminicd.org> 0.5.6-1mdk
+- version 0.5.6
+- spec fixes by Buchan Milne <bgmilne at cae.co.za>
+
+* Sat Sep 27 2003 Tibor Pittich <Tibor.Pittich at phuture.sk> 0.5.5-2mdk
+- rebuild
+
+* Thu Sep 25 2003 Jaco Greeff <jaco at linuxminicd.org> 0.5.5-1mdk
+- version 0.5.5
+
+* Wed Sep 24 2003 Tibor Pittich <Tibor.Pittich at phuture.sk> 0.5.4-2mdk
+- spec fixes
+
+* Tue Sep 23 2003 Jaco Greeff <jaco at linuxminicd.org> 0.5.4-1mdk
+- version 0.5.4
+- removed patch0, fixed upstream
+
+* Mon Sep 22 2003 Tibor Pittich <Tibor.Pittich at phuture.sk> 0.5.3-1mdk
+- initial import into contrib, based on spec file from Jaco Greeff
+- fixed requires (mkisofs)
+- temporary locale fix to correct calculate initrd size
+- correct mdk group name
+- some macroszification
More information about the Erp5-report
mailing list