LIB: Use INTERNAL_LIB for ltp lib
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
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
--- 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(-)
lib/Makefile +1 -1
@@ -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
libs/libltpipc/Makefile +1 -1
@@ -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
libs/libltpnuma/Makefile +1 -1
@@ -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
libs/libltpuinput/Makefile +1 -1
@@ -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
testcases/kernel/containers/libclone/Makefile +1 -1
@@ -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
testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +1 -1
@@ -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
testcases/kernel/controllers/libcontrollers/Makefile +1 -1
@@ -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
testcases/kernel/mem/hugetlb/lib/Makefile +1 -1
@@ -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
testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +1 -1
@@ -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
utils/sctp/lib/Makefile +1 -1
@@ -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
utils/sctp/testlib/Makefile +1 -1
@@ -28,7 +28,7 @@ CPPFLAGS += -DLTP -I$(abs_srcdir)/../include LDLIBS += -lltp -lsctp -LIB := libsctputil.a +INTERNAL_LIB := libsctputil.a # #DEPLIBDIR := ../lib
Signature · 1 line
2.23.0
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
Quoted 13 lines · Yang Xu
Use
INTERNAL_LIBfor 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
Quoted 8 lines
./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
Quoted 153 lines
Signed-off-by Yang Xu<[email protected]>--- 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(-)lib/Makefile +1
-1@@ -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.pclibs/libltpipc/Makefile +1
-1@@ -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.mklibs/libltpnuma/Makefile +1
-1@@ -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.mklibs/libltpuinput/Makefile +1
-1@@ -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.mktestcases/kernel/containers/libclone/Makefile +1
-1@@ -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.mktestcases/kernel/controllers/cpuset/cpuset_lib/Makefile +1
-1@@ -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.mktestcases/kernel/controllers/libcontrollers/Makefile +1
-1@@ -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.mktestcases/kernel/mem/hugetlb/lib/Makefile +1
-1@@ -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.mktestcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +1
-1@@ -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.mkutils/sctp/lib/Makefile +1
-1@@ -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.mkutils/sctp/testlib/Makefile +1
-1@@ -28,7 +28,7 @@ CPPFLAGS += -DLTP -I$(abs_srcdir)/../include LDLIBS += -lltp -lsctp -LIB := libsctputil.a +INTERNAL_LIB := libsctputil.a # #DEPLIBDIR := ../lib
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
Hi Xiao
Quoted 22 lines · Yang Xu
Quoted 13 lines
Use
INTERNAL_LIBfor 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.aQuoted 8 lines
./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
Quoted 5 lines
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?
Yes. remove this datafile/lib.a in commit message.
Quoted 4 lines
2) One question:
Is it necessary to keep lib directory(e.g./opt/ltp/lib) if we avoid installing all static libraries?
IMO, lib install directory is useless because ltp doesn't have own dynamic library and we can remove lib install target in Makefile. If you agree with this, I will do it in my v2 patch.
Best Regards
Yang Xu
Quoted 162 lines
Thanks,
Xiao YangQuoted 158 lines
Signed-off-by Yang Xu<[email protected]>---
? 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(-)
lib/Makefile +0
-0@@ -32,7 +32,7 @@ else?
FILTER_OUT_LIBSRCS??? +=tlibio.ctst_safe_sysv_ipc.c? endiflib/Makefile +1
-1-LIB??????????? := libltp.a +INTERNAL_LIB??????? := libltp.a?
pc_file??????????? := $(DESTDIR)/$(datarootdir)/pkgconfig/ltp.pclibs/libltpipc/Makefile +0
-0@@ -5,7 +5,7 @@ top_srcdir??????? ?= ../..? include $(top_srcdir)/include/mk/env_pre.mk
libs/libltpipc/Makefile +1
-1-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.mklibs/libltpnuma/Makefile +0
-0@@ -6,7 +6,7 @@ top_srcdir??????? ?= ../..? include $(top_srcdir)/include/mk/env_pre.mk
libs/libltpnuma/Makefile +1
-1-LIB??????????? := libltpnuma.a +INTERNAL_LIB??????? := libltpnuma.a? include $(top_srcdir)/include/mk/lib.mk
? include $(top_srcdir)/include/mk/generic_leaf_target.mklibs/libltpuinput/Makefile +0
-0@@ -6,7 +6,7 @@ top_srcdir??????? ?= ../..? include $(top_srcdir)/include/mk/env_pre.mk
libs/libltpuinput/Makefile +1
-1-LIB??????????? := libltpuinput.a +INTERNAL_LIB??????? := libltpuinput.a? include $(top_srcdir)/include/mk/lib.mk
? include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/containers/libclone/Makefile +0
-0@@ -22,6 +22,6 @@ top_srcdir??????? ?= ../../../..? include $(top_srcdir)/include/mk/testcases.mk
testcases/kernel/containers/libclone/Makefile +1
-1-LIB??????????? := libclone.a +INTERNAL_LIB??????? := libclone.a? include $(top_srcdir)/include/mk/lib.mk
testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +1
-1@@ -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
testcases/kernel/controllers/libcontrollers/Makefile +0
-0@@ -24,6 +24,6 @@ top_srcdir??????? ?= ../../../..? include $(top_srcdir)/include/mk/testcases.mk
testcases/kernel/controllers/libcontrollers/Makefile +1
-1-LIB??????????? := libcontrollers.a +INTERNAL_LIB??????? := libcontrollers.a? include $(top_srcdir)/include/mk/lib.mk
testcases/kernel/mem/hugetlb/lib/Makefile +0
-0@@ -21,6 +21,6 @@ top_srcdir??????? ?= ../../../../..? include $(top_srcdir)/include/mk/env_pre.mk
? include $(top_srcdir)/testcases/kernel/mem/include/libmem.mktestcases/kernel/mem/hugetlb/lib/Makefile +1
-1-LIB??????????? := libhugetlb.a +INTERNAL_LIB??????? := libhugetlb.a? include $(top_srcdir)/include/mk/lib.mk
testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +0
-0@@ -20,6 +20,6 @@ top_srcdir???????????? ?= ../../../../../..? include??????? $(top_srcdir)/include/mk/env_pre.mk
testcases/network/rpc/rpc-tirpc/tests_pack/lib/Makefile +1
-1-LIB??? := librpc-tirpc.a +INTERNAL_LIB??? := librpc-tirpc.a? include $(top_srcdir)/include/mk/lib.mk
utils/sctp/lib/Makefile +0
-0@@ -26,6 +26,6 @@ include $(top_srcdir)/include/mk/env_pre.mk? CPPFLAGS??????? += -I$(abs_srcdir)/../include
utils/sctp/lib/Makefile +1
-1-LIB??????????? := libsctp.a +INTERNAL_LIB??????? := libsctp.a? include $(top_srcdir)/include/mk/lib.mk
utils/sctp/testlib/Makefile +0
-0@@ -28,7 +28,7 @@ CPPFLAGS??????? += -DLTP -I$(abs_srcdir)/../include? LDLIBS??????????? += -lltp -lsctp
utils/sctp/testlib/Makefile +1
-1-LIB??????????? := libsctputil.a +INTERNAL_LIB??????? := libsctputil.a? #
? #DEPLIBDIR??????? := ../lib
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
In reply to Yang Xu----- Original Message -----
Quoted 13 lines
Use
INTERNAL_LIBfor 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
Quoted 8 lines
./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
With the one above omitted from commit message:
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
In reply to Yang XuHi!
Quoted 1 line
./lib/libltp.a
I wonder if we break some third party testsuite by ommitting the libltp.a from being installed but I guess that unless anybody objects here we do not care that much.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 LIB: Use INTERNAL_LIB for ltp lib
Hi Cyril
Quoted 7 lines
Hi!
Quoted 1 line
./lib/libltp.aI wonder if we break some third party testsuite by ommitting the libltp.a from being installed but I guess that unless anybody objects here we do not care that much.
Yes, only at the LTP level, there is no problem without installing these libraries.
Best Regards
Yang Xu