Merge pull request #11072 from yuwata/fix-networkctl-ip6gre

networkctl: fix TYPE field of ip6gre devices

src/basic/arphrd-list.c

@@ -6,6 +6,7 @@
 
 #include "arphrd-list.h"
 #include "macro.h"
+#include "missing_network.h"
 
 static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
 

src/basic/generate-af-list.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 
-$1 -E -dM -include sys/socket.h - </dev/null | \
+$1 -E -dM -include sys/socket.h -include "$2" -include "$3" - </dev/null | \
         grep -Ev 'AF_UNSPEC|AF_MAX' | \
         awk '/^#define[ \t]+AF_[^ \t]+[ \t]+[AP]F_[^ \t]/ { print $2; }'

src/basic/generate-arphrd-list.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 
-$1 -dM -include net/if_arp.h - </dev/null | \
+$1 -dM -include net/if_arp.h -include "$2" -include "$3" - </dev/null | \
         awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
         sed -e 's/ARPHRD_//'

src/basic/meson.build

@@ -91,6 +91,7 @@ basic_sources = files('''
         memfd-util.h
         mempool.c
         mempool.h
+        missing.h
         missing_audit.h
         missing_btrfs.h
         missing_btrfs_tree.h
@@ -209,27 +210,30 @@ basic_sources = files('''
         xattr-util.h
 '''.split())
 
-missing_h = files('missing.h')
+missing_audit_h = files('missing_audit.h')
+missing_capability_h = files('missing_capability.h')
+missing_network_h = files('missing_network.h')
+missing_socket_h = files('missing_socket.h')
 
 generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
         'af-list.txt',
         output : 'af-list.txt',
-        command : [generate_af_list, cpp],
+        command : [generate_af_list, cpp, config_h, missing_socket_h],
         capture : true)
 
 generate_arphrd_list = find_program('generate-arphrd-list.sh')
 arphrd_list_txt = custom_target(
         'arphrd-list.txt',
         output : 'arphrd-list.txt',
-        command : [generate_arphrd_list, cpp],
+        command : [generate_arphrd_list, cpp, config_h, missing_network_h],
         capture : true)
 
 generate_cap_list = find_program('generate-cap-list.sh')
 cap_list_txt = custom_target(
         'cap-list.txt',
         output : 'cap-list.txt',
-        command : [generate_cap_list, cpp, config_h, missing_h],
+        command : [generate_cap_list, cpp, config_h, missing_capability_h],
         capture : true)
 
 generate_errno_list = find_program('generate-errno-list.sh')
@@ -278,7 +282,7 @@ foreach item : [['af',     af_list_txt,     'af',         ''],
         generated_gperf_headers += [target1, target2]
 endforeach
 
-basic_sources += [missing_h] + generated_gperf_headers
+basic_sources += generated_gperf_headers
 basic_gcrypt_sources = files(
         'gcrypt-util.c',
         'gcrypt-util.h')

src/basic/missing_network.h

@@ -50,6 +50,11 @@
 #define IFA_F_MCAUTOJOIN 0x400
 #endif
 
+/* if_arp.h */
+#ifndef ARPHRD_IP6GRE
+#define ARPHRD_IP6GRE 823
+#endif
+
 /* if_bonding.h */
 #ifndef BOND_XMIT_POLICY_ENCAP23
 #define BOND_XMIT_POLICY_ENCAP23 3

src/journal/audit-type.c

@@ -1,12 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <stdio.h>
-#include <linux/audit.h>
-#if HAVE_AUDIT
-#  include <libaudit.h>
-#endif
-
-#include "missing.h"
 #include "audit-type.h"
+#include "missing_audit.h"
+
 #include "audit_type-to-name.h"
-#include "macro.h"

src/journal/audit-type.h

@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <alloca.h>
+#include <stdio.h>
+
 #include "macro.h"
 
 const char *audit_type_to_string(int type);

src/journal/meson.build

@@ -34,7 +34,7 @@ endif
 ############################################################
 
 audit_type_includes = [config_h,
-                       missing_h,
+                       missing_audit_h,
                        'linux/audit.h']
 if conf.get('HAVE_AUDIT') == 1
         audit_type_includes += 'libaudit.h'

src/test/test-arphrd-list.c

@@ -4,8 +4,8 @@
 #include <string.h>
 
 #include "macro.h"
+#include "missing_network.h"
 #include "string-util.h"
-#include "util.h"
 
 _unused_ \
 static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);