Use the new module database infrastructure.

make/.gitignore

@@ -1,3 +1,4 @@
 versions/
-module-manifest.mk
+modules/module*
+
 

make/config.mk

@@ -26,8 +26,11 @@ export ONL_DEBIAN_SUITE_$(ONL_DEBIAN_SUITE)=1
 
 export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE)
 
-# Generate manifest if necessary
-export MODULEMANIFEST := $(shell $(BUILDER)/tools/mmg.py $(ONL)/make/mmg.yml $(ONL) --only-if-missing)
+
+# Use the new module database tool to resolve dependencies dynamically.
+export BUILDER_MODULE_DATABASE := $(ONL)/make/modules/modules.json
+# Regenerate the module manifest if necessary.
+export MODULEMANIFEST := $(shell $(BUILDER)/tools/modtool.py --db $(BUILDER_MODULE_DATABASE) --dbroot $(ONL) --make-manifest $(ONL)/make/modules/modules.mk)
 
 # Generate versions if necessary.
 $(shell $(ONL)/tools/make-versions.py --import-file=$(ONL)/tools/onlvi --class-name=OnlVersionImplementation --output-dir $(ONL)/make/versions)

tools/newmodule.py

@@ -58,7 +58,7 @@ if __name__ == "__main__":
     ModuleGenerator.main(globals().copy())
 
     # Make sure the manifest gets regenerated.
-    os.system("rm -rf %s/make/module-manifest.mk" % ROOT)
+    os.system("rm -rf %s/make/modules/modules*" % ROOT)
 
 
 

tools/scripts/post-merge.hook

@@ -2,14 +2,11 @@
 ############################################################
 #
 # Every time a merge is performed we should invalidate
-# the module manifest.
+# the module data.
 #
 ############################################################
-mm="$GIT_DIR/../make/module-manifest.mk"
-
-if [ -f "$mm" ]; then
-    echo "Removing module manifest after merge..."
-    rm "$mm"
-fi
+echo "Removing module data after merge..."
+rm -rf "$GIT_DIR/../make/modules/modules*"
+
 
 

tools/scripts/submodule-updated.sh

@@ -13,7 +13,7 @@
 ############################################################
 
 # Removing the manifest causes it to be regenerated.
-rm -rf $ONL/make/module-manifest.mk
+rm -rf $ONL/make/modules/module*
 
 # Rebuild pkg cache
 onlpm.py --rebuild-pkg-cache