From 84bb4cb502f61ad1778f6fbc67911811455138d2 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Fri, 5 Aug 2016 09:56:55 +0800 Subject: [PATCH] Update debian rules Change-Id: I6d11a572ab90cda7e07062281475b7ee57210813 Signed-off-by: Guo Ruijing --- ovs_build/dpdk-16.04/debian/rules | 19 +++++-------------- 1 file 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: build-config: dh_testdir $(MAKE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config - sed -ri -e 's,(RTE_MACHINE=).*,\1"default",' \ - -e 's,(RTE_NEXT_ABI=).*,\1n,' \ - -e 's,(RTE_APP_TEST=).*,\1n,' \ - -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' \ - -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' \ - -e 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' \ - -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \ - -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \ - $(DPDK_STATIC_DIR)/.config build-indep: build-config dh_testdir @@ -127,7 +118,7 @@ binary-arch: # NOTE: linker script - this becomes a nop (linker skript has no sover # on its own) rm debian/dpdk/usr/lib/libdpdk.so - cp $(DPDK_SHARED_DIR)/lib/libdpdk.so.0 debian/libdpdk0/$(LIBDIR)/ + cp -a $(DPDK_SHARED_DIR)/lib/* debian/libdpdk0/$(LIBDIR)/ # NOTE: linker script - insert basenames loop for all .so's # NOTE: linker script - we also will need multiple symbol files then # Package: dpdk-dev (build environment) @@ -135,11 +126,11 @@ binary-arch: DESTDIR=debian/dpdk-dev install-sdk cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config # Package: libdpdk-dev (bare headers and static devel libs) - mkdir -p debian/libdpdk-dev/$(LIBDIR) + mkdir -p debian/libdpdk-dev/usr/lib/ # NOTE: linker script - insert basenames loop for all .a's - ln -s /$(LIBDIR)/libdpdk.so.0 \ - debian/libdpdk-dev/$(LIBDIR)/libdpdk.so - mv debian/dpdk/usr/lib/libdpdk.a debian/libdpdk-dev/$(LIBDIR)/ + #ln -s /$(LIBDIR)/libdpdk.so \ + # debian/libdpdk-dev/$(LIBDIR)/libdpdk.so.0 + cp -a $(DPDK_STATIC_DIR)/lib/* debian/libdpdk-dev/usr/lib/ mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/ # NOTE: linker script - package instead of removing all sublibs rm -rf debian/dpdk/usr/lib*