From 4173617b9c4edeadd67ed49dd776df245700c092 Mon Sep 17 00:00:00 2001 From: Florian Schmidt Date: Wed, 5 Jun 2019 14:43:32 +0200 Subject: [PATCH] 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 Reviewed-by: Felipe Huici --- COPYING.md | 2 +- Config.uk | 7 +++++++ Makefile.uk | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/COPYING.md b/COPYING.md index 52f3753..aae86f8 100644 --- 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 96d946e..e250857 100644 --- 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 02b58f8..1f8dd88 100644 --- 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 $@) -- 2.39.5