uapi: rename subdir uapi -> src

this is not the standard layout, even for Cargo

meson.build

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 project('sentry-kernel', 'c',
-    meson_version: '>=1.3.0',
+    meson_version: '>=1.4.0',
     default_options: [
         'c_std=gnu11', 'cpp_std=gnu++20',
         'warning_level=3', 'optimization=s',

uapi/uapi/Cargo.toml → uapi/Cargo.toml

@@ -9,9 +9,6 @@ license = "Apache 2.0"
 description = "Sentry kernel user API implementation"
 categories = ["os::api"]
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
 
 [dev-dependencies]

uapi/meson.build

@@ -16,37 +16,18 @@ rust_toolchain_config = configuration_data()
 rust_toolchain_config.set('channel', get_option('rust-channel'))
 rust_toolchain_config.set('target', kconfig_data.get_unquoted('CONFIG_RUSTC_TARGET'))
 
-rust_edition = '2021'
-uapi_rust_std = 'rust_std=' + rust_edition
-
 global_rust_build_args = [
     '@' + fs.parent(kconfig_rustargs) / fs.name(kconfig_rustargs),
     target_rustargs,
     '-C', 'lto=true', '-C', 'relocation-model=pic', '-C', 'link-args=--emit-relocs'
 ]
 
-subdir('include/uapi')
-subdir('uapi')
-
-py3 = pymod.find_installation('python3', modules: ['git'])
-
-# XXX:
-#  This deps is designed for userspace (libshied) only
-#  As in linux kernel, uapi headers are not used w/ a kernel name and/or uapi
-#  prefix. So, add the uapi include subdir in "include_directories".
-sentry_c_uapi_dep = declare_dependency(
-    link_with: uapi_lib,
-    sources: [ uapi_h ],
-    compile_args: [ global_build_args, target_arch_args ],
-    include_directories: [ userspace_uapi_include_dir ],
-)
+rust_edition = '2021'
+uapi_rust_std = 'rust_std=' + rust_edition
+uapi_manifest = files('Cargo.toml')
 
-pkg_config = import('pkgconfig')
-pkg_config.generate(
-    uapi_lib,
-    filebase: 'uapi',
-    extra_cflags: [ global_build_args, target_arch_args ],
-)
+subdir('include/uapi')
+subdir('src')
 
 install_data(
   'task.Kconfig',

uapi/uapi/meson.build → uapi/src/meson.build

@@ -1,9 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 Ledger SAS
 # SPDX-License-Identifier: Apache-2.0
 
-rust = import('rust')
-
-uapi_manifest = files('Cargo.toml')
 uapi_libfile = files('lib.rs')
 
 # XXX:
@@ -29,6 +26,25 @@ uapi_lib = static_library(
     install: true,
 )
 
+# XXX:
+#  This deps is designed for userspace (libshied) only
+#  As in linux kernel, uapi headers are not used w/ a kernel name and/or uapi
+#  prefix. So, add the uapi include subdir in "include_directories".
+sentry_c_uapi_dep = declare_dependency(
+    link_with: uapi_lib,
+    sources: [ uapi_h ],
+    compile_args: [ global_build_args, target_arch_args ],
+    include_directories: [ userspace_uapi_include_dir ],
+)
+
+# Generate pkg config file uapi.pc for C app using c_ffi static library
+pkg_config = import('pkgconfig')
+pkg_config.generate(
+    uapi_lib,
+    filebase: 'uapi',
+    extra_cflags: [ global_build_args, target_arch_args ],
+)
+
 cargo = find_program('cargo', required: true)
 
 if with_doc_opt