aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-06-23 14:55:24 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-06-27 14:53:09 +0200
commit941b61362b32d1bd9ef33f062feda72d4f2febdc (patch)
tree052a547f240ccd5acaed4b55075a456d19678c5d
parent13238a66181156b55aa3015dfca690a5f590c5e7 (diff)
d/rules: unify whitespace v2
*updates in v2* rebased to match merge conflicts due to changes earlier in the series make the use of tab/spaces consistent throughout the file without discussinf or deciding which way it better (current majority wins). Change-Id: I86de3ffff1e25b3c31d8e909896e3e8c7f771912 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-rwxr-xr-xdebian/rules14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/rules b/debian/rules
index 157ce56d..ce781980 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,12 +52,12 @@ build-config:
echo EXTRA_LDFLAGS: $$EXTRA_LDFLAGS
$(MAKE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config
sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \
- -e 's,(RTE_NEXT_ABI=).*,\1n,' \
- -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' \
- -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' \
- -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
- -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \
- $(DPDK_STATIC_DIR)/.config
+ -e 's,(RTE_NEXT_ABI=).*,\1n,' \
+ -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' \
+ -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' \
+ -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
+ -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \
+ $(DPDK_STATIC_DIR)/.config
build-indep: build-config
dh_testdir
@@ -77,7 +77,7 @@ build-arch: build-config
# used to get static libraries.
cp -a $(DPDK_STATIC_DIR) $(DPDK_SHARED_DIR)
sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \
- $(DPDK_SHARED_DIR)/.config
+ $(DPDK_SHARED_DIR)/.config
$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) build
build: build-arch build-indep