[Minios-devel] [UNIKRAFT PATCH v2 1/3] lib/posix-sysinfo: Rename internal name from uksysinfo

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Registers the library with `libposix-sysinfo` to the build. The
previous name `uksysinfo` did not follow our naming convention and
sysinfo implements a POSIX interface.

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 lib/Makefile.uk                                        | 2 +-
 lib/posix-sysinfo/Config.uk                            | 4 ++++
 lib/posix-sysinfo/Makefile.uk                          | 6 ++++++
 lib/{uksysinfo => posix-sysinfo}/exportsyms.uk         | 0
 lib/{uksysinfo => posix-sysinfo}/include/sys/sysinfo.h | 0
 lib/{uksysinfo => posix-sysinfo}/include/sys/utsname.h | 0
 lib/{uksysinfo => posix-sysinfo}/sysinfo.c             | 0
 lib/uksysinfo/Config.uk                                | 3 ---
 lib/uksysinfo/Makefile.uk                              | 6 ------
 9 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 lib/posix-sysinfo/Config.uk
 create mode 100644 lib/posix-sysinfo/Makefile.uk
 rename lib/{uksysinfo => posix-sysinfo}/exportsyms.uk (100%)
 rename lib/{uksysinfo => posix-sysinfo}/include/sys/sysinfo.h (100%)
 rename lib/{uksysinfo => posix-sysinfo}/include/sys/utsname.h (100%)
 rename lib/{uksysinfo => posix-sysinfo}/sysinfo.c (100%)
 delete mode 100644 lib/uksysinfo/Config.uk
 delete mode 100644 lib/uksysinfo/Makefile.uk

diff --git a/lib/Makefile.uk b/lib/Makefile.uk
index 4b9568a1..aa7e7302 100644
--- a/lib/Makefile.uk
+++ b/lib/Makefile.uk
@@ -7,7 +7,7 @@
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukboot))
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukswrand))
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-user))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksysinfo))
+$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-sysinfo))
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukdebug))
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukargparse))
 $(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uktimeconv))
diff --git a/lib/posix-sysinfo/Config.uk b/lib/posix-sysinfo/Config.uk
new file mode 100644
index 00000000..a3e8166d
--- /dev/null
+++ b/lib/posix-sysinfo/Config.uk
@@ -0,0 +1,4 @@
+config LIBPOSIX_SYSINFO
+       bool "posix-sysinfo: Information about system parameters"
+       select LIBNOLIBC if !HAVE_LIBC
+       default n
diff --git a/lib/posix-sysinfo/Makefile.uk b/lib/posix-sysinfo/Makefile.uk
new file mode 100644
index 00000000..c25b8abc
--- /dev/null
+++ b/lib/posix-sysinfo/Makefile.uk
@@ -0,0 +1,6 @@
+$(eval $(call addlib_s,libposix_sysinfo,$(CONFIG_LIBPOSIX_SYSINFO)))
+
+CINCLUDES-$(CONFIG_LIBPOSIX_SYSINFO)   += -I$(LIBPOSIX_SYSINFO_BASE)/include
+CXXINCLUDES-$(CONFIG_LIBPOSIX_SYSINFO) += -I$(LIBPOSIX_SYSINFO_BASE)/include
+
+LIBPOSIX_SYSINFO_SRCS-$(CONFIG_LIBPOSIX_SYSINFO) += 
$(LIBPOSIX_SYSINFO_BASE)/sysinfo.c
diff --git a/lib/uksysinfo/exportsyms.uk b/lib/posix-sysinfo/exportsyms.uk
similarity index 100%
rename from lib/uksysinfo/exportsyms.uk
rename to lib/posix-sysinfo/exportsyms.uk
diff --git a/lib/uksysinfo/include/sys/sysinfo.h 
b/lib/posix-sysinfo/include/sys/sysinfo.h
similarity index 100%
rename from lib/uksysinfo/include/sys/sysinfo.h
rename to lib/posix-sysinfo/include/sys/sysinfo.h
diff --git a/lib/uksysinfo/include/sys/utsname.h 
b/lib/posix-sysinfo/include/sys/utsname.h
similarity index 100%
rename from lib/uksysinfo/include/sys/utsname.h
rename to lib/posix-sysinfo/include/sys/utsname.h
diff --git a/lib/uksysinfo/sysinfo.c b/lib/posix-sysinfo/sysinfo.c
similarity index 100%
rename from lib/uksysinfo/sysinfo.c
rename to lib/posix-sysinfo/sysinfo.c
diff --git a/lib/uksysinfo/Config.uk b/lib/uksysinfo/Config.uk
deleted file mode 100644
index 03d60739..00000000
--- a/lib/uksysinfo/Config.uk
+++ /dev/null
@@ -1,3 +0,0 @@
-menuconfig UKSYSINFO
-       bool "uksysinfo: info about system parameters"
-       default n
diff --git a/lib/uksysinfo/Makefile.uk b/lib/uksysinfo/Makefile.uk
deleted file mode 100644
index 28e99fb5..00000000
--- a/lib/uksysinfo/Makefile.uk
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call addlib_s,uksysinfo,$(CONFIG_UKSYSINFO)))
-
-CINCLUDES-$(CONFIG_UKSYSINFO)    += -I$(UKSYSINFO_BASE)/include
-CXXINCLUDES-$(CONFIG_UKSYSINFO)  += -I$(UKSYSINFO_BASE)/include
-
-UKSYSINFO_SRCS-$(CONFIG_UKSYSINFO) += $(UKSYSINFO_BASE)/sysinfo.c
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel