scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-11-01 02:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the new module database infrastructure.

Browse Source
This commit is contained in:
Jeffrey Townsend
2016-11-16 20:21:04 +00:00
parent 82eafedd6b
commit ab24f9914e
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
make/.gitignore vendored
View File

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

7
make/config.mk
View File

@@ -26,8 +26,11 @@ export ONL_DEBIAN_SUITE_$(ONL_DEBIAN_SUITE)=1
export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE) 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. # Generate versions if necessary.
$(shell $(ONL)/tools/make-versions.py --import-file=$(ONL)/tools/onlvi --class-name=OnlVersionImplementation --output-dir $(ONL)/make/versions) $(shell $(ONL)/tools/make-versions.py --import-file=$(ONL)/tools/onlvi --class-name=OnlVersionImplementation --output-dir $(ONL)/make/versions)

2
tools/newmodule.py
View File

@@ -58,7 +58,7 @@ if __name__ == "__main__":
ModuleGenerator.main(globals().copy()) ModuleGenerator.main(globals().copy())
# Make sure the manifest gets regenerated. # 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)

11
tools/scripts/post-merge.hook
View File

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

2
tools/scripts/submodule-updated.sh
View File

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