From 28c6425a6978609a35fd412ba6471b2ececb9698 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Jun 2017 13:44:32 +0100 Subject: [PATCH] Always change ABI in the config regardless of custom files Packaging is tuned toward having ABI-named packages, so change custom config files too, not only the default ones Change-Id: I8deae49d2b7d589d69e72da407e397ca430752af Signed-off-by: Luca Boccassi --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d77bfd00..068fd8e1 100644 --- a/debian/rules +++ b/debian/rules @@ -176,7 +176,6 @@ endif ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS))) sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \ -e 's,(RTE_NEXT_ABI=).*,\1n,' \ - -e 's,(CONFIG_RTE_MAJOR_ABI=).*,\1$(DPDK_ABI),' \ -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \ -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \ -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \ @@ -188,6 +187,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el)) sed -ri -e 's,(LIBRTE_PMD_XENVIRT=).*,\1n,' $(DPDK_STATIC_DIR)/.config endif endif + echo "CONFIG_RTE_MAJOR_ABI=\"$(DPDK_ABI)\"" >> \ + $(DPDK_STATIC_DIR)/.config dh_auto_configure override_dh_auto_build-indep: -- 2.16.6