SVN: geninitrd/trunk: Makefile TODO geninitrd

[arekm]

Author: arekm
Date: Sat Jul  5 12:45:47 2008
New Revision: 9836

Modified:
   geninitrd/trunk/Makefile
   geninitrd/trunk/TODO
   geninitrd/trunk/geninitrd
Log:
9000.13; firmware in subdir support, DESTDIR fix.

Modified: geninitrd/trunk/Makefile
==============================================================================
--- geninitrd/trunk/Makefile    (original)
+++ geninitrd/trunk/Makefile    Sat Jul  5 12:45:47 2008
@@ -1,4 +1,4 @@
-VERSION                := 9000.12
+VERSION                := 9000.13
 FILES          := Makefile geninitrd.sysconfig geninitrd functions geninitrd.8 
geninitrd.8.xml ChangeLog
 prefix         := /usr
 mandir         := $(prefix)/share/man

Modified: geninitrd/trunk/TODO
==============================================================================
--- geninitrd/trunk/TODO        (original)
+++ geninitrd/trunk/TODO        Sat Jul  5 12:45:47 2008
@@ -1,4 +1,3 @@
-- firmware files located in subdirectiories (like 
/lib/firmware/tigeon/tg3something)
 - add support for loading SELinux policy  
 - add support to AMI RAID
 - use System.map to determine compiled fs support

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Sat Jul  5 12:45:47 2008
@@ -965,7 +965,9 @@
                                warn "firmware file /lib/firmware/$firmware 
doesn't exist. Skipping."
                        fi
                else
-                       inst /lib/firmware/$firmware /lib/firmware/$firmware
+                       FIRMWAREDIR=${firmware%/*}
+                       [ "$FIRMWAREDIR" != "$firmware" ] && inst_d 
$DESTDIR/lib/firmware/$FIRMWAREDIR
+                       inst /lib/firmware/$firmware 
$DESTDIR/lib/firmware/$firmware
                fi
        done
 
@@ -979,7 +981,7 @@
 
        for mod in $modules; do
                MODULEDIR=${mod%/*}
-               inst_d "/lib/modules/$kernel/$MODULEDIR"
+               inst_d "$DESTDIR/lib/modules/$kernel/$MODULEDIR"
                cp -a "/lib/modules/$kernel/$mod" 
"$DESTDIR/lib/modules/$kernel/$mod"
                gunzip "$DESTDIR/lib/modules/$kernel/$mod" 2> /dev/null
        done
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit