From a2ec1de2ce4202e83483ace8800d22628e3980db Mon Sep 17 00:00:00 2001 From: smccroskey Date: Wed, 31 Jan 2018 17:15:36 -0800 Subject: [PATCH] debianpkg rules files: WANT_CUMULUS_MODE, not WANT_CUMULUS_NODE variable name seemed strange, and previously-commented-out name suggests it was a typo, remove the newly-added definitions and fix the ifeq block to reference the intended name. Signed-off-by: Silas McCroskey --- debianpkg/backports/ubuntu12.04/debian/rules | 3 +-- debianpkg/backports/ubuntu14.04/debian/rules | 3 +-- debianpkg/rules | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules index 551834b791..2e9e84faa6 100755 --- a/debianpkg/backports/ubuntu12.04/debian/rules +++ b/debianpkg/backports/ubuntu12.04/debian/rules @@ -15,7 +15,6 @@ WANT_BGP_VNC ?= 1 WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 -WANT_CUMULUS_NODE ?= 0 # If multipath is enabled (WANT_MULTIPATH=1), then set number of multipaths here # Please be aware that 0 is NOT disabled, but treated as unlimited @@ -83,7 +82,7 @@ else USE_MULTIPATH=--disable-multipath endif -ifeq ($(WANT_CUMULUS_NODE), 1) +ifeq ($(WANT_CUMULUS_MODE), 1) USE_CUMULUS=--enable-cumulus=yes else USE_CUMULUS=--enable-cumulus=no diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules index e2e3b15f1f..4f82d772c9 100755 --- a/debianpkg/backports/ubuntu14.04/debian/rules +++ b/debianpkg/backports/ubuntu14.04/debian/rules @@ -15,7 +15,6 @@ WANT_BGP_VNC ?= 1 WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 -WANT_CUMULUS_NODE ?= 0 # If multipath is enabled (WANT_MULTIPATH=1), then set number of multipaths here # Please be aware that 0 is NOT disabled, but treated as unlimited @@ -83,7 +82,7 @@ else USE_MULTIPATH=--disable-multipath endif -ifeq ($(WANT_CUMULUS_NODE), 1) +ifeq ($(WANT_CUMULUS_MODE), 1) USE_CUMULUS=--enable-cumulus=yes else USE_CUMULUS=--enable-cumulus=no diff --git a/debianpkg/rules b/debianpkg/rules index 725ccd2528..574f448dff 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -15,7 +15,6 @@ WANT_BGP_VNC ?= 1 WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 -WANT_CUMULUS_NODE ?= 0 # If multipath is enabled (WANT_MULTIPATH=1), then set number of multipaths here # Please be aware that 0 is NOT disabled, but treated as unlimited @@ -83,7 +82,7 @@ else USE_MULTIPATH=--disable-multipath endif -ifeq ($(WANT_CUMULUS_NODE), 1) +ifeq ($(WANT_CUMULUS_MODE), 1) USE_CUMULUS=--enable-cumulus=yes else USE_CUMULUS=--enable-cumulus=no -- 2.39.5