From 72dd5a5c6831fcecfdd7d1b56c3328f81c85b549 Mon Sep 17 00:00:00 2001 From: Jakub Rzeszutko Date: Mon, 15 Feb 2021 13:07:02 +0100 Subject: [PATCH] lib: move fnmatch to lib/util We expect to have more libraries with incopatible license. There must be a common place for such software. It seems that lib/util is good place for that. Signed-off-by: Jakub Rzeszutko --- lib/CMakeLists.txt | 2 +- lib/Kconfig | 4 ++-- lib/util/CMakeLists.txt | 3 +++ lib/util/Kconfig | 9 +++++++++ lib/{ => util}/fnmatch/CMakeLists.txt | 0 lib/{ => util}/fnmatch/Kconfig | 0 lib/{ => util}/fnmatch/fnmatch.c | 0 lib/{ => util}/fnmatch/fnmatch.h | 0 8 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 lib/util/CMakeLists.txt create mode 100644 lib/util/Kconfig rename lib/{ => util}/fnmatch/CMakeLists.txt (100%) rename lib/{ => util}/fnmatch/Kconfig (100%) rename lib/{ => util}/fnmatch/fnmatch.c (100%) rename lib/{ => util}/fnmatch/fnmatch.h (100%) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 9ca2f968df2..f91943698e6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(posix) endif() add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V1 cmsis_rtos_v1) add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V2 cmsis_rtos_v2) -add_subdirectory_ifdef(CONFIG_FNMATCH fnmatch) add_subdirectory(gui) add_subdirectory(os) +add_subdirectory(util) add_subdirectory_ifdef(CONFIG_OPENAMP open-amp) diff --git a/lib/Kconfig b/lib/Kconfig index 04b1819ea15..15b478f6ee6 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -9,8 +9,6 @@ source "lib/cmsis_rtos_v1/Kconfig" source "lib/cmsis_rtos_v2/Kconfig" -source "lib/fnmatch/Kconfig" - source "lib/gui/Kconfig" source "lib/os/Kconfig" @@ -19,4 +17,6 @@ source "lib/posix/Kconfig" source "lib/open-amp/Kconfig" +source "lib/util/Kconfig" + endmenu diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt new file mode 100644 index 00000000000..f4a2b08db17 --- /dev/null +++ b/lib/util/CMakeLists.txt @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory_ifdef(CONFIG_FNMATCH fnmatch) diff --git a/lib/util/Kconfig b/lib/util/Kconfig new file mode 100644 index 00000000000..0907cbba4ae --- /dev/null +++ b/lib/util/Kconfig @@ -0,0 +1,9 @@ +# Copyright (c) 2021 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + + +menu "Util libraries" + +source "lib/util/fnmatch/Kconfig" + +endmenu diff --git a/lib/fnmatch/CMakeLists.txt b/lib/util/fnmatch/CMakeLists.txt similarity index 100% rename from lib/fnmatch/CMakeLists.txt rename to lib/util/fnmatch/CMakeLists.txt diff --git a/lib/fnmatch/Kconfig b/lib/util/fnmatch/Kconfig similarity index 100% rename from lib/fnmatch/Kconfig rename to lib/util/fnmatch/Kconfig diff --git a/lib/fnmatch/fnmatch.c b/lib/util/fnmatch/fnmatch.c similarity index 100% rename from lib/fnmatch/fnmatch.c rename to lib/util/fnmatch/fnmatch.c diff --git a/lib/fnmatch/fnmatch.h b/lib/util/fnmatch/fnmatch.h similarity index 100% rename from lib/fnmatch/fnmatch.h rename to lib/util/fnmatch/fnmatch.h