Re: [[UNIKRAFT RFC PATCH] 2/2] lib/isrlib: Fixed a name typo that prevented build

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Please merge this to your previous commit and send only one patch.

Thanks,

Simon

On 10.08.20 19:42, cristian-vijelie wrote:
> From: Cristian Vijelie <cristianvijelie@xxxxxxxxx>
>
> ---
>   lib/Makefile.uk                                             | 1 +
>   lib/irslib/Makefile.uk                                      | 6 ------
>   lib/{irslib => isrlib}/Config.uk                            | 2 +-
>   lib/isrlib/Makefile.uk                                      | 6 ++++++
>   lib/{irslib => isrlib}/include/isrlib-internal/shareddefs.h | 0
>   lib/{irslib => isrlib}/string.c                             | 0
>   6 files changed, 8 insertions(+), 7 deletions(-)
>   delete mode 100644 lib/irslib/Makefile.uk
>   rename lib/{irslib => isrlib}/Config.uk (59%)
>   create mode 100644 lib/isrlib/Makefile.uk
>   rename lib/{irslib => isrlib}/include/isrlib-internal/shareddefs.h (100%)
>   rename lib/{irslib => isrlib}/string.c (100%)
>
> diff --git a/lib/Makefile.uk b/lib/Makefile.uk
> index 07e8a29..f832a0b 100644
> --- a/lib/Makefile.uk
> +++ b/lib/Makefile.uk
> @@ -37,3 +37,4 @@ $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukmmap))
>   $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukblkdev))
>   $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-process))
>   $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksp))
> +$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/isrlib))
> diff --git a/lib/irslib/Makefile.uk b/lib/irslib/Makefile.uk
> deleted file mode 100644
> index fe2461e..0000000
> --- a/lib/irslib/Makefile.uk
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -$(eval $(call addlib_s,libisrlib,$(CONFIG_LIBISRLIB)))
> -
> -CINCLUDES-$(CONFIG_LIBISRLIB)   += -I$(LIBISRLIB_BASE)/include
> -CXXINCLUDES-$(CONFIG_LIBISRLIB)   += -I$(LIBISRLIB_BASE)/include
> -
> -LIBISRLIB_SRCS-y += $(LIBISRLIB_BASE)/string.c|isr
> diff --git a/lib/irslib/Config.uk b/lib/isrlib/Config.uk
> similarity index 59%
> rename from lib/irslib/Config.uk
> rename to lib/isrlib/Config.uk
> index 88ff441..c6be13c 100644
> --- a/lib/irslib/Config.uk
> +++ b/lib/isrlib/Config.uk
> @@ -1,5 +1,5 @@
>   menuconfig LIBISRLIB
> -    bool "isr helper library"
> +    bool "isrlib: ISR helper library"
>       default n
>   
>   if LIBISRLIB
> diff --git a/lib/isrlib/Makefile.uk b/lib/isrlib/Makefile.uk
> new file mode 100644
> index 0000000..65baf2e
> --- /dev/null
> +++ b/lib/isrlib/Makefile.uk
> @@ -0,0 +1,6 @@
> +$(eval $(call addlib_s,libisrlib,$(CONFIG_LIBISRLIB)))
> +
> +CINCLUDES-$(CONFIG_LIBISRLIB) += -I$(LIBISRLIB_BASE)/include
> +CXXINCLUDES-$(CONFIG_LIBISRLIB) += -I$(LIBISRLIB_BASE)/include
> +
> +LIBISRLIB_SRCS-y += $(LIBISRLIB_BASE)/string.c|isr
> diff --git a/lib/irslib/include/isrlib-internal/shareddefs.h 
> b/lib/isrlib/include/isrlib-internal/shareddefs.h
> similarity index 100%
> rename from lib/irslib/include/isrlib-internal/shareddefs.h
> rename to lib/isrlib/include/isrlib-internal/shareddefs.h
> diff --git a/lib/irslib/string.c b/lib/isrlib/string.c
> similarity index 100%
> rename from lib/irslib/string.c
> rename to lib/isrlib/string.c