From: Susant Sahani <susant@redhat.com>
Date: Tue, 25 Apr 2017 15:00:34 +0000 (+0530)
Subject: meson: add geneve to build system
X-Git-Tag: v234~285^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5804%2Fhead;p=thirdparty%2Fsystemd.git

meson: add geneve to build system

```
[107/1793] Compiling c object 'src/basic/basic@sta/log.c.o'
In file included from ../src/basic/log.c:44:0:
../src/basic/missing.h:762:6: warning: "HAVE_DECL_IFLA_GENEVE_LABEL" is not defined, evaluates to 0 [-Wundef]
^~~~~~~~~~~~~~~~~~~~~~~~~~~
[108/1793] Compiling c object 'src/basic/basic@sta/path-util.c.o'
In file included from ../src/basic/path-util.c:40:0:
../src/basic/missing.h:762:6: warning: "HAVE_DECL_IFLA_GENEVE_LABEL" is not defined, evaluates to 0 [-Wundef]
^~~~~~~~~~~~~~~~~~~~~~~~~~~

```
---

diff --git a/meson.build b/meson.build
index 71cc431157c..b18e645d39d 100644
--- a/meson.build
+++ b/meson.build
@@ -374,6 +374,7 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
                 ['IFLA_VLAN_PROTOCOL',               'linux/if_link.h'],
                 ['IFLA_VXLAN_REMCSUM_NOPARTIAL',     'linux/if_link.h'],
                 ['IFLA_VXLAN_GPE',                   'linux/if_link.h'],
+                ['IFLA_GENEVE_LABEL',                'linux/if_link.h'],
                 # if_tunnel.h is buggy and cannot be included on its own
                 ['IFLA_VTI_REMOTE',                  'linux/if_tunnel.h', '#include <net/if.h>'],
                 ['IFLA_IPTUN_ENCAP_DPORT',           'linux/if_tunnel.h', '#include <net/if.h>'],
diff --git a/src/network/meson.build b/src/network/meson.build
index 6bbada397d0..94bbb156aae 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -25,6 +25,8 @@ sources = files('''
         netdev/vrf.h
         netdev/vxlan.c
         netdev/vxlan.h
+        netdev/geneve.c
+        netdev/geneve.h
         networkd-address-pool.c
         networkd-address-pool.h
         networkd-address.c