[LTP] [PATCH] LIB: Use INTERNAL_LIB for ltp lib

[Xiao Yang]

On 2020/5/29 13:42, Yang Xu wrote:
> Use INTERNAL_LIB for ltp lib because installing these ltp static
> library in any situation is meaningless.
>
> all static library as below:
> ./libs/libltpuinput/libltpuinput.a
> ./libs/libltpnewipc/libltpnewipc.a
> ./libs/libltpnuma/libltpnuma.a
> ./libs/libltpipc/libltpipc.a
> ./libs/libltpipc/libltpmsgctl.a
> ./utils/sctp/lib/libsctp.a
> ./utils/sctp/testlib/libsctputil.a
> ./lib/libltp.a
> ./testcases/network/rpc/basic_tests/rpc01/lib/librpc01.a
> ./testcases/network/rpc/rpc-tirpc/tests_pack/lib/librpc-tirpc.a
> ./testcases/kernel/containers/libclone/libclone.a
> ./testcases/kernel/mem/hugetlb/lib/libhugetlb.a
> ./testcases/kernel/mem/lib/libmem.a
> ./testcases/kernel/controllers/libcontrollers/libcontrollers.a
> ./testcases/kernel/controllers/cpuset/cpuset_lib/libcpu_set.a
> ./testcases/kernel/lib/libkerntest.a
> ./testcases/commands/nm/datafiles/lib.a
Hi Xu,

1) The last one(datafiles/lib.a) seems to be used by nm test as a data.
I think it is not included this kind of library so should we remove it 
in commit message?

2) One question:
Is it necessary to keep lib directory(e.g. /opt/ltp/lib) if we avoid 
installing all static libraries?

