SOURCES: linux-live-package.patch - simplify patch

tommat tommat at pld-linux.org
Sat Nov 8 15:52:01 CET 2008 

Author: tommat                       Date: Sat Nov  8 14:52:01 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- simplify patch

---- Files affected:
SOURCES:
   linux-live-package.patch (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SOURCES/linux-live-package.patch
diff -u SOURCES/linux-live-package.patch:1.17 SOURCES/linux-live-package.patch:1.18
--- SOURCES/linux-live-package.patch:1.17	Sat Nov  8 15:44:06 2008
+++ SOURCES/linux-live-package.patch	Sat Nov  8 15:51:55 2008
@@ -1,6 +1,6 @@
 diff -Nur linux-live-6.2.4.orig/build linux-live-6.2.4/build
 --- linux-live-6.2.4.orig/build	2008-02-14 11:52:22.000000000 +0100
-+++ linux-live-6.2.4/build	2008-10-22 00:01:37.000000000 +0200
++++ linux-live-6.2.4/build	2008-11-08 15:45:52.000000000 +0100
 @@ -10,8 +10,11 @@
  echo "Changing current directory to $CHANGEDIR"
  cd $CHANGEDIR
@@ -86,7 +86,7 @@
 +fi
 diff -Nur linux-live-6.2.4.orig/cd-root/boot/dos/config linux-live-6.2.4/cd-root/boot/dos/config
 --- linux-live-6.2.4.orig/cd-root/boot/dos/config	2007-08-08 19:32:48.000000000 +0200
-+++ linux-live-6.2.4/cd-root/boot/dos/config	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/cd-root/boot/dos/config	2008-11-08 15:45:52.000000000 +0100
 @@ -6,7 +6,7 @@
  init=linuxrc             # start /linuxrc script from initrd.gz image
  load_ramdisk=1           # 
@@ -98,7 +98,7 @@
  
 diff -Nur linux-live-6.2.4.orig/cd-root/boot/isolinux/isolinux.cfg linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg
 --- linux-live-6.2.4.orig/cd-root/boot/isolinux/isolinux.cfg	2007-08-08 19:32:53.000000000 +0200
-+++ linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg	2008-11-08 15:45:52.000000000 +0100
 @@ -5,7 +5,7 @@
  LABEL linux
  MENU LABEL Run linux
@@ -110,7 +110,7 @@
  MENU LABEL Run Memtest utility
 diff -Nur linux-live-6.2.4.orig/cd-root/boot/syslinux/syslinux.cfg linux-live-6.2.4/cd-root/boot/syslinux/syslinux.cfg
 --- linux-live-6.2.4.orig/cd-root/boot/syslinux/syslinux.cfg	2007-08-08 19:32:45.000000000 +0200
-+++ linux-live-6.2.4/cd-root/boot/syslinux/syslinux.cfg	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/cd-root/boot/syslinux/syslinux.cfg	2008-11-08 15:45:52.000000000 +0100
 @@ -5,7 +5,7 @@
  LABEL linux
  MENU LABEL Run linux
@@ -122,7 +122,7 @@
  MENU LABEL Run Memtest utility
 diff -Nur linux-live-6.2.4.orig/cd-root/linux/make_iso.sh linux-live-6.2.4/cd-root/linux/make_iso.sh
 --- linux-live-6.2.4.orig/cd-root/linux/make_iso.sh	2008-03-13 10:36:20.000000000 +0100
-+++ linux-live-6.2.4/cd-root/linux/make_iso.sh	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/cd-root/linux/make_iso.sh	2008-11-08 15:45:52.000000000 +0100
 @@ -12,10 +12,16 @@
    exit
  fi
@@ -150,7 +150,7 @@
 +-b boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot "$DIR"
 diff -Nur linux-live-6.2.4.orig/.config linux-live-6.2.4/.config
 --- linux-live-6.2.4.orig/.config	2008-03-13 10:41:55.000000000 +0100
-+++ linux-live-6.2.4/.config	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/.config	2008-11-08 15:45:52.000000000 +0100
 @@ -6,16 +6,12 @@
  # Live CD Name. Defaults to 'mylinux'; you should change it to your own
  # name if you wish your own branding. Eg. Slax changes it to 'slax'
@@ -196,7 +196,7 @@
  # If only one locale is specified, you don't have to specify boot parameter.
 diff -Nur linux-live-6.2.4.orig/initrd/initrd_create linux-live-6.2.4/initrd/initrd_create
 --- linux-live-6.2.4.orig/initrd/initrd_create	2008-01-17 16:21:20.000000000 +0100
-+++ linux-live-6.2.4/initrd/initrd_create	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/initrd/initrd_create	2008-11-08 15:45:52.000000000 +0100
 @@ -3,7 +3,10 @@
  #
  # Author:	  Tomas M. <http://www.linux-live.org>
@@ -277,8 +277,12 @@
  rcopy_ex $ROOT/$LMK/kernel/fs/ext3 $INITRD_TREE 2>>$DEBUG
  rcopy_ex $ROOT/$LMK/kernel/fs/reiserfs $INITRD_TREE 2>>$DEBUG
  rcopy_ex $ROOT/$LMK/kernel/fs/xfs $INITRD_TREE 2>>$DEBUG
-@@ -164,8 +168,11 @@
+@@ -162,10 +166,15 @@
+ rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/ehci-hcd.* $INITRD_TREE 2>>$DEBUG
+ rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/ohci-hcd.* $INITRD_TREE 2>>$DEBUG
  rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/uhci-hcd.* $INITRD_TREE 2>>$DEBUG
++rcopy_ex $ROOT/$LMK/kernel/drivers/usb/core $INITRD_TREE 2>>$DEBUG
++rcopy_ex $ROOT/$LMK/kernel/drivers/hid $INITRD_TREE 2>>$DEBUG
  
  # pci modules
 +rcopy_ex $ROOT/$LMK/kernel/drivers/scsi $INITRD_TREE 2>>$DEBUG
@@ -289,7 +293,7 @@
  
  # pcmcia modules
  rcopy_ex $ROOT/$LMK/kernel/drivers/pcmcia/pcmcia_core.* $INITRD_TREE 2>>$DEBUG
-@@ -190,44 +197,30 @@
+@@ -190,44 +199,30 @@
  chmod ago-x $INITRD_TREE/usr.lzm
  rm -Rf $INITRD_TREE/usr/*
  
@@ -343,7 +347,7 @@
  rm -Rf $INITRD_TREE
 diff -Nur linux-live-6.2.4.orig/initrd/linuxrc linux-live-6.2.4/initrd/linuxrc
 --- linux-live-6.2.4.orig/initrd/linuxrc	2008-03-13 10:37:28.000000000 +0100
-+++ linux-live-6.2.4/initrd/linuxrc	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/initrd/linuxrc	2008-11-08 15:45:52.000000000 +0100
 @@ -250,18 +250,9 @@
  
  mount -n -o remount,ro aufs .
@@ -368,7 +372,7 @@
  fatal "You are not supposed to be here, something went wrong!"
 diff -Nur linux-live-6.2.4.orig/install linux-live-6.2.4/install
 --- linux-live-6.2.4.orig/install	2007-05-14 18:50:44.000000000 +0200
-+++ linux-live-6.2.4/install	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/install	2008-11-08 15:45:52.000000000 +0100
 @@ -15,18 +15,10 @@
  if [ "$N" = "build" ]; then
     N=install
@@ -394,7 +398,7 @@
 -echo "Linux Live scripts were $N""ed successfuly in $1/"
 diff -Nur linux-live-6.2.4.orig/tools/liblinuxlive linux-live-6.2.4/tools/liblinuxlive
 --- linux-live-6.2.4.orig/tools/liblinuxlive	2008-03-13 11:52:36.000000000 +0100
-+++ linux-live-6.2.4/tools/liblinuxlive	2008-10-22 00:00:27.000000000 +0200
++++ linux-live-6.2.4/tools/liblinuxlive	2008-11-08 15:45:52.000000000 +0100
 @@ -404,7 +404,7 @@
  {
     debug_log "create_module" "$*"
@@ -481,22 +485,7 @@
  }
  
  # Load drivers for PCMCIA CardBus devices
-diff -Nur linux-live-6.2.4.orig/initrd/initrd_create linux-live-6.2.4/initrd/initrd_create
---- linux-live-6.2.4.orig/initrd/initrd_create	2008-11-08 09:24:23.000000000 +0100
-+++ linux-live-6.2.4/initrd/initrd_create	2008-11-08 14:21:34.000000000 +0100
-@@ -166,6 +166,8 @@
- rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/ehci-hcd.* $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/ohci-hcd.* $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/drivers/usb/host/uhci-hcd.* $INITRD_TREE 2>>$DEBUG
-+rcopy_ex $ROOT/$LMK/kernel/drivers/usb/core $INITRD_TREE 2>>$DEBUG
-+rcopy_ex $ROOT/$LMK/kernel/drivers/hid $INITRD_TREE 2>>$DEBUG
- 
- # pci modules
- rcopy_ex $ROOT/$LMK/kernel/drivers/scsi $INITRD_TREE 2>>$DEBUG
-diff -Nur linux-live-6.2.4.orig/tools/liblinuxlive linux-live-6.2.4/tools/liblinuxlive
---- linux-live-6.2.4.orig/tools/liblinuxlive	2008-11-08 09:24:23.000000000 +0100
-+++ linux-live-6.2.4/tools/liblinuxlive	2008-11-08 15:42:06.000000000 +0100
-@@ -854,9 +854,11 @@
+@@ -808,9 +854,11 @@
  rmmod_unused_modules()
  {
     debug_log "rmmod_unused_modules" "$*"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-live-package.patch?r1=1.17&r2=1.18&f=u

More information about the pld-cvs-commit mailing list