[Erp5-report] r7875 - /spec/mandriva/2006.0/mklivecd/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 19 17:26:02 CEST 2006
Author: kevin
Date: Mon Jun 19 17:25:59 2006
New Revision: 7875
URL: http://svn.erp5.org?rev=7875&view=rev
Log:
Commit mklivecd-0.5.9-0.13mdk spec files and patches
Added:
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-fix-xkb_n_xdm.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-more-sata.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-no-more-hotplug.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-mode.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-umount.patch
spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-splash.patch
Modified:
spec/mandriva/2006.0/mklivecd/mklivecd.spec
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-fix-xkb_n_xdm.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-fix-xkb_n_xdm.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-fix-xkb_n_xdm.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-fix-xkb_n_xdm.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,14 @@
+--- ./src/mklivecd.in.tv 2005-09-21 13:49:17.000000000 +0200
++++ ./src/mklivecd.in 2005-09-21 13:49:26.000000000 +0200
+@@ -1050,11 +1050,6 @@
+ Xconfig::various::runlevel(5);
+ }
+
+- 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");
+-
+ create_compressed();
+ create_isolinux();
+ create_finaliso();
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,11 @@
+--- ./src/rc.sysinit.in.tv2 2005-09-20 23:04:34.000000000 +0200
++++ ./src/rc.sysinit.in 2005-09-20 23:04:07.000000000 +0200
+@@ -321,7 +321,7 @@
+ case $d in
+ tmp*)
+ ;;
+- lib/rpm*|lib/nxserver/nxhome*|lib/urpmi*|lib/samba*|lib/gnome*|lib/mysql*)
++ lib/menu*|lib/rpm*|lib/nxserver/nxhome*|lib/urpmi*|lib/samba*|lib/gnome*|lib/mysql*)
+ [ ! -e "/var/$d" ] && ln -sf "$MNTLIVECD/var/$d" "/var/$d" || true
+ ;;
+ cache*|db*|lib*|local*|lock*|log*|mail*|mtink*|nis*|opt*|preserve*|run*|spool*|xkb*|yp*)
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-more-sata.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-more-sata.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-more-sata.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-more-sata.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,62 @@
+--- mklivecd/src/hwdetect.in.more-sata 2005-03-03 17:34:27.000000000 +0100
++++ mklivecd/src/hwdetect.in 2005-09-23 16:20:44.000000000 +0200
+@@ -559,6 +559,7 @@
+ return
+ }
+ my @satalist = qw(libata ata_piix sg
++ ahci ata_adma pata_pdc2027x sata_mv sata_qstor sata_sil24 sata_sis sata_sx4 sata_uli sx8
+ sata_nv sata_promise sata_sil sata_svw sata_via sata_vsc);
+
+ # my @satalist = qw(libata sd_mod ata_piix scsi_mod sr_mod sg a100u2w
+--- mklivecd/Modules.mk.more-sata 2005-03-18 20:10:03.000000000 +0100
++++ mklivecd/Modules.mk 2005-09-23 16:35:40.000000000 +0200
+@@ -108,11 +108,11 @@
+ # drivers/scsi/aha1740
+ DEF_SCSI_MODULES_PATH_26=\
+ drivers/scsi/3w-xxxx \
+-# drivers/scsi/advansys \
+ drivers/scsi/aha1542 \
++ drivers/scsi/ahci \
+ drivers/scsi/aic7xxx/aic7xxx \
++ drivers/scsi/ata_piix \
+ drivers/scsi/BusLogic \
+-# drivers/scsi/cpqfc \
+ drivers/scsi/dmx3191d \
+ drivers/scsi/dtc \
+ drivers/scsi/eata \
+@@ -125,7 +125,16 @@
+ drivers/scsi/psi240i \
+ drivers/scsi/qlogicfas \
+ drivers/scsi/qlogicfc \
+- drivers/scsi/qlogicisp \
++ drivers/scsi/sata_nv \
++ drivers/scsi/sata_promise \
++ drivers/scsi/sata_qstor \
++ drivers/scsi/sata_sil \
++ drivers/scsi/sata_sis \
++ drivers/scsi/sata_svw \
++ drivers/scsi/sata_sx4 \
++ drivers/scsi/sata_uli \
++ drivers/scsi/sata_via \
++ drivers/scsi/sata_vsc \
+ drivers/scsi/sym53c416 \
+ drivers/scsi/t128 \
+ drivers/scsi/tmscsim \
+@@ -133,6 +142,9 @@
+ drivers/scsi/ultrastor \
+ drivers/scsi/wd7000 \
+ drivers/message/fusion/mptscsih
++# drivers/scsi/advansys \
++# drivers/scsi/cpqfc \
++# drivers/scsi/qlogicisp \
+
+ # depending on kernel version, these have different names
+ DEF_SCSI_MODULES_OPT_PATH_24=\
+@@ -152,6 +164,7 @@
+
+ DEF_SCSI_MODULES_DEP_PATH_26=\
+ drivers/scsi/scsi_mod \
++ drivers/scsi/libata \
+ drivers/scsi/sr_mod \
+ drivers/scsi/sd_mod \
+ drivers/message/fusion/mptbase
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-no-more-hotplug.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-no-more-hotplug.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-no-more-hotplug.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-no-more-hotplug.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,11 @@
+--- ./src/mklivecd.in.tv 2005-09-09 17:52:26.000000000 +0200
++++ ./src/mklivecd.in 2005-09-09 17:52:33.000000000 +0200
+@@ -663,8 +663,6 @@
+
+ do_cmd("cp -a $o_root/etc/udev $dir/etc", ++$pos);
+ do_cmd("cp -a $o_root/etc/dev.d $dir/etc", ++$pos);
+- do_cmd("cp -a $o_root/etc/hotplug $dir/etc", ++$pos);
+- do_cmd("cp -a $o_root/etc/hotplug.d $dir/etc", ++$pos);
+ do_cmd("cp -a $o_root/etc/sysconfig $dir/etc", ++$pos);
+
+ do_cmd("mknod $dir/dev/initrd b 1 250", ++$pos);
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-mode.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-mode.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-mode.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-mode.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,8 @@
+--- ./src/mklivecd.in.tv 2005-09-21 00:02:59.000000000 +0200
++++ ./src/mklivecd.in 2005-09-21 00:03:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/perl
+ #
+ # LiveCD iso build script
+ #
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-umount.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-umount.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-umount.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-quiet-umount.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,13 @@
+--- mklivecd/src/rc.sysinit.in.umount 2005-09-23 20:07:02.000000000 +0200
++++ mklivecd/src/rc.sysinit.in 2005-09-23 20:08:18.000000000 +0200
+@@ -462,8 +462,8 @@
+ "umount /sys"
+
+ # clean up /proc (init mounts it via rc.sysinit)
+- docmd " Unmounting /proc filesystem" \
+- "umount /proc"
++ # docmd " Unmounting /proc filesystem" \
++ # "umount /proc"
+
+ # display some info
+ distro=`/bin/cat /etc/redhat-release | awk '{ print $1 }'`
Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-splash.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-splash.patch?rev=7875&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-splash.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-splash.patch Mon Jun 19 17:25:59 2006
@@ -1,0 +1,55 @@
+--- mklivecd/src/mklivecd.in.splash 2005-09-23 15:12:14.000000000 +0200
++++ mklivecd/src/mklivecd.in 2005-09-23 15:14:57.000000000 +0200
+@@ -81,7 +81,7 @@
+ my $o_keyboard = '@DEF_KEYBOARD@';
+ my $o_resolution = '@DEF_RESOLUTION@';
+ my $o_vgamode = '@DEF_VGAMODE@';
+-my $o_splash = "yes";
++my $o_splash = "silent";
+ my $o_kernel = get_exec("uname -r");
+ my $o_timeout = 150;
+ my %opts = ( # these are all the options with defaults
+@@ -183,7 +183,7 @@
+ --resolution <res> Specify the resolution for the framebuffer
+ output device. (Either resolution or normal)
+ (default: $o_resolution)
+- --splash <yes|no> Create the LiveCD with bootsplash support if
++ --splash <silent|verbose|no> Create the LiveCD with bootsplash support if
+ available on the root filesystem.
+ (default: $o_splash)
+ --fstab <options> Override the default options for the fstab on
+@@ -211,7 +211,7 @@
+
+ Examples:
+ $0 --nodir ^/usr/src/RPM,^/root/tmp livecd.iso
+- $0 --blocksize 224 --bootopt splash=silent livecd.iso
++ $0 --blocksize 224 --splash=silent livecd.iso
+
+ ";
+ exit(1);
+@@ -437,7 +437,7 @@
+ #print STDERR "\nWARNING: Sort option ignored for 'sqfs' (squashfs) looptype" if (defined($opts{sort}) && ($o_looptype =~ /sqfs/));
+ die_("\nFATAL: Kernel (--kernel) '".$o_kernel."' not installed on the root image. (Directory '".$o_root."/lib/modules/".$o_kernel."' does not exist.)\n") if (!(-d $o_root."/lib/modules/".$o_kernel));
+ die_("\nFATAL: Extra ISO directory (--isoextrafiles) '".$opts{isoextrafiles}."' does not exist\n") if (defined($opts{isoextrafiles}) && !(-d $opts{isoextrafiles}));
+- die_("\nFATAL: Unknown splash (--splash) option '$o_splash'\n") unless ($o_splash =~ /yes|no/);
++ die_("\nFATAL: Unknown splash (--splash) option '$o_splash'\n") unless ($o_splash =~ /silent|verbose|no/);
+ die_("\nFATAL: Work directory (--workdir) '".$opts{workdir}."' does not exist\n") if (defined($
+ opts{workdir}) && !(-d $opts{workdir}));
+
+@@ -740,7 +740,7 @@
+ do_cmd("(cd $workdir/livecd/isolinux ; gzip -9 initrd)", ++$pos);
+
+ # make splash
+- if ($o_splash =~ m/yes/) {
++ if ($o_splash !~ m/no/) {
+ do_cmd("mv -f $initrd.gz $o_root/tmp ; \
+ chroot $o_root /usr/share/bootsplash/scripts/make-boot-splash /tmp/initrd.gz $o_resolution; \
+ mv -f $o_root/tmp/initrd.gz $workdir/livecd/isolinux", ++$pos);
+@@ -875,6 +875,7 @@
+ } else {
+ $appopt = "initrd=initrd.gz root=/dev/rd/3 devfs=mount vga=$o_vgamode keyb=$o_keyboard";
+ }
++ $appopt .= " splash=$o_splash" if ($o_splash !~ m/no/);
+ $appopt = "$appopt fastboot=yes automatic=method:cdrom ramdisk_size=32000" if (!defined($kernel26));
+ $appopt = "$appopt fstab=".$opts{fstab} if (defined($opts{fstab}));
+ $appopt = "$appopt home=usb" if (defined($opts{usbhome}));
Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7875&r1=7874&r2=7875&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:25:59 2006
@@ -2,7 +2,7 @@
%define name mklivecd
%define version 0.5.9
-%define release %mkrel 0.12
+%define release %mkrel 0.13
%define Summary Builds a LiveCD from an existing Mandriva Linux installation
@@ -16,7 +16,13 @@
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
+Patch3: mklivecd-0.5.9-no-more-hotplug.patch.bz2
+Patch4: mklivecd-0.5.9-quiet-umount.patch.bz2
+Patch5: mklivecd-0.5.9-keep-menu.patch.bz2
+Patch6: mklivecd-0.5.9-more-sata.patch.bz2
+Patch7: mklivecd-0.5.9-quiet-mode.patch.bz2
+Patch8: mklivecd-0.5.9-fix-xkb_n_xdm.patch.bz2
+Patch9: mklivecd-0.5.9-splash.patch.bz2
Requires: busybox cloop-utils mkisofs drakxtools-newt
Requires: squashfs-tools mediacheck syslinux zisofs-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -29,7 +35,13 @@
%setup -q -n %{name}
%patch1 -p0 -b .hw
%patch2 -p0 -b .service
-%patch3 -p0
+%patch3 -p0 -b .hotplug
+%patch4 -p1 -b .umount
+%patch5 -p0 -b .menu
+%patch6 -p1 -b .more-sata
+%patch7 -p0 -b .quiet
+%patch8 -p0 -b .fix_xorg
+%patch9 -p1 -b .splash
%build
# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
@@ -40,7 +52,6 @@
# fix cdrom.ko lookup when building with kernel < 2.6.10-1mdk
perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
%makeinstall_std
-rm -f $RPM_BUILD_ROOT%{_sbindir}/hwdetect
%clean
rm -rf %{buildroot}
@@ -49,9 +60,14 @@
%defattr(-,root,root)
%doc AUTHORS CHANGELOG FAQ README* TODO
%{_sbindir}/mklivecd
+%{_sbindir}/hwdetect
%{_datadir}/mklivecd/
%changelog
+* Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.13mdk
+- applying the patchs again
+- ship with hwdetect again to get usb mice to work
+
* Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.12mdk
- remove patchs added after v0.5.9-0.9mdk (was too buggy)
- recompiled for Mandriva 2006
More information about the Erp5-report
mailing list