Generic modules shouldn't be listed under <arch>/

Signed-off-by: David Cock <david.cock@inf.ethz.ch>

diff --git a/platforms/Hakefile b/platforms/Hakefile
index 6704952..090b34d 100644 (file)
--- a/platforms/Hakefile
+++ b/platforms/Hakefile
@@ -201,7 +201,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                            "webserver",
                            "xeon_phi",
                            "xeon_phi_mgr"
-                           ]] ++ modules_generic
+                           ]]
     
     -- the following are broken in the newidc system
     modules_x86_64_broken  = [ "/sbin/" ++ f | f <- [ 
@@ -297,27 +297,38 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
    --
    
     platform "X86_64_Basic" [ "x86_64" ]
-      [ ("x86_64", f) | f <- modules_x86_64 ]
+      ([ ("x86_64", f) | f <- modules_x86_64 ] ++
+       [ ("",       f) | f <- modules_generic])
       "Basic 64-bit x86 PC build",
 
     platform "X86_64_Benchmarks" [ "x86_64" ]
-      [ ("x86_64", f) | f <- modules_x86_64 ++ bench_x86_64]
+      ([ ("x86_64", f) | f <- modules_x86_64 ++ bench_x86_64]
+       ++
+       [ ("",       f) | f <- modules_generic])
       "64-bit x86 PC build with benchmarks",
 
     platform "X86_64_Full" [ "x86_64" ]
-      [ ("x86_64", f) | f <- modules_x86_64 ++ bench_x86_64 ++ tests_x86_64 ]
+      ([ ("x86_64", f) | f <- modules_x86_64 ++ bench_x86_64 ++ tests_x86_64 ]
+       ++
+       [ ("",       f) | f <- modules_generic])
       "64-bit x86 PC build with benchmarks and test suites",
 
     platform "X86_32_Basic" [ "x86_32" ]
-      [ ("x86_32", f) | f <- modules_x86_32 ]
+      ([ ("x86_32", f) | f <- modules_x86_32 ]
+       ++
+       [ ("",       f) | f <- modules_generic])
       "Basic 32-bit x86 PC build",
 
     platform "X86_32_Benchmarks" [ "x86_32" ]
-      [ ("x86_32", f) | f <- modules_x86_32 ++ bench_x86_32]
+      ([ ("x86_32", f) | f <- modules_x86_32 ++ bench_x86_32]
+       ++
+       [ ("",       f) | f <- modules_generic])
       "32-bit x86 PC build with benchmarks",
 
     platform "X86_32_Full" [ "x86_32" ]
-      [ ("x86_32", f) | f <- modules_x86_32 ++ bench_x86_32 ++ tests_x86_32 ]
+      ([ ("x86_32", f) | f <- modules_x86_32 ++ bench_x86_32 ++ tests_x86_32 ]
+       ++
+       [ ("",       f) | f <- modules_generic])
       "32-bit x86 PC build with benchmarks and test suites",
 
     platform "PandaboardES" [ "armv7" ]