From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <mario.alfredo.c.arevalo@intel.com>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by dpdk.org (Postfix) with ESMTP id 354828E62
for <dev@dpdk.org>; Tue, 10 Nov 2015 18:07:25 +0100 (CET)
Received: from orsmga003.jf.intel.com ([10.7.209.27])
by fmsmga103.fm.intel.com with ESMTP; 10 Nov 2015 09:07:21 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.20,271,1444719600"; d="scan'208";a="682292362"
Received: from mcarril6-mobl.amr.corp.intel.com (HELO
mcarril6-mobl.zpn.intel.com) ([10.219.16.162])
by orsmga003.jf.intel.com with ESMTP; 10 Nov 2015 09:07:19 -0800
From: Mario Carrillo <mario.alfredo.c.arevalo@intel.com>
To: dev@dpdk.org
Date: Tue, 10 Nov 2015 11:07:32 -0600
Message-Id: <1447175260-26162-3-git-send-email-mario.alfredo.c.arevalo@intel.com>
X-Mailer: git-send-email 2.6.1.120.g24a00ef
In-Reply-To: <1447175260-26162-1-git-send-email-mario.alfredo.c.arevalo@intel.com>
References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com>
<1447175260-26162-1-git-send-email-mario.alfredo.c.arevalo@intel.com>
Cc: jos.c.venegas.munoz@intel.com
Subject: [dpdk-dev] [PATCH v6 02/10] mk: Add rule for installing app files
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2015 17:07:25 -0000
Add hierarchy-file support to the DPDK app files,
nic bind file and cpu layout file
when invoking "make install-bin" app files will
be installed in: $(DESTDIR)/$(BIN_DIR)
where BIN_DIR=$(RTE_PREFIX)/usr/local/bin and RTE_PREFIX=/usr/local by
default, you can override RTE_PREFIX and BIN_DIR vars.
This hierarchy is based on:
http://www.freedesktop.org/software/systemd/man/file-hierarchy.html
Signed-off-by: Mario Carrillo <mario.alfredo.c.arevalo@intel.com>
---
mk/rte.sdkinstall.mk | 18 ++++++++++++++++++
mk/rte.sdkroot.mk | 4 ++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 2daae1d..94fb945 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -44,7 +44,11 @@ T=*
ifneq (,$(wildcard $(RTE_OUTPUT)/.config))
RTE_PREFIX ?= /usr/local
INCLUDE_DIR ?= $(RTE_PREFIX)/include/dpdk
+BIN_DIR ?= $(RTE_PREFIX)/bin
HSLINKS := $(shell find $(RTE_OUTPUT)/include/ -name *.h)
+BINARY_FILES := $(patsubst %.map,,$(wildcard $(RTE_OUTPUT)/app/*))
+NIC_FILES := $(wildcard $(RTE_SDK)/tools/*.py)
+BINARY_FILES += $(NIC_FILES)
endif
endif
@@ -95,6 +99,20 @@ install-headers:
done \
fi
#
+# install app files in /usr/local/bin by default
+# RTE_PREFIX and BIN_DIR can be overridden.
+#
+.PHONY: install-bin
+install-bin:
+ @echo ================== Installing app files;
+ @if [ ! -z "${BINARY_FILES}" ]; then \
+ [ -d $(DESTDIR)/$(BIN_DIR) ] || mkdir -p $(DESTDIR)/$(BIN_DIR); \
+ for BIN_FILE in ${BINARY_FILES}; do \
+ cp -rf $$BIN_FILE ${DESTDIR}/${BIN_DIR}; \
+ echo installing: $$BIN_FILE; \
+ done \
+ fi
+#
# uninstall: remove all built sdk
#
UNINSTALL_TARGETS := $(addsuffix _uninstall,\
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index 8477a2b..24eaa60 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -97,8 +97,8 @@ test fast_test ring_test mempool_test perf_test coverage:
testall:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@
-.PHONY: install install-headers uninstall
-install install-headers uninstall:
+.PHONY: install install-headers install-bin uninstall
+install install-headers install-bin uninstall:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@
.PHONY: doc help
--
2.6.1.120.g24a00ef