build: Rename `_import_lib` to `import_lib`

This commit renames the Makefile function `_import_lib` to `import_lib`.
The original intent was for this function to be purely internal and only
used in the core `Makefile`. It turns out that it needs to be used in many
other places, like `drivers/`, so this commit removes the inappropriate
`_` prefix.

Signed-off-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Maria Sfiraiala <maria.sfiraiala@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1104

diff --git a/Makefile b/Makefile
index ffad2708bd5255c3c84a9a944ba1431744f7f0a6..1f5245a08a86d3405e73c015f285842b40a71e2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -704,7 +704,7 @@ GOCINCLUDES           += -I$(UK_GENERATED_INCLUDES)
 ################################################################################
 # external application
 ifneq ($(CONFIG_UK_BASE),$(CONFIG_UK_APP))
-$(eval $(call _import_lib,$(CONFIG_UK_APP)));
+$(eval $(call import_lib,$(CONFIG_UK_APP)));
 endif
 
 # internal libraries
@@ -712,10 +712,10 @@ $(eval $(call verbose_include,$(CONFIG_UK_BASE)/lib/Makefile.uk))
 
 # external libraries
 $(foreach E,$(ELIB_DIR), \
-       $(eval $(call _import_lib,$(E))); \
+       $(eval $(call import_lib,$(E))); \
 )
 # architecture library
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/arch/$(UK_FAMILY)))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/arch/$(UK_FAMILY)))
 # drivers
 $(eval $(call verbose_include,$(CONFIG_UK_BASE)/drivers/Makefile.uk))
 # internal platform libraries
@@ -724,7 +724,7 @@ $(eval $(call verbose_include,$(CONFIG_UK_BASE)/plat/Makefile.uk))
 # NOTE: We include them after internal platform libs so that also base variables
 #       provided with /plat/Makefile.uk are populated
 $(foreach E,$(EPLAT_DIR), \
-       $(eval $(call _import_lib,$(E))); \
+       $(eval $(call import_lib,$(E))); \
 )
 $(eval $(call verbose_include,$(CONFIG_UK_BASE)/Makefile.uk)) # Unikraft base
 

diff --git a/drivers/Makefile.uk b/drivers/Makefile.uk
index f64bd0e6f7c1a31e20975ddbb03c7178aff1e307..5a650eece0c0ec3d48c99b8cb52a1eaf1dcb9abf 100644 (file)
--- a/drivers/Makefile.uk
+++ b/drivers/Makefile.uk
@@ -6,6 +6,6 @@
 
 UK_DRIV_BASE := $(CONFIG_UK_BASE)/drivers
 
-$(eval $(call _import_lib,$(UK_DRIV_BASE)/ukbus))
-$(eval $(call _import_lib,$(UK_DRIV_BASE)/ukintctlr))
-$(eval $(call _import_lib,$(UK_DRIV_BASE)/virtio))
+$(eval $(call import_lib,$(UK_DRIV_BASE)/ukbus))
+$(eval $(call import_lib,$(UK_DRIV_BASE)/ukintctlr))
+$(eval $(call import_lib,$(UK_DRIV_BASE)/virtio))

diff --git a/drivers/ukbus/Makefile.uk b/drivers/ukbus/Makefile.uk
index 8b1d2d88c506b3b5ef296e9a138d4cd8bdbcf6b9..82f25dca8562c6de153df7e3a2a2ddd8fec8dd63 100644 (file)
--- a/drivers/ukbus/Makefile.uk
+++ b/drivers/ukbus/Makefile.uk
@@ -6,5 +6,5 @@
 
 UK_DRIV_BUS_BASE := $(UK_DRIV_BASE)/ukbus
 
-$(eval $(call _import_lib,$(UK_DRIV_BUS_BASE)/pci))
-$(eval $(call _import_lib,$(UK_DRIV_BUS_BASE)/platform))
+$(eval $(call import_lib,$(UK_DRIV_BUS_BASE)/pci))
+$(eval $(call import_lib,$(UK_DRIV_BUS_BASE)/platform))

diff --git a/drivers/ukintctlr/Makefile.uk b/drivers/ukintctlr/Makefile.uk
index 42130566952de480480da03cd22d53c0ba0ebd9b..940c3d1aeb5f8642ba7df39043009c67f1ed075c 100644 (file)
--- a/drivers/ukintctlr/Makefile.uk
+++ b/drivers/ukintctlr/Makefile.uk
@@ -6,5 +6,5 @@
 
 UK_DRIV_INTCTLR_BASE := $(UK_DRIV_BASE)/ukintctlr
 
-$(eval $(call _import_lib,$(UK_DRIV_INTCTLR_BASE)/xpic))
-$(eval $(call _import_lib,$(UK_DRIV_INTCTLR_BASE)/gic))
+$(eval $(call import_lib,$(UK_DRIV_INTCTLR_BASE)/xpic))
+$(eval $(call import_lib,$(UK_DRIV_INTCTLR_BASE)/gic))

