allow arch-dependent module list (bsc#1213879)

bin/mlist1

@@ -58,12 +58,35 @@ else {
   die "$0: $md: $!\n";
 }
 
+my $cond_arch;
+my $cond_ok = 1;
 
 if(open my $f, $ex) {
   while(<$f>) {
     s/\s*$//;
     next if /^\s*(#|$)/;
 
+    # keep everything between <ARCH>...</ARCH> when ARCH == $ConfigData{arch}
+    # and drop everything between <ARCH>...</ARCH> when ARCH != $ConfigData{arch}
+    #
+    # <ARCH> and </ARCH> must be alone on separate lines
+
+    if(/<(\/?)([^>]*)>/) {
+      if($1) {
+        die "$ex($.): improper nesting" if $cond_arch ne $2;
+        undef $cond_arch;
+        $cond_ok = 1;
+      }
+      else {
+        die "$ex($.): nesting not allowed" if $cond_arch;
+        $cond_arch = $2;
+        $cond_ok = $cond_arch eq $ConfigData{arch};
+      }
+      next;
+    }
+
+    next if !$cond_ok;
+
     if(s/^\-//) {
       $ex_no .= "|$_";
     }

etc/module.list

@@ -3,6 +3,10 @@
 # Lines starting with '-' specify modules to drop.
 # The lines below are actually perl regexps, so be careful.
 #
+# If a module is specified both to be added and dropped, it is dropped.
+#
+# Arch-dependend blocks start with <ARCH> and end with </ARCH> (on separate lines).
+#
 kernel/drivers/base/
 kernel/drivers/block/
 -kernel/drivers/block/paride
@@ -311,3 +315,14 @@ updates/
 -updates/net/sunrpc/
 -updates/fs/lockd/
 -updates/fs/nfs*
+
+<ppc64le>
+# for the source of this module list, see bsc#1213879 comment 35
+-kernel/drivers/net/wireless/
+-kernel/net/ieee80211/
+-kernel/net/mac80211/
+-kernel/net/wireless/
+-kernel/net/wimax/
+-kernel/drivers/gpu/
+-kernel/drivers/video/
+</ppc64le>