diff options
author | Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2047-10-21 11:59:01 +0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-07-22 13:36:58 -0500 |
commit | 1827f6aa3048c61e6d6f174016fb61a614dbf3eb (patch) | |
tree | ffb659fec821d41b029fc89119ff3b0ac1229864 /meta-isg/common/recipes-extended/dpdk/dpdk.inc | |
parent | 9fc3a8235c53bf8fdda96b5c1178897a5eac5a67 (diff) | |
download | meta-intel-1827f6aa3048c61e6d6f174016fb61a614dbf3eb.tar.gz |
meta-isg: dpdk: simplify do_install
Using makefile for installing targets.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'meta-isg/common/recipes-extended/dpdk/dpdk.inc')
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk.inc | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index 6228e7fd..b1b56c92 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -8,6 +8,7 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ | |||
8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ |
10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | 10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ |
11 | file://dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 14 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" |
@@ -40,7 +41,8 @@ export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" | |||
40 | export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" | 41 | export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" |
41 | export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" | 42 | export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" |
42 | export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" | 43 | export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" |
43 | export INSTALL_PATH = "${prefix}/dpdk" | 44 | export INSTALL_PATH = "${prefix}/share" |
45 | export RTE_OUTPUT = "${S}/${RTE_TARGET}" | ||
44 | export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" | 46 | export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" |
45 | export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" | 47 | export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" |
46 | export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" | 48 | export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" |
@@ -97,30 +99,9 @@ do_compile () { | |||
97 | } | 99 | } |
98 | 100 | ||
99 | do_install () { | 101 | do_install () { |
100 | 102 | oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D} | |
101 | install -m 0755 -d ${D}/${INSTALL_PATH} \ | 103 | oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR} |
102 | ${D}/${INSTALL_PATH}/doc \ | 104 | oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D} |
103 | ${D}/${INSTALL_PATH}/tools \ | ||
104 | ${D}/${INSTALL_PATH}/${RTE_TARGET} \ | ||
105 | ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \ | ||
106 | ${D}${includedir} \ | ||
107 | ${D}${includedir}/${ARCHDIR} \ | ||
108 | ${D}${includedir}/exec-env \ | ||
109 | ${D}${libdir} \ | ||
110 | ${D}${MODULE_DIR} | ||
111 | |||
112 | install -m 0755 ${S}/${RTE_TARGET}/kmod/*.ko ${D}${MODULE_DIR}/ | ||
113 | |||
114 | install -m 640 ${S}/${RTE_TARGET}/lib/*.a ${D}${libdir} | ||
115 | |||
116 | install -m 640 ${S}/${RTE_TARGET}/.config ${D}/${INSTALL_PATH}/${RTE_TARGET}/ | ||
117 | install -m 640 ${S}/${RTE_TARGET}/include/*.h ${D}${includedir}/ | ||
118 | install -m 640 ${S}/${RTE_TARGET}/include/${ARCHDIR}/*.h ${D}${includedir}/${ARCHDIR}/ | ||
119 | install -m 640 ${S}/${RTE_TARGET}/include/exec-env/*.h ${D}${includedir}/exec-env/ | ||
120 | install -m 0755 ${S}/tools/*.py ${D}/${INSTALL_PATH}/tools/ | ||
121 | |||
122 | # Install applications | ||
123 | install -m 0755 ${S}/${RTE_TARGET}/app/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/app/ | ||
124 | 105 | ||
125 | # Install examples | 106 | # Install examples |
126 | for dirname in ${S}/examples/* | 107 | for dirname in ${S}/examples/* |
@@ -138,9 +119,6 @@ PACKAGES += "${PN}-examples" | |||
138 | 119 | ||
139 | FILES_${PN}-dbg += " \ | 120 | FILES_${PN}-dbg += " \ |
140 | ${INSTALL_PATH}/.debug \ | 121 | ${INSTALL_PATH}/.debug \ |
141 | ${INSTALL_PATH}/${RTE_TARGET}/app/.debug \ | ||
142 | ${INSTALL_PATH}/${RTE_TARGET}/hostapp/.debug \ | ||
143 | ${INSTALL_PATH}/${RTE_TARGET}/app/*.map \ | ||
144 | ${INSTALL_PATH}/examples/*/.debug \ | 122 | ${INSTALL_PATH}/examples/*/.debug \ |
145 | " | 123 | " |
146 | 124 | ||
@@ -153,12 +131,16 @@ FILES_${PN}-dev += " \ | |||
153 | ${includedir} \ | 131 | ${includedir} \ |
154 | ${includedir}/${ARCHDIR} \ | 132 | ${includedir}/${ARCHDIR} \ |
155 | ${includedir}/exec-env \ | 133 | ${includedir}/exec-env \ |
134 | ${INSTALL_PATH}/scripts/ \ | ||
135 | ${INSTALL_PATH}/${RTE_TARGET}/include \ | ||
136 | ${INSTALL_PATH}/${RTE_TARGET}/lib \ | ||
156 | " | 137 | " |
157 | 138 | ||
158 | FILES_${PN} += " ${INSTALL_PATH}/tools/ " | 139 | FILES_${PN} += " ${INSTALL_PATH}/tools/ \ |
159 | 140 | ${prefix}/sbin/ \ | |
141 | ${prefix}/bin/ \ | ||
142 | ${libdir}/ \ | ||
143 | " | ||
160 | FILES_${PN}-examples += " \ | 144 | FILES_${PN}-examples += " \ |
161 | ${INSTALL_PATH}/${RTE_TARGET}/app/* \ | ||
162 | ${INSTALL_PATH}/${RTE_TARGET}/hostapp/* \ | ||
163 | ${INSTALL_PATH}/examples/* \ | 145 | ${INSTALL_PATH}/examples/* \ |
164 | " | 146 | " |