include: move trivial kernel header wrappers to src/include/override/

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index e643c71714dc438b435cccab725733c64f875e3e..f3270ff2787b50c19a0de1b96a4ede202e0ebb59 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/fs.h>
+#include <linux/magic.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/xattr.h>
@@ -18,8 +20,6 @@
 #include "fs-util.h"
 #include "log.h"
 #include "login-util.h"
-#include "missing_fs.h"
-#include "missing_magic.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pidref.h"

diff --git a/src/basic/check-filesystems.sh b/src/basic/check-filesystems.sh
index 696ef610acc98d5fdb5a38f6654af26bada02cff..e36890cca1abbc902b2a849670e3c23fab4e3723 100755 (executable)
--- a/src/basic/check-filesystems.sh
+++ b/src/basic/check-filesystems.sh
@@ -3,19 +3,14 @@
 set -eu
 set -o pipefail
 
-cpp="$1"
-filesystems_gperf="$2"
+cpp="${1:?}"
+filesystems_gperf="${2:?}"
 shift 2
 
-includes=""
-for i in "$@"; do
-    includes="$includes -include $i"
-done
-
 error=false
 
 # shellcheck disable=SC2086
-for fs in $($cpp -dM $includes - </dev/null | \
+for fs in $($cpp -dM -include linux/magic.h "$@" - </dev/null | \
             grep -E '_MAGIC' | \
             grep -vE 'LINUX_MAGIC' | \
             awk '/^#define[ \t]+[A-Z0-9_]+MAGIC[ \t]+/ { print $2; }'); do

diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf
index 23c9372af23b6f237b517eedf2229f58d3297fe5..13db51db2201c2c214ebb8b5f762dad47abc9963 100644 (file)
--- a/src/basic/filesystems-gperf.gperf
+++ b/src/basic/filesystems-gperf.gperf
@@ -6,7 +6,6 @@ _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
 #include <linux/magic.h>
 
 #include "filesystems.h"
-#include "missing_magic.h"
 #include "stat-util.h"
 
 struct FilesystemMagic {

diff --git a/src/basic/meson.build b/src/basic/meson.build
index ece4bf1e9227da6e8ce05c366b714f089d00cea9..b03df4a9a4cd254f6fe040b077cc566d45e021ba 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -119,8 +119,6 @@ basic_sources = files(
 
 sources += basic_sources
 
-missing_audit_h = files('missing_audit.h')
-
 generated_gperf_headers = []
 foreach item : [
         # name,    source,         struct name,  prefix,    headers
@@ -173,17 +171,13 @@ basic_sources += generated_gperf_headers
 
 ############################################################
 
-filesystem_includes = files(
-        '../include/uapi/linux/magic.h',
-        'missing_magic.h',
-)
-
 check_filesystems = find_program('check-filesystems.sh')
 r = run_command(
         [
                 'env', '--chdir', meson.project_build_root(),
-                check_filesystems, cpp, files('filesystems-gperf.gperf')
-        ] + filesystem_includes,
+                check_filesystems, cpp, files('filesystems-gperf.gperf'),
+                system_include_args,
+        ],
         check: false,
 )
 if r.returncode() != 0

diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
index ba1941a0a535c557a3e8c7acf44f3d8b7a69a254..c8ee38b4f121728a2f04d27793c313047d18c23a 100644 (file)
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/magic.h>
+#include <linux/nsfs.h>
 #include <sched.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -10,8 +12,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
-#include "missing_magic.h"
-#include "missing_namespace.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "parse-util.h"

diff --git a/src/basic/pidfd-util.c b/src/basic/pidfd-util.c
index 78f8dc41c6bb1128fa66e90c77972ba03ab33d08..965f0b86da4894ce1e25dca05e37aaa567bd0666 100644 (file)
--- a/src/basic/pidfd-util.c
+++ b/src/basic/pidfd-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/fs.h>
+#include <linux/magic.h>
 #include <sys/ioctl.h>
 #include <threads.h>
 #include <unistd.h>
@@ -7,8 +9,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing_fs.h"
-#include "missing_magic.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "pidfd-util.h"

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 94b4f55c3492b757ed020bc3e7c3122083a27982..72360daadfefb5ee4bdb0f02355973a7a4e52c95 100644 (file)
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/magic.h>
 #include <sys/statvfs.h>
 #include <unistd.h>
 
@@ -13,7 +14,6 @@
 #include "fs-util.h"
 #include "hash-funcs.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "mountpoint-util.h"
 #include "path-util.h"
 #include "siphash24.h"

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 65bdd75f315a0de6bbb265f724d9d754ee8890fa..e15004981bf00fc00189ab3f607a980c5fed92f9 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -2,6 +2,7 @@
 
 #include <fcntl.h>
 #include <linux/kd.h>
+#include <linux/magic.h>
 #include <linux/tiocl.h>
 #include <linux/vt.h>
 #include <poll.h>
@@ -27,7 +28,6 @@
 #include "inotify-util.h"
 #include "io-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "namespace-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/core/bpf-foreign.c b/src/core/bpf-foreign.c
index 962ff88b557a8ff10fab3022bad985736fc4915a..73933e131afdbbb2dc92ee7344797da0f290da05 100644 (file)
--- a/src/core/bpf-foreign.c
+++ b/src/core/bpf-foreign.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/bpf.h>
+#include <linux/magic.h>
 
 #include "alloc-util.h"
 #include "bpf-foreign.h"
@@ -8,7 +9,6 @@
 #include "cgroup.h"
 #include "hash-funcs.h"
 #include "hashmap.h"
-#include "missing_magic.h"
 #include "siphash24.h"
 #include "stat-util.h"
 #include "unit.h"

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 166fdf253ab6d2ae24f990e396217a4d64c3871d..c384d67898a012cd30f72985ad2991a4d49bb8a4 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/loop.h>
+#include <linux/magic.h>
 #include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +30,6 @@
 #include "log.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
-#include "missing_magic.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

diff --git a/src/core/service.c b/src/core/service.c
index aabaaedf5df6484077b8c7ddf4a85385bce8fa26..8d7dade83d31245b4514d66841efd1254af44575 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/audit.h>
 #include <math.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -31,7 +32,6 @@
 #include "image-policy.h"
 #include "log.h"
 #include "manager.h"
-#include "missing_audit.h"
 #include "mount-util.h"
 #include "namespace.h"
 #include "open-file.h"

diff --git a/src/creds/creds.c b/src/creds/creds.c
index d9845987ad7311e01332bd7de430d1530e8c9cca..a121d0695b9be7dd05135b203ba6c589191c87da 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <linux/magic.h>
 #include <unistd.h>
 
 #include "sd-json.h"
@@ -23,7 +24,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "missing_magic.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"

diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c
index 5c6bd280880bc871966f6891aa5a5be9062dbf71..2d6a549c22532a76f092b8132f495a0ba752eb20 100644 (file)
--- a/src/home/homework-luks.c
+++ b/src/home/homework-luks.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/loop.h>
+#include <linux/magic.h>
 #include <poll.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
@@ -45,7 +46,6 @@
 #include "keyring-util.h"
 #include "loop-util.h"
 #include "memory-util.h"
-#include "missing_magic.h"
 #include "mkdir.h"
 #include "mkfs-util.h"
 #include "openssl-util.h"

diff --git a/src/home/homework-quota.c b/src/home/homework-quota.c
index f8affe58eded83772206646738523b6efb4966ba..448f8f17296f1656653cd08659c08681a6faf17b 100644 (file)
--- a/src/home/homework-quota.c
+++ b/src/home/homework-quota.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
+
 #include "btrfs-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -7,7 +9,6 @@
 #include "homework-quota.h"
 #include "log.h"
 #include "memory-util.h"
-#include "missing_magic.h"
 #include "quota-util.h"
 #include "stat-util.h"
 #include "user-record.h"

diff --git a/src/home/homework.c b/src/home/homework.c
index 1056d27b8b45d4bc9035af89080895f30e9160c1..e796f125fb56e3e6f308351d83e756c95781fa1e 100644 (file)
--- a/src/home/homework.c
+++ b/src/home/homework.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <unistd.h>
@@ -35,7 +36,6 @@
 #include "loop-util.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "missing_magic.h"
 #include "mount-util.h"
 #include "path-util.h"
 #include "recovery-key.h"

diff --git a/src/include/meson.build b/src/include/meson.build
index 9786723b1b26ec3d07929f8151b0705cf0a85044..8277574b4d93f7d84204170d63b89bc6dca8cf9d 100644 (file)
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -33,6 +33,11 @@ ipproto_sources = files(
         'uapi/linux/in.h',
 )
 
+# Source files that provides AUDIT_XYZ
+audit_sources = files(
+        'override/linux/audit.h',
+)
+
 # Source files that provides KEY_XYZ
 keyboard_sources = files(
         'uapi/linux/input.h',

diff --git a/src/basic/missing_audit.h b/src/include/override/linux/audit.h
similarity index 66%
rename from src/basic/missing_audit.h
rename to src/include/override/linux/audit.h
index ff95e5e88a5ec9dd470409158462ac88def68668..abdd25b37921a8749ebff14c437a19ce7b8ff27d 100644 (file)
--- a/src/basic/missing_audit.h
+++ b/src/include/override/linux/audit.h
@@ -1,13 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/audit.h>        /* IWYU pragma: export */
+#include_next <linux/audit.h>   /* IWYU pragma: export */
 
 #if HAVE_AUDIT
 #  include <libaudit.h>         /* IWYU pragma: export */
 #endif
 
-/* We use _Static_assert() directly here instead of assert_cc()
+#include <assert.h>
+
+/* We use static_assert() directly here instead of assert_cc()
  * because if we include macro.h in this header, the invocation
  * of generate-audit_type-list.sh becomes more complex.
  */
@@ -15,17 +17,17 @@
 #ifndef AUDIT_SERVICE_START
 #  define AUDIT_SERVICE_START 1130 /* Service (daemon) start */
 #else
-_Static_assert(AUDIT_SERVICE_START == 1130, "");
+static_assert(AUDIT_SERVICE_START == 1130, "");
 #endif
 
 #ifndef AUDIT_SERVICE_STOP
 #  define AUDIT_SERVICE_STOP 1131 /* Service (daemon) stop */
 #else
-_Static_assert(AUDIT_SERVICE_STOP == 1131, "");
+static_assert(AUDIT_SERVICE_STOP == 1131, "");
 #endif
 
 #ifndef MAX_AUDIT_MESSAGE_LENGTH
 #  define MAX_AUDIT_MESSAGE_LENGTH 8970
 #else
-_Static_assert(MAX_AUDIT_MESSAGE_LENGTH == 8970, "");
+static_assert(MAX_AUDIT_MESSAGE_LENGTH == 8970, "");
 #endif

diff --git a/src/basic/missing_fs.h b/src/include/override/linux/fs.h
similarity index 84%
rename from src/basic/missing_fs.h
rename to src/include/override/linux/fs.h
index d07042a48abaa9acba2c1a1cd5814092a26ca311..594b1638cca066786bd1fdbba29439a8c891021e 100644 (file)
--- a/src/basic/missing_fs.h
+++ b/src/include/override/linux/fs.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/fs.h> /* IWYU pragma: export */
+#include_next <linux/fs.h>      /* IWYU pragma: export */
 
 /* Not exposed yet. Defined at fs/ext4/ext4.h */
 #ifndef EXT4_IOC_RESIZE_FS

diff --git a/src/basic/missing_magic.h b/src/include/override/linux/magic.h
similarity index 73%
rename from src/basic/missing_magic.h
rename to src/include/override/linux/magic.h
index b5357d4f685735c099f1a0960ae7516b38875b23..d940fa54a26048af15592a3735c0fc4d75238ed8 100644 (file)
--- a/src/basic/missing_magic.h
+++ b/src/include/override/linux/magic.h
@@ -1,102 +1,104 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/magic.h> /* IWYU pragma: export */
+#include_next <linux/magic.h>   /* IWYU pragma: export */
+
+#include <assert.h>
 
 /* Not exposed yet (4.20). Defined at ipc/mqueue.c */
 #ifndef MQUEUE_MAGIC
 #  define MQUEUE_MAGIC 0x19800202
 #else
-assert_cc(MQUEUE_MAGIC == 0x19800202);
+static_assert(MQUEUE_MAGIC == 0x19800202, "");
 #endif
 
 /* b1123ea6d3b3da25af5c8a9d843bd07ab63213f4 (4.8), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
 #ifndef BALLOON_KVM_MAGIC
 #  define BALLOON_KVM_MAGIC 0x13661366
 #else
-assert_cc(BALLOON_KVM_MAGIC == 0x13661366);
+static_assert(BALLOON_KVM_MAGIC == 0x13661366, "");
 #endif
 
 /* 48b4800a1c6af2cdda344ea4e2c843dcc1f6afc9 (4.8), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
 #ifndef ZSMALLOC_MAGIC
 #  define ZSMALLOC_MAGIC 0x58295829
 #else
-assert_cc(ZSMALLOC_MAGIC == 0x58295829);
+static_assert(ZSMALLOC_MAGIC == 0x58295829, "");
 #endif
 
 /* ea8157ab2ae5e914dd427e5cfab533b6da3819cd (5.3), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
 #ifndef Z3FOLD_MAGIC
 #  define Z3FOLD_MAGIC 0x33
 #else
-assert_cc(Z3FOLD_MAGIC == 0x33);
+static_assert(Z3FOLD_MAGIC == 0x33, "");
 #endif
 
 /* fe030c9b85e6783bc52fe86449c0a4b8aa16c753 (5.5), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
 #ifndef PPC_CMM_MAGIC
 #  define PPC_CMM_MAGIC 0xc7571590
 #else
-assert_cc(PPC_CMM_MAGIC == 0xc7571590);
+static_assert(PPC_CMM_MAGIC == 0xc7571590, "");
 #endif
 
 /* Not in mainline but included in Ubuntu */
 #ifndef SHIFTFS_MAGIC
 #  define SHIFTFS_MAGIC 0x6a656a62
 #else
-assert_cc(SHIFTFS_MAGIC == 0x6a656a62);
+static_assert(SHIFTFS_MAGIC == 0x6a656a62, "");
 #endif
 
 /* Not exposed yet. Defined at fs/fuse/control.c */
 #ifndef FUSE_CTL_SUPER_MAGIC
 #  define FUSE_CTL_SUPER_MAGIC 0x65735543
 #else
-assert_cc(FUSE_CTL_SUPER_MAGIC == 0x65735543);
+static_assert(FUSE_CTL_SUPER_MAGIC == 0x65735543, "");
 #endif
 
 /* Not exposed yet. Defined at fs/orangefs/orangefs-kernel.h */
 #ifndef ORANGEFS_DEVREQ_MAGIC
 #  define ORANGEFS_DEVREQ_MAGIC 0x20030529
 #else
-assert_cc(ORANGEFS_DEVREQ_MAGIC == 0x20030529);
+static_assert(ORANGEFS_DEVREQ_MAGIC == 0x20030529, "");
 #endif
 
 /* linux/gfs2_ondisk.h */
 #ifndef GFS2_MAGIC
 #  define GFS2_MAGIC 0x01161970
 #else
-assert_cc(GFS2_MAGIC == 0x01161970);
+static_assert(GFS2_MAGIC == 0x01161970, "");
 #endif
 
 /* Not exposed yet. Defined at fs/configfs/mount.c */
 #ifndef CONFIGFS_MAGIC
 #  define CONFIGFS_MAGIC 0x62656570
 #else
-assert_cc(CONFIGFS_MAGIC == 0x62656570);
+static_assert(CONFIGFS_MAGIC == 0x62656570, "");
 #endif
 
 /* Not exposed yet. Defined at fs/vboxsf/super.c */
 #ifndef VBOXSF_SUPER_MAGIC
 #  define VBOXSF_SUPER_MAGIC 0x786f4256
 #else
-assert_cc(VBOXSF_SUPER_MAGIC == 0x786f4256);
+static_assert(VBOXSF_SUPER_MAGIC == 0x786f4256, "");
 #endif
 
 /* Not exposed yet, internally actually called RPCAUTH_GSSMAGIC. Defined in net/sunrpc/rpc_pipe.c */
 #ifndef RPC_PIPEFS_SUPER_MAGIC
 #  define RPC_PIPEFS_SUPER_MAGIC 0x67596969
 #else
-assert_cc(RPC_PIPEFS_SUPER_MAGIC == 0x67596969);
+static_assert(RPC_PIPEFS_SUPER_MAGIC == 0x67596969, "");
 #endif
 
 /* Not exposed yet, defined at fs/ntfs/ntfs.h */
 #ifndef NTFS_SB_MAGIC
 #  define NTFS_SB_MAGIC 0x5346544e
 #else
-assert_cc(NTFS_SB_MAGIC == 0x5346544e);
+static_assert(NTFS_SB_MAGIC == 0x5346544e, "");
 #endif
 
 /* Not exposed yet, encoded literally in fs/ntfs3/super.c. */
 #ifndef NTFS3_SUPER_MAGIC
 #  define NTFS3_SUPER_MAGIC 0x7366746e
 #else
-assert_cc(NTFS3_SUPER_MAGIC == 0x7366746e);
+static_assert(NTFS3_SUPER_MAGIC == 0x7366746e, "");
 #endif

diff --git a/src/basic/missing_namespace.h b/src/include/override/linux/nsfs.h
similarity index 89%
rename from src/basic/missing_namespace.h
rename to src/include/override/linux/nsfs.h
index e40b751b81d2729edd0173302d8c16c207c47586..a256df1c6f9fa801ccc0fa642ab079ff95df6c98 100644 (file)
--- a/src/basic/missing_namespace.h
+++ b/src/include/override/linux/nsfs.h
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/nsfs.h> /* IWYU pragma: export */
-#include <linux/types.h>
+#include_next <linux/nsfs.h>    /* IWYU pragma: export */
 
 /* Root namespace inode numbers, as per include/linux/proc_ns.h in the kernel source tree, since v3.8:
  * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98f842e675f96ffac96e6c50315790912b2812be */

diff --git a/src/basic/missing_xfs.h b/src/include/override/linux/xfs.h
similarity index 96%
rename from src/basic/missing_xfs.h
rename to src/include/override/linux/xfs.h
index ead7dbc321f0973f607f72d535521ee19f66c761..1f3b9af066a112ad240beea7530fb07a78d9f3b9 100644 (file)
--- a/src/basic/missing_xfs.h
+++ b/src/include/override/linux/xfs.h
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "forward.h"
+#include <linux/ioctl.h>
+#include <stdint.h>
 
 /* This is currently not exported in the public kernel headers, but the libxfs library code part of xfsprogs
  * defines it as public header */

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 314748301948e0d5af324108b13fb82f13a8928c..ebf401c4c2ca6b36e214ab134bc099149e39dcd5 100644 (file)
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/audit.h>
+
 #include "sd-event.h"
 
 #include "alloc-util.h"
@@ -13,7 +15,6 @@
 #include "journald-manager.h"
 #include "log.h"
 #include "log-ratelimit.h"
-#include "missing_audit.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "time-util.h"

diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c
index 9f44fb80b4091658a52576a514979d3d240820f2..ae9c719b83db0b5294d0cf30be71e95770193213 100644 (file)
--- a/src/journal/journald-manager.c
+++ b/src/journal/journald-manager.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/audit.h>
 #include <linux/sockios.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -50,7 +51,6 @@
 #include "log.h"
 #include "log-ratelimit.h"
 #include "memory-util.h"
-#include "missing_audit.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index d7ed4e88e8ce004721065fc4c6c3e9f0435adbd1..0cf3cbdd4cd20867206a7f287bfb5c3512960579 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <mqueue.h>
 #include <netinet/in.h>
 #include <poll.h>
@@ -18,7 +19,6 @@
 #include "io-util.h"
 #include "iovec-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pidfd-util.h"

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index 850eff9d028940eee3129266adbf530c59d0e119..9987c4be7e11e5dd028be2ab4e44feb587aabd12 100644 (file)
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -19,7 +20,6 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "hashmap.h"
-#include "missing_magic.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index e108ba65467c0d63f3e2b3502c52a9371828b9e7..8ed10c9f8e5b231bac91f993517f311a0e755331 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <malloc.h>
 #include <stdlib.h>
 #include <sys/timerfd.h>
@@ -24,7 +25,6 @@
 #include "log.h"
 #include "logarithm.h"
 #include "memory-util.h"
-#include "missing_magic.h"
 #include "origin-id.h"
 #include "path-util.h"
 #include "pidfd-util.h"

diff --git a/src/libsystemd/sd-journal/audit-type.c b/src/libsystemd/sd-journal/audit-type.c
index 1995e3fa180ced69cd9aa8e042480859012a16bc..097f725e8704e3b17e7dbc4416b4f628e721e359 100644 (file)
--- a/src/libsystemd/sd-journal/audit-type.c
+++ b/src/libsystemd/sd-journal/audit-type.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/audit.h>
+
 #include "audit-type.h"
-#include "missing_audit.h"
 
 #include "audit_type-to-name.inc"

diff --git a/src/libsystemd/sd-journal/generate-audit_type-list.sh b/src/libsystemd/sd-journal/generate-audit_type-list.sh
index 12103b2a0ff38b1422aa997c8b203939d411b749..44c743b1a328d6095c2ea611a8922f2bafb1d882 100755 (executable)
--- a/src/libsystemd/sd-journal/generate-audit_type-list.sh
+++ b/src/libsystemd/sd-journal/generate-audit_type-list.sh
@@ -6,10 +6,7 @@ set -o pipefail
 CC="${1:?}"
 shift
 
-HEADER="${1:?}"
-shift
-
-$CC -dM -include "$HEADER" "$@" - </dev/null | \
+$CC -dM -include linux/audit.h "$@" - </dev/null | \
      grep -vE 'AUDIT_.*(FIRST|LAST)_' | \
      sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \
      sort -k2

diff --git a/src/libsystemd/sd-journal/meson.build b/src/libsystemd/sd-journal/meson.build
index 87f39981c5b848524727dc951f7062603343176e..61ddf66b59c3547749d79d1c15c719b5772c8fa9 100644 (file)
--- a/src/libsystemd/sd-journal/meson.build
+++ b/src/libsystemd/sd-journal/meson.build
@@ -14,9 +14,9 @@
 
 generate_audit_type_list = files('generate-audit_type-list.sh')
 audit_type_list_txt = custom_target(
-        input : [generate_audit_type_list, missing_audit_h],
+        input : [generate_audit_type_list, audit_sources],
         output : 'audit_type-list.txt',
-        command : [env, 'bash', generate_audit_type_list, cpp, missing_audit_h, system_include_args],
+        command : [env, 'bash', generate_audit_type_list, cpp, system_include_args],
         capture : true)
 
 audit_type_to_name = custom_target(

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 30ff2f47c54385fb36a2b3ea0667d846e89a7ae4..efcf36f2ccb8699baa855cc74d0edac461c41715 100644 (file)
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <sys/mount.h>
 
 #include "sd-bus.h"
@@ -15,7 +16,6 @@
 #include "limits-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_magic.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 5f99eae4f9013d5946a79d3773b95ff524b33b0c..9427b1885ce5c8a421abf644b0d86bf3dad3c227 100644 (file)
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -2,6 +2,7 @@
 
 #include <fcntl.h>
 #include <linux/if_tun.h>
+#include <linux/magic.h>
 #include <linux/nsfs.h>
 #include <linux/veth.h>
 #include <net/if.h>
@@ -30,7 +31,6 @@
 #include "io-util.h"
 #include "json-util.h"
 #include "main-func.h"
-#include "missing_magic.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "netlink-util.h"

diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c
index 6b40d713ff3b1cd5319beda0f433237233272daa..e576f02c38a74db6ea3899016d75018159d705d0 100644 (file)
--- a/src/nsresourced/userns-registry.c
+++ b/src/nsresourced/userns-registry.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <unistd.h>
 
 #include "sd-json.h"
@@ -13,7 +14,6 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "json-util.h"
-#include "missing_magic.h"
 #include "path-util.h"
 #include "recurse-dir.h"
 #include "rm-rf.h"

diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c
index d5bf96bbdca73c7ce5f5d5614899bd7356f7dab0..d21fd10136fb48bdd93685af8410316c37059d87 100644 (file)
--- a/src/shared/binfmt-util.c
+++ b/src/shared/binfmt-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <sys/vfs.h>
 
 #include "binfmt-util.h"
@@ -8,7 +9,6 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "stat-util.h"
 
 int binfmt_mounted_and_writable(void) {

diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index f6f0fe2c19d79753c8dcf523bc5a76ace7dc3dc4..323204725fb7b4fe85dcb4a1536f26527ba0fb07 100644 (file)
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <unistd.h>
 
 #include "cgroup-setup.h"
@@ -10,7 +11,6 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 8744ec3d5da504b523a46028365bfa8972fedec2..2fcb480c51ac430bdec890d8363ce06fa06e5835 100644 (file)
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -1,12 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
+
 #include "sd-bus.h"
 
 #include "btrfs-util.h"
 #include "label-util.h"
 #include "log.h"
 #include "machine-pool.h"
-#include "missing_magic.h"
 #include "stat-util.h"
 
 static int check_btrfs(void) {

diff --git a/src/shared/resize-fs.c b/src/shared/resize-fs.c
index 481c2de1e5d9fc9fcf63aba4eb950e7fec25e68d..147af7ec33da648458c2240e0c22203a4f2148fc 100644 (file)
--- a/src/shared/resize-fs.c
+++ b/src/shared/resize-fs.c
@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/btrfs.h>
+#include <linux/fs.h>
 #include <linux/magic.h>
+#include <linux/xfs.h>
 #include <sys/ioctl.h>
 #include <sys/vfs.h>
 
-#include "missing_fs.h"
-#include "missing_magic.h"
-#include "missing_xfs.h"
 #include "resize-fs.h"
 #include "stat-util.h"
 #include "stdio-util.h"

diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c
index 71466c8574e57355960b79bcfe3fc24be8e7d5b3..1b3ecf079011a139dd8df845b1484149a34c772e 100644 (file)
--- a/src/shared/rm-rf.c
+++ b/src/shared/rm-rf.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/magic.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -10,7 +11,6 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "mountpoint-util.h"
 #include "path-util.h"
 #include "rm-rf.h"

diff --git a/src/shared/shift-uid.c b/src/shared/shift-uid.c
index 1b1af554844d61dc00c30c2ddb9cb11f0df8a6a0..9c7e875dffdfe5cf1028ca576388619e657ddf6d 100644 (file)
--- a/src/shared/shift-uid.c
+++ b/src/shared/shift-uid.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/magic.h>
 #include <sys/statvfs.h>
 #include <unistd.h>
 
@@ -10,7 +11,6 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "shift-uid.h"
 #include "stat-util.h"
 #include "string-util.h"

diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index 6817df1644c9855aeae851be6fe4607b2d213921..cb2b05b901aecba59aaee641be3a6f64b51a8c8e 100644 (file)
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/magic.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -20,7 +21,6 @@
 #include "gpt.h"
 #include "hexdecoct.h"
 #include "import-util.h"
-#include "missing_magic.h"
 #include "process-util.h"
 #include "sort-util.h"
 #include "stat-util.h"

diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c
index 1502e7f7a89ed6a159a81b47df8d83952435b9f0..b29a7eab9d0ab4d29572be7b065d1065f1e0407d 100644 (file)
--- a/src/test/test-recurse-dir.c
+++ b/src/test/test-recurse-dir.c
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <ftw.h>
+#include <linux/magic.h>
 
 #include "fd-util.h"
 #include "log.h"
-#include "missing_magic.h"
 #include "recurse-dir.h"
 #include "stat-util.h"
 #include "strv.h"