Thanks,
Xiao Yang
>
> Signed-off-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com>
> ---
>   lib/Makefile                                            | 2 +-
>   libs/libltpipc/Makefile                                 | 2 +-
>   libs/libltpnuma/Makefile                                | 2 +-
>   libs/libltpuinput/Makefile                              | 2 +-
>   testcases/kernel/containers/libclone/Makefile           | 2 +-
>   testcases/kernel/controllers/cpuset/cpuset_lib/Makefile | 2 +-
>   testcases/kernel/controllers/libcontrollers/Makefile    | 2 +-
>   testcases/kernel/mem/hugetlb/lib/Makefile               | 2 +-
>   testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile | 2 +-
>   utils/sctp/lib/Makefile                                 | 2 +-
>   utils/sctp/testlib/Makefile                             | 2 +-
>   11 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/lib/Makefile b/lib/Makefile
> index e7fc753da..f019432e8 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -32,7 +32,7 @@ else
>   FILTER_OUT_LIBSRCS	+= tlibio.c tst_safe_sysv_ipc.c
>   endif
>
> -LIB			:= libltp.a
> +INTERNAL_LIB		:= libltp.a
>
>   pc_file			:= $(DESTDIR)/$(datarootdir)/pkgconfig/ltp.pc
>
> diff --git a/libs/libltpipc/Makefile b/libs/libltpipc/Makefile
> index 11f38ea0a..fadd04833 100644
> --- a/libs/libltpipc/Makefile
> +++ b/libs/libltpipc/Makefile
> @@ -5,7 +5,7 @@ top_srcdir		?= ../..
>
>   include $(top_srcdir)/include/mk/env_pre.mk
>
> -LIB			:= libltpipc.a libltpmsgctl.a
> +INTERNAL_LIB		:= libltpipc.a libltpmsgctl.a
>
>   include $(top_srcdir)/include/mk/lib.mk
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/libs/libltpnuma/Makefile b/libs/libltpnuma/Makefile
> index 56d6b7762..a6856758d 100644
> --- a/libs/libltpnuma/Makefile
> +++ b/libs/libltpnuma/Makefile
> @@ -6,7 +6,7 @@ top_srcdir		?= ../..
>
>   include $(top_srcdir)/include/mk/env_pre.mk
>
> -LIB			:= libltpnuma.a
> +INTERNAL_LIB		:= libltpnuma.a
>
>   include $(top_srcdir)/include/mk/lib.mk
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/libs/libltpuinput/Makefile b/libs/libltpuinput/Makefile
> index dd2a6c096..c72dd2e1e 100644
> --- a/libs/libltpuinput/Makefile
> +++ b/libs/libltpuinput/Makefile
> @@ -6,7 +6,7 @@ top_srcdir		?= ../..
>
>   include $(top_srcdir)/include/mk/env_pre.mk
>
> -LIB			:= libltpuinput.a
> +INTERNAL_LIB		:= libltpuinput.a
>
>   include $(top_srcdir)/include/mk/lib.mk
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/containers/libclone/Makefile b/testcases/kernel/containers/libclone/Makefile
> index d78570db7..13af52b67 100644
> --- a/testcases/kernel/containers/libclone/Makefile
> +++ b/testcases/kernel/containers/libclone/Makefile
> @@ -22,6 +22,6 @@ top_srcdir		?= ../../../..
>
>   include $(top_srcdir)/include/mk/testcases.mk
>
> -LIB			:= libclone.a
> +INTERNAL_LIB		:= libclone.a
>
>   include $(top_srcdir)/include/mk/lib.mk
> diff --git a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
> index 069ebc38c..1b6a40bea 100644
> --- a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
> +++ b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
> @@ -27,6 +27,6 @@ include $(top_srcdir)/include/mk/testcases.mk
>
>   LDLIBS			:= -lm -lcontrollers -lltp $(LDLIBS)
>
> -LIB			:= libcpu_set.a
> +INTERNAL_LIB		:= libcpu_set.a
>
>   include	$(top_srcdir)/include/mk/lib.mk
> diff --git a/testcases/kernel/controllers/libcontrollers/Makefile b/testcases/kernel/controllers/libcontrollers/Makefile
> index 88918cf2d..9f8955e28 100644
> --- a/testcases/kernel/controllers/libcontrollers/Makefile
> +++ b/testcases/kernel/controllers/libcontrollers/Makefile
> @@ -24,6 +24,6 @@ top_srcdir		?= ../../../..
>
>   include $(top_srcdir)/include/mk/testcases.mk
>
> -LIB			:= libcontrollers.a
> +INTERNAL_LIB		:= libcontrollers.a
>
>   include $(top_srcdir)/include/mk/lib.mk
> diff --git a/testcases/kernel/mem/hugetlb/lib/Makefile b/testcases/kernel/mem/hugetlb/lib/Makefile
> index c5c55648f..2e893429d 100644
> --- a/testcases/kernel/mem/hugetlb/lib/Makefile
> +++ b/testcases/kernel/mem/hugetlb/lib/Makefile
> @@ -21,6 +21,6 @@ top_srcdir		?= ../../../../..
>   include $(top_srcdir)/include/mk/env_pre.mk
>   include $(top_srcdir)/testcases/kernel/mem/include/libmem.mk
>
> -LIB			:= libhugetlb.a
> +INTERNAL_LIB		:= libhugetlb.a
>
>   include $(top_srcdir)/include/mk/lib.mk
> diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile
> index 3563d2dc5..5a6f5d41c 100644
> --- a/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile
> +++ b/testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile
> @@ -20,6 +20,6 @@ top_srcdir             ?= ../../../../../..
>
>   include        $(top_srcdir)/include/mk/env_pre.mk
>
> -LIB	:= librpc-tirpc.a
> +INTERNAL_LIB	:= librpc-tirpc.a
>
>   include $(top_srcdir)/include/mk/lib.mk
> diff --git a/utils/sctp/lib/Makefile b/utils/sctp/lib/Makefile
> index c0cb35b4e..54438b61c 100644
> --- a/utils/sctp/lib/Makefile
> +++ b/utils/sctp/lib/Makefile
> @@ -26,6 +26,6 @@ include $(top_srcdir)/include/mk/env_pre.mk
>
>   CPPFLAGS		+= -I$(abs_srcdir)/../include
>
> -LIB			:= libsctp.a
> +INTERNAL_LIB		:= libsctp.a
>
>   include $(top_srcdir)/include/mk/lib.mk
> diff --git a/utils/sctp/testlib/Makefile b/utils/sctp/testlib/Makefile
> index 2977f45b3..84ed02040 100644
> --- a/utils/sctp/testlib/Makefile
> +++ b/utils/sctp/testlib/Makefile
> @@ -28,7 +28,7 @@ CPPFLAGS		+= -DLTP -I$(abs_srcdir)/../include
>
>   LDLIBS			+= -lltp -lsctp
>
> -LIB			:= libsctputil.a
> +INTERNAL_LIB		:= libsctputil.a
>
>   #
>   #DEPLIBDIR		:= ../lib