[PATCH 1/3] Start with all modules from kernel/drivers/s390 on s390x (#524566)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The modules.ccwmap file is not in the latest kernel tree for whatever
tree.  Start the s390x module list with all modules from the
s390-specific module subdirectory in /lib/modules, then read in any
additional ones that might apply to the installation.
---
 scripts/mk-images.s390 |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 94b72f2..308afcf 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -17,6 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+getAllS390ModuleNames() {
+    s390dir="${KERNELROOT}/lib/modules/${version}/kernel/drivers/s390"
+    if [ -d "${s390dir}" ]; then
+        find ${s390dir} -type f -name "*.ko" | while read line ; do
+            echo "$(basename ${line} .ko)"
+        done | sort | uniq | tr '\n' ' '
+    fi
+}
+
 collectModuleNames() {
     grep -v "^#" ${KERNELROOT}/lib/modules/${version}/modules.${1} | \
         cut -d ' ' -f 1 | sort | uniq | \
@@ -63,10 +72,11 @@ expandModuleDeps() {
     rm -f "${DEPSFILE}"
 }
 
+S390BASEMODS="$(getAllS390ModuleNames)"
 S390CCWMODS="$(collectModuleNames ccwmap)"
+S390BLOCKMODS="$(collectModuleNames block)"
 S390NETMODS="$(collectModuleNames networking)"
-S390EXTRAMODS="dasd_diag_mod smsgiucv"
-S390MODS="$(expandModuleDeps $S390CCWMODS $S390NETMODS $S390EXTRAMODS)"
+S390MODS="$(expandModuleDeps $S390BASEMODS $S390CCWMODS $S390BLOCKMODS $S390NETMODS)"
 
 makeBootImages() {
 	makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
-- 
1.6.2.5

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux