SOURCES: linux-live-modprobe.patch, linux-live-modules.patch - mov...
glen
glen at pld-linux.org
Fri Oct 13 16:57:04 CEST 2006
Author: glen Date: Fri Oct 13 14:57:04 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- moved initrd_create patching to single file
---- Files affected:
SOURCES:
linux-live-modprobe.patch (1.2 -> 1.3) , linux-live-modules.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/linux-live-modprobe.patch
diff -u SOURCES/linux-live-modprobe.patch:1.2 SOURCES/linux-live-modprobe.patch:1.3
--- SOURCES/linux-live-modprobe.patch:1.2 Fri Oct 13 16:54:58 2006
+++ SOURCES/linux-live-modprobe.patch Fri Oct 13 16:56:59 2006
@@ -32,6 +32,121 @@
LMK="lib/modules/$KERNEL"
+--- linux-live-5.5.0/initrd/initrd_create 2006-09-29 19:07:20.000000000 +0300
++++ linux-live-5.5.0/initrd/initrd_create 2006-10-13 14:38:45.000000000 +0300
+@@ -8,6 +8,7 @@
+ # rcopy is a recursive cp, which copies also symlink's real source
+ # $1 = source (may be a regular file or symlink)
+ # $2 = target PARENT
++# $3 = optional PREFIX to strip from $1
+ #
+ rcopy()
+ {
+@@ -16,7 +17,11 @@
+ cp --parent -R "$REALPATH" "$2"
+ ln -sf "$REALPATH" "$2/$1"
+ else
+- cp --parent -R "$1" "$2"
++ if [ "$3" ]; then
++ tar ${3:+-C "$3"} -cf - "${1#$3/}" | tar -C "$2" -xf -
++ else
++ cp --parent -R "$1" "$2"
++ fi
+ fi
+ if [ "$?" -ne 0 ]; then
+ echo "---------------------------"
+@@ -31,11 +36,12 @@
+ # copy file/dir only if it exists, else skip with no error
+ # $1 = source (may not exist)
+ # $2 = target PARENT
++# $3 = optional PREFIX to strip from $1
+ #
+ rcopy_ex()
+ {
+ if [ -a "$1" ]; then
+- rcopy "$1" "$2"
++ rcopy "$1" "$2" "$3"
+ fi
+ }
+
+@@ -130,34 +136,60 @@
+
+ #necessary modules and dependency files
+ mkdir -p $INITRD_TREE/$LMK/kernel/fs
+-cp kernel-modules/$KERNEL/unionfs.ko* $INITRD_TREE/$LMK/kernel/fs
+-cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
++#cp kernel-modules/$KERNEL/*.ko* $INITRD_TREE/$LMK/kernel/fs
++#cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
++#cp kernel-modules/$KERNEL/zlib_inflate.ko* $INITRD_TREE/$LMK/kernel/fs
+
++(
+ #copy filesystem modules, if not directly copied into kernel
+-rcopy_ex /$LMK/kernel/lib/zlib_inflate $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/lib/zlib_deflate $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/drivers/block/loop* $INITRD_TREE 2>>$DEBUG
+-
+-rcopy_ex /$LMK/kernel/fs/isofs $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/fs/fat $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/fs/vfat $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/fs/ntfs $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/fs/ext3 $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/fs/reiserfs $INITRD_TREE 2>>$DEBUG
++rcopy $ROOT/$LMK/kernel/lib/zlib_inflate $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/lib/zlib_deflate $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/block/loop.ko* $INITRD_TREE $ROOT
++
++rcopy_ex $ROOT/$LMK/kernel/fs/isofs $INITRD_TREE $ROOT
++rcopy_ex $ROOT/$LMK/kernel/fs/isofs.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/fat $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/vfat $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/ntfs $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/ext3 $INITRD_TREE $ROOT
++#rcopy $ROOT/$LMK/kernel/fs/xfs $INITRD_TREE $ROOT # causes weird issues
++rcopy $ROOT/$LMK/kernel/fs/exportfs $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/reiserfs $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/jbd/jbd.ko* $INITRD_TREE $ROOT
+
+ # add language support for filesystems
+-rcopy_ex /$LMK/kernel/fs/nls/ $INITRD_TREE 2>>$DEBUG
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_cp437.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-1.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-2.ko* $INITRD_TREE $ROOT
+
+ #usb modules
+-rcopy_ex /$LMK/kernel/drivers/usb/storage $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/drivers/usb/host/ehci-hcd* $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/drivers/usb/host/ohci-hcd* $INITRD_TREE 2>>$DEBUG
+-rcopy_ex /$LMK/kernel/drivers/usb/host/uhci-hcd* $INITRD_TREE 2>>$DEBUG
++rcopy $ROOT/$LMK/kernel/drivers/usb/core/usbcore.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/input/usbhid.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/storage $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/host/ehci-hcd.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/host/ohci-hcd.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/host/uhci-hcd.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/usb/storage/libusual.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/scsi/scsi_mod.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/scsi/sr_mod.ko* $INITRD_TREE $ROOT
++
++rcopy $ROOT/$LMK/kernel/drivers/cdrom/cdrom.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/ide/ide-cd.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/ide/ide-core.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/ide/pci/piix.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/scsi/ata_piix.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/drivers/scsi/libata.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/isofs/isofs $INITRD_TREE $ROOT
++rcopy_ex $ROOT/$LMK/kernel/fs/squashfs.ko* $INITRD_TREE $ROOT
++rcopy_ex $ROOT/$LMK/kernel/fs/squashfs $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/unionfs.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/unionfs/unionfs $INITRD_TREE $ROOT
+
+ #disk (scsi, ide, raid, pcmcia) modules
+ #rcopy_ex /$LMK/kernel/drivers/scsi $INITRD_TREE
+ #rcopy_ex /$LMK/kernel/drivers/ide $INITRD_TREE
+ #rcopy_ex /$LMK/kernel/drivers/pcmcia $INITRD_TREE
++) 2>>$DEBUG
+
+ if [ "$COMPRESS" = 1 ]; then
+ debug "gzipping kernel modules"
--- _broken-linux-live-5.5.0/initrd/linuxrc 2006-09-26 18:37:04.000000000 +0300
+++ linux-live-5.5.0/initrd/linuxrc 2006-09-28 01:19:28.000000000 +0300
@@ -157,5 +157,8 @@
================================================================
Index: SOURCES/linux-live-modules.patch
diff -u SOURCES/linux-live-modules.patch:1.2 SOURCES/linux-live-modules.patch:1.3
--- SOURCES/linux-live-modules.patch:1.2 Fri Oct 13 14:04:56 2006
+++ SOURCES/linux-live-modules.patch Fri Oct 13 16:56:59 2006
@@ -28,121 +28,6 @@
fi
# list of directories which will be modularized
---- linux-live-5.5.0/initrd/initrd_create 2006-09-29 19:07:20.000000000 +0300
-+++ linux-live-5.5.0/initrd/initrd_create 2006-10-13 14:38:45.000000000 +0300
-@@ -8,6 +8,7 @@
- # rcopy is a recursive cp, which copies also symlink's real source
- # $1 = source (may be a regular file or symlink)
- # $2 = target PARENT
-+# $3 = optional PREFIX to strip from $1
- #
- rcopy()
- {
-@@ -16,7 +17,11 @@
- cp --parent -R "$REALPATH" "$2"
- ln -sf "$REALPATH" "$2/$1"
- else
-- cp --parent -R "$1" "$2"
-+ if [ "$3" ]; then
-+ tar ${3:+-C "$3"} -cf - "${1#$3/}" | tar -C "$2" -xf -
-+ else
-+ cp --parent -R "$1" "$2"
-+ fi
- fi
- if [ "$?" -ne 0 ]; then
- echo "---------------------------"
-@@ -31,11 +36,12 @@
- # copy file/dir only if it exists, else skip with no error
- # $1 = source (may not exist)
- # $2 = target PARENT
-+# $3 = optional PREFIX to strip from $1
- #
- rcopy_ex()
- {
- if [ -a "$1" ]; then
-- rcopy "$1" "$2"
-+ rcopy "$1" "$2" "$3"
- fi
- }
-
-@@ -130,34 +136,60 @@
-
- #necessary modules and dependency files
- mkdir -p $INITRD_TREE/$LMK/kernel/fs
--cp kernel-modules/$KERNEL/unionfs.ko* $INITRD_TREE/$LMK/kernel/fs
--cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/*.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/zlib_inflate.ko* $INITRD_TREE/$LMK/kernel/fs
-
-+(
- #copy filesystem modules, if not directly copied into kernel
--rcopy_ex /$LMK/kernel/lib/zlib_inflate $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/lib/zlib_deflate $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/drivers/block/loop* $INITRD_TREE 2>>$DEBUG
--
--rcopy_ex /$LMK/kernel/fs/isofs $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/fs/fat $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/fs/vfat $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/fs/ntfs $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/fs/ext3 $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/fs/reiserfs $INITRD_TREE 2>>$DEBUG
-+rcopy $ROOT/$LMK/kernel/lib/zlib_inflate $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/lib/zlib_deflate $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/block/loop.ko* $INITRD_TREE $ROOT
-+
-+rcopy_ex $ROOT/$LMK/kernel/fs/isofs $INITRD_TREE $ROOT
-+rcopy_ex $ROOT/$LMK/kernel/fs/isofs.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/fat $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/vfat $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/ntfs $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/ext3 $INITRD_TREE $ROOT
-+#rcopy $ROOT/$LMK/kernel/fs/xfs $INITRD_TREE $ROOT # causes weird issues
-+rcopy $ROOT/$LMK/kernel/fs/exportfs $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/reiserfs $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/jbd/jbd.ko* $INITRD_TREE $ROOT
-
- # add language support for filesystems
--rcopy_ex /$LMK/kernel/fs/nls/ $INITRD_TREE 2>>$DEBUG
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_cp437.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-1.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-2.ko* $INITRD_TREE $ROOT
-
- #usb modules
--rcopy_ex /$LMK/kernel/drivers/usb/storage $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/drivers/usb/host/ehci-hcd* $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/drivers/usb/host/ohci-hcd* $INITRD_TREE 2>>$DEBUG
--rcopy_ex /$LMK/kernel/drivers/usb/host/uhci-hcd* $INITRD_TREE 2>>$DEBUG
-+rcopy $ROOT/$LMK/kernel/drivers/usb/core/usbcore.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/input/usbhid.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/storage $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/host/ehci-hcd.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/host/ohci-hcd.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/host/uhci-hcd.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/usb/storage/libusual.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/scsi/scsi_mod.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/scsi/sr_mod.ko* $INITRD_TREE $ROOT
-+
-+rcopy $ROOT/$LMK/kernel/drivers/cdrom/cdrom.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/ide/ide-cd.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/ide/ide-core.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/ide/pci/piix.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/scsi/ata_piix.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/drivers/scsi/libata.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/isofs/isofs $INITRD_TREE $ROOT
-+rcopy_ex $ROOT/$LMK/kernel/fs/squashfs.ko* $INITRD_TREE $ROOT
-+rcopy_ex $ROOT/$LMK/kernel/fs/squashfs $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/unionfs.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/unionfs/unionfs $INITRD_TREE $ROOT
-
- #disk (scsi, ide, raid, pcmcia) modules
- #rcopy_ex /$LMK/kernel/drivers/scsi $INITRD_TREE
- #rcopy_ex /$LMK/kernel/drivers/ide $INITRD_TREE
- #rcopy_ex /$LMK/kernel/drivers/pcmcia $INITRD_TREE
-+) 2>>$DEBUG
-
- if [ "$COMPRESS" = 1 ]; then
- debug "gzipping kernel modules"
--- linux-live-5.5.0/initrd/linuxrc 2006-10-02 20:19:58.000000000 +0300
+++ linux-live-5.5.0/initrd/linuxrc 2006-09-28 01:19:28.000000000 +0300
@@ -185,6 +185,9 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-live-modprobe.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/linux-live-modules.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list