Fix #76082, #86487, #87673, #95993.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@220 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/linuxrc b/generic/linuxrc
index b038066abb2e15de1b921a637a117c1027bcfecb..8127b1f39b23e78bc44a69425843497cfaceebc2 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -151,6 +151,10 @@ then
       eval DO_`echo $modules | sed 's/-//'`=1
     done
 else
+    for modules in $MY_HWOPTS
+    do
+      eval DO_`echo $modules | sed 's/-//'`=1
+    done
     good_msg 'Skipping module load; no modules in the initrd!'
 fi
 

diff --git a/genkernel b/genkernel
index bbbb3b3033f13660985dc82da16516c1449b2942..6f6fe487fbce73991a61de56896b8c2aaf131339 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.2.0_pre9'
+GK_V='3.2.0_pre10'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
@@ -65,6 +65,14 @@ get_official_arch
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
 source ${GK_SHARE}/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/${ARCH}/modules_load"
 
+# Merge modules_load from config
+for group_modules in ${!AMODULES_*}; do
+       group="$(echo $group_modules | cut -d_ -f2)"
+       eval cmodules="\$$group_modules"
+       eval MODULES_${group}=\"\${MODULES_${group}} ${cmodules}\"
+       print_info 1 "<config> Merged AMODULES_${group}:'${cmodules}' into MODULES_${group}"
+done
+
 [ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"
 [ ! -f "${CACHE_DIR}" ] && mkdir -p "${CACHE_DIR}"
 

diff --git a/pkg/udev-054.tar.bz2 b/pkg/udev-054.tar.bz2
index 8c2f41366710d9c6861a655ff7295dbbe9e1c5f1..9c200f6c26c4cf30d39868306cb4df95fb442c64 100644 (file)
Binary files a/pkg/udev-054.tar.bz2 and b/pkg/udev-054.tar.bz2 differ