summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmccroskey <smccroskey@cumulusnetworks.com>2018-01-31 17:15:36 -0800
committersmccroskey <smccroskey@cumulusnetworks.com>2018-01-31 17:15:36 -0800
commita2ec1de2ce4202e83483ace8800d22628e3980db (patch)
tree6ab7df680210019d2ad48fd63334e02b26d0f8a1
parentf1aaa729ebdaa17652cb15f05c779756a6075a7e (diff)
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 <smccroskey@cumulusnetworks.com>
-rwxr-xr-xdebianpkg/backports/ubuntu12.04/debian/rules3
-rwxr-xr-xdebianpkg/backports/ubuntu14.04/debian/rules3
-rwxr-xr-xdebianpkg/rules3
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