config: Add userlevel module option

Add a menuconfig option to build Click with userlevel elements. Be aware
that this currently doesn't build because of missing header files.
Hence, this option is disabled by default.

Signed-off-by: Florian Schmidt <florian.schmidt@neclab.eu>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/COPYING.md b/COPYING.md
index 52f37531ef98e1c3236c7bfa7279349d445eb91f..aae86f8dde74b7f7d73c346bd7b86a8840f6deb3 100644 (file)
--- a/COPYING.md
+++ b/COPYING.md
@@ -10,7 +10,7 @@ each C code file in this repository should declare who is the copyright owner
 and under which terms and conditions the code is licensed. If such a licence
 note is missing, the following copyright notice will apply:
 
-       Copyright (c) 2019, NEC Laboratories Europei GmbH, NEC Corporation.
+       Copyright (c) 2019, NEC Laboratories Europe GmbH, NEC Corporation.
                            All rights reserved.
 
        Redistribution and use in source and binary forms, with or without

diff --git a/Config.uk b/Config.uk
index 96d946e679e4bb9a26b6cdb4fd68d6b8ccad07a8..e2508571bafb080e4226af232b6caa5f0936ba34 100644 (file)
--- a/Config.uk
+++ b/Config.uk
@@ -84,4 +84,11 @@ config LIBCLICK_ELEMS_THREADS
        help
          Build with multi-threading elements
 
+config LIBCLICK_ELEMS_USERLEVEL
+       bool "Enable userlevel elements [BROKEN]"
+       default n
+       help
+         Build with Click userlevel elements.
+         Be aware this currently doesn't compile.
+
 endif

diff --git a/Makefile.uk b/Makefile.uk
index 02b58f80a7075643703a177646b51adaf57d80ab..1f8dd88503d5ef29e4f4dfa27f82e1332f09dee6 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -61,7 +61,7 @@ LIBCLICK_EXTRACTED=$(LIBCLICK_ORIGIN)/click-$(LIBCLICK_COMMIT_HASH)
 LIBCLICK_ELEMENTS_DIR=$(LIBCLICK_EXTRACTED)/elements
 LIBCLICK_BUILDTOOL=$(LIBCLICK_EXTRACTED)/bin/click-buildtool
 LIBCLICK_ELEM_DIRS=aqm ethernet etherswitch icmp ip unikraft \
-                  local simple standard tcpudp threads
+                  local simple standard tcpudp threads userlevel
 
 ################################################################################
 # Config Menu - Filter which element categories actually get built
@@ -93,7 +93,7 @@ $(LIBCLICK_BUILD)/elements.cc: $(LIBCLICK_BUILD)/.elementsmk
               $(LIBCLICK_BUILDTOOL) elem2export < $(LIBCLICK_BUILD)/.elementsconf > $(LIBCLICK_BUILD)/elements.cc)
 
 $(LIBCLICK_BUILD)/.cpfromtodevs: $(LIBCLICK_BUILD)/.origin
-       $(call verbose_cmd,CP,libclick: $(notdir $@),\
+       $(call verbose_cmd,ELEMCP,libclick: $(notdir $@),\
        $(MKDIR) -p $(LIBCLICK_ORIGIN)/click-$(LIBCLICK_COMMIT_HASH)/elements && \
        $(CP) -r $(LIBCLICK_BASE)/unikraft $(LIBCLICK_ORIGIN)/click-$(LIBCLICK_COMMIT_HASH)/elements/ && \
        touch $@)