diff --git a/drivers/virtio/Makefile.uk b/drivers/virtio/Makefile.uk
index 27e1842d22a0bb685a24c12c9ffcd93b1e645461..3238e0c872b48e1baf56dbfb2a24fb8466c4aa39 100644 (file)
--- a/drivers/virtio/Makefile.uk
+++ b/drivers/virtio/Makefile.uk
@@ -6,10 +6,10 @@
 
 UK_DRIV_LIBVIRTIO_BASE := $(UK_DRIV_BASE)/virtio
 
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/9p))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/blk))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/bus))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/mmio))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/net))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/pci))
-$(eval $(call _import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/ring))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/9p))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/blk))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/bus))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/mmio))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/net))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/pci))
+$(eval $(call import_lib,$(UK_DRIV_LIBVIRTIO_BASE)/ring))

diff --git a/lib/Makefile.uk b/lib/Makefile.uk
index 2e684eb0961240d9d9e763dae038ebc91dd17015..319a572a222efb0e4aa342d1197eb280b8284541 100644 (file)
--- a/lib/Makefile.uk
+++ b/lib/Makefile.uk
@@ -4,58 +4,58 @@
 #
 ################################################################################
 
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/9pfs))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/devfs))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/fdt))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/isrlib))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/nolibc))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-environ))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-event))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-libdl))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-mmap))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-process))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-socket))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-sysinfo))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-futex))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-user))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ramfs))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/syscall_shim))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ubsan))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uk9p))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukalloc))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukallocbbuddy))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukallocpool))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukallocregion))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukargparse))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukstreambuf))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukblkdev))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukboot))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukbus))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukcpio))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukdebug))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukfalloc))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukfallocbuddy))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uklibid))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukintctlr))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uklibparam))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uklock))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukmmap))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukmpi))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uknetdev))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uknofault))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukring))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksched))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukschedcoop))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksglist))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksignal))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uksp))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukstore))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukswrand))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uktest))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/posix-time))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/uktimeconv))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukvmem))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/vfscore))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukrust))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukreloc))
-$(eval $(call _import_lib,$(CONFIG_UK_BASE)/lib/ukofw))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/9pfs))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/devfs))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/fdt))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/isrlib))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/nolibc))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-environ))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-event))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-libdl))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-mmap))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-process))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-socket))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-sysinfo))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-futex))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-user))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ramfs))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/syscall_shim))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ubsan))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uk9p))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukalloc))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukallocbbuddy))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukallocpool))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukallocregion))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukargparse))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukstreambuf))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukblkdev))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukboot))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukbus))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukcpio))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukdebug))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukfalloc))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukfallocbuddy))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uklibid))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukintctlr))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uklibparam))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uklock))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukmmap))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukmpi))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uknetdev))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uknofault))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukring))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uksched))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukschedcoop))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uksglist))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uksignal))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uksp))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukstore))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukswrand))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uktest))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/posix-time))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/uktimeconv))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukvmem))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/vfscore))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukrust))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukreloc))
+$(eval $(call import_lib,$(CONFIG_UK_BASE)/lib/ukofw))

diff --git a/plat/Makefile.uk b/plat/Makefile.uk
index 72155bd148c5143d7e3be36f1edb34ea647094ab..a248ac604e72bae26ec5855afe4a878d176d13ed 100644 (file)
--- a/plat/Makefile.uk
+++ b/plat/Makefile.uk
@@ -2,6 +2,6 @@ UK_PLAT_BASE        := $(CONFIG_UK_BASE)/plat
 UK_PLAT_COMMON_BASE := $(UK_PLAT_BASE)/common
 UK_PLAT_DRIVERS_BASE:= $(UK_PLAT_BASE)/drivers
 
-$(eval $(call _import_lib,$(UK_PLAT_BASE)/xen))
-$(eval $(call _import_lib,$(UK_PLAT_BASE)/kvm))
-$(eval $(call _import_lib,$(UK_PLAT_BASE)/linuxu))
+$(eval $(call import_lib,$(UK_PLAT_BASE)/xen))
+$(eval $(call import_lib,$(UK_PLAT_BASE)/kvm))
+$(eval $(call import_lib,$(UK_PLAT_BASE)/linuxu))

diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
index 5a8e8e80eb83dc4c82e687c9f660f1431cedcbdc..a3b18e64651b0f2fb3996f55a8803321403af8c4 100644 (file)
--- a/support/build/Makefile.rules
+++ b/support/build/Makefile.rules
@@ -240,8 +240,8 @@ endef
 
 # Import a library
 # For internally use only (Unikraft main makefile and internal libs Makefike.uk)
-# _import_library $1:path
-define _import_lib =
+# import_lib $1:path
+define import_lib =
 IMPORT_BASE := $(1)
 $(call verbose_include,$(1)/Makefile.uk)
 undefine IMPORT_BASE