include: move libc header wrappers to src/include/override/, and kernel headers to...

Preparation for later changes.

diff --git a/man/meson.build b/man/meson.build
index 15f3fdb34b4764987d196634ae99ab21ecd2993a..4aa9ed237c3a6d38f2ff1c81ab690094ff8fa361 100644 (file)
--- a/man/meson.build
+++ b/man/meson.build
@@ -38,7 +38,7 @@ man_page_depends += custom_entities_ent
 generate_bpf_delegate_configs = find_program('../src/basic/generate-bpf-delegate-configs.py')
 
 bpf_delegate_xml = custom_target(
-        input : files('../src/basic/include/linux/bpf.h'),
+        input : files('../src/include/uapi/linux/bpf.h'),
         output : 'bpf-delegate.xml',
         command : [generate_bpf_delegate_configs,
                    'doc',

diff --git a/meson.build b/meson.build
index 6f8397c966b27fd7f3362c875fe50d68eed488e3..8b7809043dbe6936782c86037e531274f6dd0b80 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2008,16 +2008,25 @@ dbus_programs = []
 # A list of boot stubs. Required for testing of ukify.
 boot_stubs = []
 
+system_includes = [
+        include_directories(
+                # gcc(1) says
+                # "Directories specified with -isystem options are scanned in left-to-right order",
+                # and meson puts the directories in the reversed order. Hence, a directory with a lower
+                # priority must be listed earlier.
+                'src/include/uapi',
+                'src/include/override',
+                is_system : true,
+        ),
+]
+
 basic_includes = [
         include_directories(
                 'src/basic',
                 'src/fundamental',
                 'src/systemd',
         ),
-        include_directories(
-                'src/basic/include',
-                is_system : true,
-        ),
+        system_includes,
         version_include,
 ]
 

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 2627cdb1640716cf2510fb7f8f99d656b737f715..19ed187646ff2b65065426c6b3ffcd092c799974 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -127,19 +127,19 @@ basic_sources += missing_syscall_def_h
 generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
         output : 'af-list.txt',
-        command : [generate_af_list, cpp, files('include/sys/socket.h')],
+        command : [generate_af_list, cpp, files('../include/override/sys/socket.h')],
         capture : true)
 
 generate_arphrd_list = find_program('generate-arphrd-list.sh')
 arphrd_list_txt = custom_target(
         output : 'arphrd-list.txt',
-        command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h')],
+        command : [generate_arphrd_list, cpp, files('../include/uapi/linux/if_arp.h')],
         capture : true)
 
 generate_cap_list = find_program('generate-cap-list.sh')
 cap_list_txt = custom_target(
         output : 'cap-list.txt',
-        command : [generate_cap_list, cpp, files('include/linux/capability.h')],
+        command : [generate_cap_list, cpp, files('../include/uapi/linux/capability.h')],
         capture : true)
 
 generate_errno_list = find_program('generate-errno-list.sh')
@@ -234,7 +234,7 @@ run_target(
 ############################################################
 
 filesystem_includes = files(
-        'include/linux/magic.h',
+        '../include/uapi/linux/magic.h',
         'missing_magic.h',
 )
 
@@ -275,7 +275,7 @@ filesystem_switch_case_inc = custom_target(
 
 generate_bpf_delegate_configs = find_program('generate-bpf-delegate-configs.py')
 bpf_delegate_configs_inc = custom_target(
-        input : files('include/linux/bpf.h'),
+        input : files('../include/uapi/linux/bpf.h'),
         output : 'bpf-delegate-configs.inc',
         command : [generate_bpf_delegate_configs,
                    'code',

diff --git a/src/basic/include/fcntl.h b/src/include/override/fcntl.h
similarity index 100%
rename from src/basic/include/fcntl.h
rename to src/include/override/fcntl.h

diff --git a/src/basic/include/malloc.h b/src/include/override/malloc.h
similarity index 100%
rename from src/basic/include/malloc.h
rename to src/include/override/malloc.h

diff --git a/src/basic/include/net/if.h b/src/include/override/net/if.h
similarity index 100%
rename from src/basic/include/net/if.h
rename to src/include/override/net/if.h

diff --git a/src/basic/include/net/if_arp.h b/src/include/override/net/if_arp.h
similarity index 100%
rename from src/basic/include/net/if_arp.h
rename to src/include/override/net/if_arp.h

diff --git a/src/basic/include/netinet/in.h b/src/include/override/netinet/in.h
similarity index 100%
rename from src/basic/include/netinet/in.h
rename to src/include/override/netinet/in.h

diff --git a/src/basic/include/sched.h b/src/include/override/sched.h
similarity index 100%
rename from src/basic/include/sched.h
rename to src/include/override/sched.h

diff --git a/src/basic/include/sys/mman.h b/src/include/override/sys/mman.h
similarity index 100%
rename from src/basic/include/sys/mman.h
rename to src/include/override/sys/mman.h

diff --git a/src/basic/include/sys/mount.h b/src/include/override/sys/mount.h
similarity index 100%
rename from src/basic/include/sys/mount.h
rename to src/include/override/sys/mount.h

diff --git a/src/basic/include/sys/param.h b/src/include/override/sys/param.h
similarity index 100%
rename from src/basic/include/sys/param.h
rename to src/include/override/sys/param.h

diff --git a/src/basic/include/sys/pidfd.h b/src/include/override/sys/pidfd.h
similarity index 100%
rename from src/basic/include/sys/pidfd.h
rename to src/include/override/sys/pidfd.h

diff --git a/src/basic/include/sys/random.h b/src/include/override/sys/random.h
similarity index 100%
rename from src/basic/include/sys/random.h
rename to src/include/override/sys/random.h

diff --git a/src/basic/include/sys/socket.h b/src/include/override/sys/socket.h
similarity index 100%
rename from src/basic/include/sys/socket.h
rename to src/include/override/sys/socket.h

diff --git a/src/basic/include/sys/wait.h b/src/include/override/sys/wait.h
similarity index 100%
rename from src/basic/include/sys/wait.h
rename to src/include/override/sys/wait.h

diff --git a/src/basic/include/sys/xattr.h b/src/include/override/sys/xattr.h
similarity index 100%
rename from src/basic/include/sys/xattr.h
rename to src/include/override/sys/xattr.h

diff --git a/src/basic/include/linux/.clang-format b/src/include/uapi/linux/.clang-format
similarity index 100%
rename from src/basic/include/linux/.clang-format
rename to src/include/uapi/linux/.clang-format

diff --git a/src/basic/include/linux/auto_dev-ioctl.h b/src/include/uapi/linux/auto_dev-ioctl.h
similarity index 100%
rename from src/basic/include/linux/auto_dev-ioctl.h
rename to src/include/uapi/linux/auto_dev-ioctl.h

diff --git a/src/basic/include/linux/auto_fs.h b/src/include/uapi/linux/auto_fs.h
similarity index 100%
rename from src/basic/include/linux/auto_fs.h
rename to src/include/uapi/linux/auto_fs.h

diff --git a/src/basic/include/linux/batman_adv.h b/src/include/uapi/linux/batman_adv.h
similarity index 100%
rename from src/basic/include/linux/batman_adv.h
rename to src/include/uapi/linux/batman_adv.h

diff --git a/src/basic/include/linux/bpf.h b/src/include/uapi/linux/bpf.h
similarity index 100%
rename from src/basic/include/linux/bpf.h
rename to src/include/uapi/linux/bpf.h

diff --git a/src/basic/include/linux/bpf_common.h b/src/include/uapi/linux/bpf_common.h
similarity index 100%
rename from src/basic/include/linux/bpf_common.h
rename to src/include/uapi/linux/bpf_common.h

diff --git a/src/basic/include/linux/bpf_insn.h b/src/include/uapi/linux/bpf_insn.h
similarity index 100%
rename from src/basic/include/linux/bpf_insn.h
rename to src/include/uapi/linux/bpf_insn.h

diff --git a/src/basic/include/linux/btrfs.h b/src/include/uapi/linux/btrfs.h
similarity index 100%
rename from src/basic/include/linux/btrfs.h
rename to src/include/uapi/linux/btrfs.h

diff --git a/src/basic/include/linux/btrfs_tree.h b/src/include/uapi/linux/btrfs_tree.h
similarity index 100%
rename from src/basic/include/linux/btrfs_tree.h
rename to src/include/uapi/linux/btrfs_tree.h

diff --git a/src/basic/include/linux/can/netlink.h b/src/include/uapi/linux/can/netlink.h
similarity index 100%
rename from src/basic/include/linux/can/netlink.h
rename to src/include/uapi/linux/can/netlink.h

diff --git a/src/basic/include/linux/can/vxcan.h b/src/include/uapi/linux/can/vxcan.h
similarity index 100%
rename from src/basic/include/linux/can/vxcan.h
rename to src/include/uapi/linux/can/vxcan.h

diff --git a/src/basic/include/linux/capability.h b/src/include/uapi/linux/capability.h
similarity index 100%
rename from src/basic/include/linux/capability.h
rename to src/include/uapi/linux/capability.h

diff --git a/src/basic/include/linux/cfm_bridge.h b/src/include/uapi/linux/cfm_bridge.h
similarity index 100%
rename from src/basic/include/linux/cfm_bridge.h
rename to src/include/uapi/linux/cfm_bridge.h

diff --git a/src/basic/include/linux/const.h b/src/include/uapi/linux/const.h
similarity index 100%
rename from src/basic/include/linux/const.h
rename to src/include/uapi/linux/const.h

diff --git a/src/basic/include/linux/dm-ioctl.h b/src/include/uapi/linux/dm-ioctl.h
similarity index 100%
rename from src/basic/include/linux/dm-ioctl.h
rename to src/include/uapi/linux/dm-ioctl.h

diff --git a/src/basic/include/linux/ethtool.h b/src/include/uapi/linux/ethtool.h
similarity index 100%
rename from src/basic/include/linux/ethtool.h
rename to src/include/uapi/linux/ethtool.h

diff --git a/src/basic/include/linux/fib_rules.h b/src/include/uapi/linux/fib_rules.h
similarity index 100%
rename from src/basic/include/linux/fib_rules.h
rename to src/include/uapi/linux/fib_rules.h

diff --git a/src/basic/include/linux/filter.h b/src/include/uapi/linux/filter.h
similarity index 100%
rename from src/basic/include/linux/filter.h
rename to src/include/uapi/linux/filter.h

diff --git a/src/basic/include/linux/fou.h b/src/include/uapi/linux/fou.h
similarity index 100%
rename from src/basic/include/linux/fou.h
rename to src/include/uapi/linux/fou.h

diff --git a/src/basic/include/linux/fs.h b/src/include/uapi/linux/fs.h
similarity index 100%
rename from src/basic/include/linux/fs.h
rename to src/include/uapi/linux/fs.h

diff --git a/src/basic/include/linux/fscrypt.h b/src/include/uapi/linux/fscrypt.h
similarity index 100%
rename from src/basic/include/linux/fscrypt.h
rename to src/include/uapi/linux/fscrypt.h

diff --git a/src/basic/include/linux/fsverity.h b/src/include/uapi/linux/fsverity.h
similarity index 100%
rename from src/basic/include/linux/fsverity.h
rename to src/include/uapi/linux/fsverity.h

diff --git a/src/basic/include/linux/genetlink.h b/src/include/uapi/linux/genetlink.h
similarity index 100%
rename from src/basic/include/linux/genetlink.h
rename to src/include/uapi/linux/genetlink.h

diff --git a/src/basic/include/linux/hdlc/ioctl.h b/src/include/uapi/linux/hdlc/ioctl.h
similarity index 100%
rename from src/basic/include/linux/hdlc/ioctl.h
rename to src/include/uapi/linux/hdlc/ioctl.h

diff --git a/src/basic/include/linux/hid.h b/src/include/uapi/linux/hid.h
similarity index 100%
rename from src/basic/include/linux/hid.h
rename to src/include/uapi/linux/hid.h

diff --git a/src/basic/include/linux/hidraw.h b/src/include/uapi/linux/hidraw.h
similarity index 100%
rename from src/basic/include/linux/hidraw.h
rename to src/include/uapi/linux/hidraw.h

diff --git a/src/basic/include/linux/if.h b/src/include/uapi/linux/if.h
similarity index 100%
rename from src/basic/include/linux/if.h
rename to src/include/uapi/linux/if.h

diff --git a/src/basic/include/linux/if_addr.h b/src/include/uapi/linux/if_addr.h
similarity index 100%
rename from src/basic/include/linux/if_addr.h
rename to src/include/uapi/linux/if_addr.h

diff --git a/src/basic/include/linux/if_addrlabel.h b/src/include/uapi/linux/if_addrlabel.h
similarity index 100%
rename from src/basic/include/linux/if_addrlabel.h
rename to src/include/uapi/linux/if_addrlabel.h

diff --git a/src/basic/include/linux/if_arp.h b/src/include/uapi/linux/if_arp.h
similarity index 100%
rename from src/basic/include/linux/if_arp.h
rename to src/include/uapi/linux/if_arp.h

diff --git a/src/basic/include/linux/if_bonding.h b/src/include/uapi/linux/if_bonding.h
similarity index 100%
rename from src/basic/include/linux/if_bonding.h
rename to src/include/uapi/linux/if_bonding.h

diff --git a/src/basic/include/linux/if_bridge.h b/src/include/uapi/linux/if_bridge.h
similarity index 100%
rename from src/basic/include/linux/if_bridge.h
rename to src/include/uapi/linux/if_bridge.h

diff --git a/src/basic/include/linux/if_ether.h b/src/include/uapi/linux/if_ether.h
similarity index 100%
rename from src/basic/include/linux/if_ether.h
rename to src/include/uapi/linux/if_ether.h

diff --git a/src/basic/include/linux/if_infiniband.h b/src/include/uapi/linux/if_infiniband.h
similarity index 100%
rename from src/basic/include/linux/if_infiniband.h
rename to src/include/uapi/linux/if_infiniband.h

diff --git a/src/basic/include/linux/if_link.h b/src/include/uapi/linux/if_link.h
similarity index 100%
rename from src/basic/include/linux/if_link.h
rename to src/include/uapi/linux/if_link.h

diff --git a/src/basic/include/linux/if_macsec.h b/src/include/uapi/linux/if_macsec.h
similarity index 100%
rename from src/basic/include/linux/if_macsec.h
rename to src/include/uapi/linux/if_macsec.h

diff --git a/src/basic/include/linux/if_packet.h b/src/include/uapi/linux/if_packet.h
similarity index 100%
rename from src/basic/include/linux/if_packet.h
rename to src/include/uapi/linux/if_packet.h

diff --git a/src/basic/include/linux/if_tun.h b/src/include/uapi/linux/if_tun.h
similarity index 100%
rename from src/basic/include/linux/if_tun.h
rename to src/include/uapi/linux/if_tun.h

diff --git a/src/basic/include/linux/if_tunnel.h b/src/include/uapi/linux/if_tunnel.h
similarity index 100%
rename from src/basic/include/linux/if_tunnel.h
rename to src/include/uapi/linux/if_tunnel.h

diff --git a/src/basic/include/linux/if_vlan.h b/src/include/uapi/linux/if_vlan.h
similarity index 100%
rename from src/basic/include/linux/if_vlan.h
rename to src/include/uapi/linux/if_vlan.h

diff --git a/src/basic/include/linux/in.h b/src/include/uapi/linux/in.h
similarity index 100%
rename from src/basic/include/linux/in.h
rename to src/include/uapi/linux/in.h

diff --git a/src/basic/include/linux/in6.h b/src/include/uapi/linux/in6.h
similarity index 100%
rename from src/basic/include/linux/in6.h
rename to src/include/uapi/linux/in6.h

diff --git a/src/basic/include/linux/input-event-codes.h b/src/include/uapi/linux/input-event-codes.h
similarity index 100%
rename from src/basic/include/linux/input-event-codes.h
rename to src/include/uapi/linux/input-event-codes.h

diff --git a/src/basic/include/linux/input.h b/src/include/uapi/linux/input.h
similarity index 100%
rename from src/basic/include/linux/input.h
rename to src/include/uapi/linux/input.h

diff --git a/src/basic/include/linux/ioprio.h b/src/include/uapi/linux/ioprio.h
similarity index 100%
rename from src/basic/include/linux/ioprio.h
rename to src/include/uapi/linux/ioprio.h

diff --git a/src/basic/include/linux/ip.h b/src/include/uapi/linux/ip.h
similarity index 100%
rename from src/basic/include/linux/ip.h
rename to src/include/uapi/linux/ip.h

diff --git a/src/basic/include/linux/ip6_tunnel.h b/src/include/uapi/linux/ip6_tunnel.h
similarity index 100%
rename from src/basic/include/linux/ip6_tunnel.h
rename to src/include/uapi/linux/ip6_tunnel.h

diff --git a/src/basic/include/linux/ipv6.h b/src/include/uapi/linux/ipv6.h
similarity index 100%
rename from src/basic/include/linux/ipv6.h
rename to src/include/uapi/linux/ipv6.h

diff --git a/src/basic/include/linux/ipv6_route.h b/src/include/uapi/linux/ipv6_route.h
similarity index 100%
rename from src/basic/include/linux/ipv6_route.h
rename to src/include/uapi/linux/ipv6_route.h

diff --git a/src/basic/include/linux/keyctl.h b/src/include/uapi/linux/keyctl.h
similarity index 100%
rename from src/basic/include/linux/keyctl.h
rename to src/include/uapi/linux/keyctl.h

diff --git a/src/basic/include/linux/l2tp.h b/src/include/uapi/linux/l2tp.h
similarity index 100%
rename from src/basic/include/linux/l2tp.h
rename to src/include/uapi/linux/l2tp.h

diff --git a/src/basic/include/linux/libc-compat.h b/src/include/uapi/linux/libc-compat.h
similarity index 100%
rename from src/basic/include/linux/libc-compat.h
rename to src/include/uapi/linux/libc-compat.h

diff --git a/src/basic/include/linux/limits.h b/src/include/uapi/linux/limits.h
similarity index 100%
rename from src/basic/include/linux/limits.h
rename to src/include/uapi/linux/limits.h

diff --git a/src/basic/include/linux/loop.h b/src/include/uapi/linux/loop.h
similarity index 100%
rename from src/basic/include/linux/loop.h
rename to src/include/uapi/linux/loop.h

diff --git a/src/basic/include/linux/magic.h b/src/include/uapi/linux/magic.h
similarity index 100%
rename from src/basic/include/linux/magic.h
rename to src/include/uapi/linux/magic.h

diff --git a/src/basic/include/linux/mempolicy.h b/src/include/uapi/linux/mempolicy.h
similarity index 100%
rename from src/basic/include/linux/mempolicy.h
rename to src/include/uapi/linux/mempolicy.h

diff --git a/src/basic/include/linux/mount.h b/src/include/uapi/linux/mount.h
similarity index 100%
rename from src/basic/include/linux/mount.h
rename to src/include/uapi/linux/mount.h

diff --git a/src/basic/include/linux/mrp_bridge.h b/src/include/uapi/linux/mrp_bridge.h
similarity index 100%
rename from src/basic/include/linux/mrp_bridge.h
rename to src/include/uapi/linux/mrp_bridge.h

diff --git a/src/basic/include/linux/neighbour.h b/src/include/uapi/linux/neighbour.h
similarity index 100%
rename from src/basic/include/linux/neighbour.h
rename to src/include/uapi/linux/neighbour.h

diff --git a/src/basic/include/linux/net_namespace.h b/src/include/uapi/linux/net_namespace.h
similarity index 100%
rename from src/basic/include/linux/net_namespace.h
rename to src/include/uapi/linux/net_namespace.h

diff --git a/src/basic/include/linux/netdevice.h b/src/include/uapi/linux/netdevice.h
similarity index 100%
rename from src/basic/include/linux/netdevice.h
rename to src/include/uapi/linux/netdevice.h

diff --git a/src/basic/include/linux/netfilter.h b/src/include/uapi/linux/netfilter.h
similarity index 100%
rename from src/basic/include/linux/netfilter.h
rename to src/include/uapi/linux/netfilter.h

diff --git a/src/basic/include/linux/netfilter/nf_conntrack_common.h b/src/include/uapi/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nf_conntrack_common.h
rename to src/include/uapi/linux/netfilter/nf_conntrack_common.h

diff --git a/src/basic/include/linux/netfilter/nf_conntrack_tuple_common.h b/src/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to src/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h

diff --git a/src/basic/include/linux/netfilter/nf_nat.h b/src/include/uapi/linux/netfilter/nf_nat.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nf_nat.h
rename to src/include/uapi/linux/netfilter/nf_nat.h

diff --git a/src/basic/include/linux/netfilter/nf_tables.h b/src/include/uapi/linux/netfilter/nf_tables.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nf_tables.h
rename to src/include/uapi/linux/netfilter/nf_tables.h

diff --git a/src/basic/include/linux/netfilter/nfnetlink.h b/src/include/uapi/linux/netfilter/nfnetlink.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nfnetlink.h
rename to src/include/uapi/linux/netfilter/nfnetlink.h

diff --git a/src/basic/include/linux/netfilter/nfnetlink_compat.h b/src/include/uapi/linux/netfilter/nfnetlink_compat.h
similarity index 100%
rename from src/basic/include/linux/netfilter/nfnetlink_compat.h
rename to src/include/uapi/linux/netfilter/nfnetlink_compat.h

diff --git a/src/basic/include/linux/netfilter/x_tables.h b/src/include/uapi/linux/netfilter/x_tables.h
similarity index 100%
rename from src/basic/include/linux/netfilter/x_tables.h
rename to src/include/uapi/linux/netfilter/x_tables.h

diff --git a/src/basic/include/linux/netfilter/xt_addrtype.h b/src/include/uapi/linux/netfilter/xt_addrtype.h
similarity index 100%
rename from src/basic/include/linux/netfilter/xt_addrtype.h
rename to src/include/uapi/linux/netfilter/xt_addrtype.h

diff --git a/src/basic/include/linux/netfilter/xt_tcpudp.h b/src/include/uapi/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from src/basic/include/linux/netfilter/xt_tcpudp.h
rename to src/include/uapi/linux/netfilter/xt_tcpudp.h

diff --git a/src/basic/include/linux/netfilter_ipv4.h b/src/include/uapi/linux/netfilter_ipv4.h
similarity index 100%
rename from src/basic/include/linux/netfilter_ipv4.h
rename to src/include/uapi/linux/netfilter_ipv4.h

diff --git a/src/basic/include/linux/netfilter_ipv4/ip_tables.h b/src/include/uapi/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from src/basic/include/linux/netfilter_ipv4/ip_tables.h
rename to src/include/uapi/linux/netfilter_ipv4/ip_tables.h

diff --git a/src/basic/include/linux/netlink.h b/src/include/uapi/linux/netlink.h
similarity index 100%
rename from src/basic/include/linux/netlink.h
rename to src/include/uapi/linux/netlink.h

diff --git a/src/basic/include/linux/nexthop.h b/src/include/uapi/linux/nexthop.h
similarity index 100%
rename from src/basic/include/linux/nexthop.h
rename to src/include/uapi/linux/nexthop.h

diff --git a/src/basic/include/linux/nl80211.h b/src/include/uapi/linux/nl80211.h
similarity index 100%
rename from src/basic/include/linux/nl80211.h
rename to src/include/uapi/linux/nl80211.h

diff --git a/src/basic/include/linux/pkt_sched.h b/src/include/uapi/linux/pkt_sched.h
similarity index 100%
rename from src/basic/include/linux/pkt_sched.h
rename to src/include/uapi/linux/pkt_sched.h

diff --git a/src/basic/include/linux/prctl.h b/src/include/uapi/linux/prctl.h
similarity index 100%
rename from src/basic/include/linux/prctl.h
rename to src/include/uapi/linux/prctl.h

diff --git a/src/basic/include/linux/rtnetlink.h b/src/include/uapi/linux/rtnetlink.h
similarity index 100%
rename from src/basic/include/linux/rtnetlink.h
rename to src/include/uapi/linux/rtnetlink.h

diff --git a/src/basic/include/linux/sched/types.h b/src/include/uapi/linux/sched/types.h
similarity index 100%
rename from src/basic/include/linux/sched/types.h
rename to src/include/uapi/linux/sched/types.h

diff --git a/src/basic/include/linux/socket.h b/src/include/uapi/linux/socket.h
similarity index 100%
rename from src/basic/include/linux/socket.h
rename to src/include/uapi/linux/socket.h

diff --git a/src/basic/include/linux/sockios.h b/src/include/uapi/linux/sockios.h
similarity index 100%
rename from src/basic/include/linux/sockios.h
rename to src/include/uapi/linux/sockios.h

diff --git a/src/basic/include/linux/stat.h b/src/include/uapi/linux/stat.h
similarity index 100%
rename from src/basic/include/linux/stat.h
rename to src/include/uapi/linux/stat.h

diff --git a/src/basic/include/linux/stddef.h b/src/include/uapi/linux/stddef.h
similarity index 100%
rename from src/basic/include/linux/stddef.h
rename to src/include/uapi/linux/stddef.h

diff --git a/src/basic/include/linux/update.sh b/src/include/uapi/linux/update.sh
similarity index 100%
rename from src/basic/include/linux/update.sh
rename to src/include/uapi/linux/update.sh

diff --git a/src/basic/include/linux/veth.h b/src/include/uapi/linux/veth.h
similarity index 100%
rename from src/basic/include/linux/veth.h
rename to src/include/uapi/linux/veth.h

diff --git a/src/basic/include/linux/vm_sockets.h b/src/include/uapi/linux/vm_sockets.h
similarity index 100%
rename from src/basic/include/linux/vm_sockets.h
rename to src/include/uapi/linux/vm_sockets.h

diff --git a/src/basic/include/linux/wireguard.h b/src/include/uapi/linux/wireguard.h
similarity index 100%
rename from src/basic/include/linux/wireguard.h
rename to src/include/uapi/linux/wireguard.h

diff --git a/src/basic/include/linux/xattr.h b/src/include/uapi/linux/xattr.h
similarity index 100%
rename from src/basic/include/linux/xattr.h
rename to src/include/uapi/linux/xattr.h

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 78e435de350c338677d87b5a3c2b14de48f86f15..94a7eaa469d5d5b4f22103595e3bc6f26c3cdf17 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -296,7 +296,7 @@ shared_sources += [target1, target2]
 
 fname = 'ethtool-link-mode.inc'
 ethtool_link_mode_inc = custom_target(
-        input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'],
+        input : ['ethtool-link-mode.py', '../include/uapi/linux/ethtool.h'],
         output : fname,
         command : [python, '@INPUT0@', '--header', cpp, '@INPUT1@'],
         capture : true)
@@ -307,7 +307,7 @@ sources += shared_sources
 
 fname = 'ethtool-link-mode.xml'
 ethtool_link_mode_xml = custom_target(
-        input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'],
+        input : ['ethtool-link-mode.py', '../include/uapi/linux/ethtool.h'],
         output : fname,
         command : [python, '@INPUT0@', '--xml', cpp, '@INPUT1@'],
         capture : true)

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 34fc42747830c9ee1bbc8eb8f0047f4f2c985937..6b37b669d0ad5741b78fb62121e998777159184f 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -63,7 +63,7 @@ endif
 
 generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh')
 keyboard_keys_list_txt = custom_target(
-        input : files('../basic/include/linux/input.h'),
+        input : files('../include/uapi/linux/input.h'),
         output : 'keyboard-keys-list.txt',
         command : [generate_keyboard_keys_list, cpp, '@INPUT@'],
         capture : true)