summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-08-05 09:56:55 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-08-05 09:56:55 +0800
commit84bb4cb502f61ad1778f6fbc67911811455138d2 (patch)
tree2abc7773e635fbfbd26c49a0eaab7ffb47f951d6
parentab30dcb7fb248a58c672f35e830f97634db4c8ae (diff)
Update debian rules
Change-Id: I6d11a572ab90cda7e07062281475b7ee57210813 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 05 Aug 2016 01:54:15 +0000 Reviewed-on: https://review.openstack.org/351455 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rwxr-xr-xovs_build/dpdk-16.04/debian/rules19
1 files changed, 5 insertions, 14 deletions
diff --git a/ovs_build/dpdk-16.04/debian/rules b/ovs_build/dpdk-16.04/debian/rules
index a479f02..f2f5a17 100755
--- a/ovs_build/dpdk-16.04/debian/rules
+++ b/ovs_build/dpdk-16.04/debian/rules
@@ -33,15 +33,6 @@ clean:
33build-config: 33build-config:
34 dh_testdir 34 dh_testdir
35 $(MAKE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config 35 $(MAKE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config
36 sed -ri -e 's,(RTE_MACHINE=).*,\1"default",' \
37 -e 's,(RTE_NEXT_ABI=).*,\1n,' \
38 -e 's,(RTE_APP_TEST=).*,\1n,' \
39 -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' \
40 -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' \
41 -e 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' \
42 -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
43 -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \
44 $(DPDK_STATIC_DIR)/.config
45 36
46build-indep: build-config 37build-indep: build-config
47 dh_testdir 38 dh_testdir
@@ -127,7 +118,7 @@ binary-arch:
127 # NOTE: linker script - this becomes a nop (linker skript has no sover 118 # NOTE: linker script - this becomes a nop (linker skript has no sover
128 # on its own) 119 # on its own)
129 rm debian/dpdk/usr/lib/libdpdk.so 120 rm debian/dpdk/usr/lib/libdpdk.so
130 cp $(DPDK_SHARED_DIR)/lib/libdpdk.so.0 debian/libdpdk0/$(LIBDIR)/ 121 cp -a $(DPDK_SHARED_DIR)/lib/* debian/libdpdk0/$(LIBDIR)/
131 # NOTE: linker script - insert basenames loop for all .so's 122 # NOTE: linker script - insert basenames loop for all .so's
132 # NOTE: linker script - we also will need multiple symbol files then 123 # NOTE: linker script - we also will need multiple symbol files then
133 # Package: dpdk-dev (build environment) 124 # Package: dpdk-dev (build environment)
@@ -135,11 +126,11 @@ binary-arch:
135 DESTDIR=debian/dpdk-dev install-sdk 126 DESTDIR=debian/dpdk-dev install-sdk
136 cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config 127 cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config
137 # Package: libdpdk-dev (bare headers and static devel libs) 128 # Package: libdpdk-dev (bare headers and static devel libs)
138 mkdir -p debian/libdpdk-dev/$(LIBDIR) 129 mkdir -p debian/libdpdk-dev/usr/lib/
139 # NOTE: linker script - insert basenames loop for all .a's 130 # NOTE: linker script - insert basenames loop for all .a's
140 ln -s /$(LIBDIR)/libdpdk.so.0 \ 131 #ln -s /$(LIBDIR)/libdpdk.so \
141 debian/libdpdk-dev/$(LIBDIR)/libdpdk.so 132 # debian/libdpdk-dev/$(LIBDIR)/libdpdk.so.0
142 mv debian/dpdk/usr/lib/libdpdk.a debian/libdpdk-dev/$(LIBDIR)/ 133 cp -a $(DPDK_STATIC_DIR)/lib/* debian/libdpdk-dev/usr/lib/
143 mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/ 134 mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/
144 # NOTE: linker script - package instead of removing all sublibs 135 # NOTE: linker script - package instead of removing all sublibs
145 rm -rf debian/dpdk/usr/lib* 136 rm -rf debian/dpdk/usr/lib*