[dpdk-dev] [PATCH v3 06/13] mk: split install rule

Arevalo, Mario Alfredo C mario.alfredo.c.arevalo at intel.com
Tue Dec 8 00:22:41 CET 2015


Hi Thomas,

I'm testing this set of patches that has been applied, and I haven't noticed before
that you exclude some binaries in "install-runtime" (test, testpipeline, testacl etc...), I would like
to ask you the reason about this :)
 
Thanks.
Mario. 
________________________________________
From: Thomas Monjalon [thomas.monjalon at 6wind.com]
Sent: Thursday, December 03, 2015 5:45 AM
To: dev at dpdk.org
Cc: olivier.matz at 6wind.com; Arevalo, Mario Alfredo C; Richardson, Bruce; Panu Matilainen
Subject: [PATCH v3 06/13] mk: split install rule

Provides new sub-rules to install runtime and sdk separately.

The build directory must be changed from BUILD_DIR to O in install
rules to avoid a bad recursive effect (O being BUILD_DIR being O + T).

Suggested-by: Mario Carrillo <mario.alfredo.c.arevalo at intel.com>
Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
Acked-by: Panu Matilainen <pmatilai at redhat.com>
---
 mk/rte.sdkinstall.mk | 18 ++++++++++++------
 mk/rte.sdkroot.mk    |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index dc57baf..ec093d3 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -93,25 +93,31 @@ ifeq ($(DESTDIR)$(if $T,,+),)
        @echo Installation cannot run with T defined and DESTDIR undefined
 else
        @echo ================== Installing $(DESTDIR)$(prefix)/
+       $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime
+       $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk
+       @echo Installation in $(DESTDIR)$(prefix)/ complete
+endif
+
+install-runtime:
        $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
-       $(Q)cp -a $(RTE_OUTPUT)/lib/* $(DESTDIR)$(libdir)
+       $(Q)cp -a    $O/lib/* $(DESTDIR)$(libdir)
        $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
-       $(Q)tar -cf -      -C $(RTE_OUTPUT) app  --exclude 'app/*.map' \
+       $(Q)tar -cf -      -C $O app  --exclude 'app/*.map' \
                --exclude 'app/cmdline*' --exclude app/test \
                --exclude app/testacl --exclude app/testpipeline | \
            tar -xf -      -C $(DESTDIR)$(bindir) --strip-components=1 \
                --keep-newer-files --warning=no-ignore-newer
        $(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
        $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir)
+
+install-sdk:
        $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir))
-       $(Q)tar -chf -     -C $(RTE_OUTPUT) include | \
+       $(Q)tar -chf -     -C $O include | \
            tar -xf -      -C $(DESTDIR)$(includedir) --strip-components=1 \
                --keep-newer-files --warning=no-ignore-newer
        $(Q)$(call rte_mkdir,                            $(DESTDIR)$(sdkdir))
        $(Q)cp -a               $(RTE_SDK)/{mk,scripts}  $(DESTDIR)$(sdkdir)
        $(Q)$(call rte_mkdir,                            $(DESTDIR)$(targetdir))
-       $(Q)cp -a               $(RTE_OUTPUT)/.config    $(DESTDIR)$(targetdir)
+       $(Q)cp -a               $O/.config               $(DESTDIR)$(targetdir)
        $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
        $(Q)$(call rte_symlink, $(DESTDIR)$(libdir),     $(DESTDIR)$(targetdir)/lib)
-       @echo Installation in $(DESTDIR)$(prefix)/ complete
-endif
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index 533afe9..2424dce 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -97,6 +97,8 @@ test fast_test ring_test mempool_test perf_test coverage:
 install:
        $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install
        $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@
+install-%:
+       $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@

 .PHONY: doc help
 doc: doc-all
--
2.5.2



More information about the dev mailing list