Browse Source

Update debian rules

Change-Id: I6d11a572ab90cda7e07062281475b7ee57210813
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Guo Ruijing 2 years ago
parent
commit
84bb4cb502
1 changed files with 5 additions and 14 deletions
  1. 5
    14
      ovs_build/dpdk-16.04/debian/rules

+ 5
- 14
ovs_build/dpdk-16.04/debian/rules View File

@@ -33,15 +33,6 @@ clean:
33 33
 build-config:
34 34
 	dh_testdir
35 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
 
46 37
 build-indep: build-config
47 38
 	dh_testdir
@@ -127,7 +118,7 @@ binary-arch:
127 118
 	# NOTE: linker script - this becomes a nop (linker skript has no sover
128 119
 	# on its own)
129 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 122
 	# NOTE: linker script - insert basenames loop for all .so's
132 123
 	# NOTE: linker script - we also will need multiple symbol files then
133 124
 	# Package: dpdk-dev (build environment)
@@ -135,11 +126,11 @@ binary-arch:
135 126
 		DESTDIR=debian/dpdk-dev install-sdk
136 127
 	cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config
137 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 130
 	# NOTE: linker script - insert basenames loop for all .a's
140
-	ln -s /$(LIBDIR)/libdpdk.so.0 \
141
-		debian/libdpdk-dev/$(LIBDIR)/libdpdk.so
142
-	mv debian/dpdk/usr/lib/libdpdk.a debian/libdpdk-dev/$(LIBDIR)/
131
+	#ln -s /$(LIBDIR)/libdpdk.so \
132
+	#    debian/libdpdk-dev/$(LIBDIR)/libdpdk.so.0
133
+	cp -a $(DPDK_STATIC_DIR)/lib/* debian/libdpdk-dev/usr/lib/
143 134
 	mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/
144 135
 	# NOTE: linker script - package instead of removing all sublibs
145 136
 	rm -rf debian/dpdk/usr/lib*

Loading…
Cancel
Save