]> git.puffer.fish Git - matthieu/frr.git/commitdiff
debian: work around NetDef CI missing lua packages
authorQuentin Young <qlyoung@nvidia.com>
Thu, 10 Dec 2020 18:09:56 +0000 (13:09 -0500)
committerQuentin Young <qlyoung@nvidia.com>
Thu, 10 Dec 2020 18:09:56 +0000 (13:09 -0500)
Scripting must be explicitly enabled now when building packages via the
pkg.frr.lua Debian profile

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
debian/control
debian/rules

index f0ad02d15c0af9a628577bcc003aa55a9ac6f80e..b9e96b55d0eab385cda36f642b585f8ccefdb403 100644 (file)
@@ -30,7 +30,7 @@ Build-Depends: bison,
                python3-pytest <!nocheck>,
                python3-sphinx,
                texinfo (>= 4.7),
-               liblua5.3-dev <!pkg.frr.nolua>
+               liblua5.3-dev <pkg.frr.lua>
 Standards-Version: 4.5.0.3
 Homepage: https://www.frrouting.org/
 Vcs-Browser: https://github.com/FRRouting/frr/tree/debian/master
index 2fd5bc75efeef202037805e17bf393f8b8b2e820..25ae04261d3d1d400066d5749831eb152d9f154e 100755 (executable)
@@ -29,10 +29,10 @@ else
   CONF_SYSTEMD=--enable-systemd=no
 endif
 
-ifeq ($(filter pkg.frr.nolua,$(DEB_BUILD_PROFILES)),)
-  CONF_LUA=--enable-scripting
-else
+ifeq ($(filter pkg.frr.lua,$(DEB_BUILD_PROFILES)),)
   CONF_LUA=--disable-scripting
+else
+  CONF_LUA=--enable-scripting
 endif
 
 export PYTHON=python3