diff --git a/config/amd64/defines.toml b/config/amd64/defines.toml index d340a09..559064a 100644 --- a/config/amd64/defines.toml +++ b/config/amd64/defines.toml @@ -24,8 +24,6 @@ config = [ 'amd64/config.cloud-amd64', 'config.gardenlinux' ] -[flavour.defs] -is_quick = true [flavour.description] hardware = 'x86-64 cloud' hardware_long = 'cloud platforms including Amazon EC2, Microsoft Azure, and Google Compute Engine' @@ -34,8 +32,8 @@ hardware_long = 'cloud platforms including Amazon EC2, Microsoft Azure, and Goog name = 'none' [build] +enable_rust = true enable_signed = false -enable_vdso = true kernel_file = 'arch/x86/boot/bzImage' kernel_stem = 'vmlinuz' diff --git a/config/arm64/defines.toml b/config/arm64/defines.toml index 1b51e9d..a44f4ce 100644 --- a/config/arm64/defines.toml +++ b/config/arm64/defines.toml @@ -25,8 +25,6 @@ config = [ 'arm64/config.cloud-arm64', 'config.gardenlinux' ] -[flavour.defs] -is_quick = true [flavour.description] hardware = 'arm64 cloud' hardware_long = 'cloud platforms supporting arm64 virtual machines' @@ -36,8 +34,8 @@ name = 'none' [build] compiler_gnutype_compat = 'arm-linux-gnueabihf' +enable_rust = true enable_signed = false -enable_vdso = true kernel_file = 'arch/arm64/boot/Image' kernel_stem = 'vmlinuz' diff --git a/config/defines.toml b/config/defines.toml index ee6ad3e..e2995ae 100644 --- a/config/defines.toml +++ b/config/defines.toml @@ -13,7 +13,12 @@ name = 'x86' name = 'none' [build] -compiler = 'gcc' +c_compiler = 'gcc-15' +rust_build_depends = [ + 'rustc:native (>= 1.78.0)', + 'bindgen:native (>= 0.65.1)', + 'rust-src (>= 1.78.0)', +] [relations.image] depends = [ @@ -29,4 +34,4 @@ breaks = [ [[debianrelease]] name_regex = 'gardenlinux' -revision_regex = '\d+gl(\d+)?(~bp\d+)?(~dev)?' +revision_regex = '\dexperimental' diff --git a/config/riscv64/defines.toml b/config/riscv64/defines.toml index 56e2a27..386d0fd 100644 --- a/config/riscv64/defines.toml +++ b/config/riscv64/defines.toml @@ -11,6 +11,6 @@ installer = true name = 'none' [build] -enable_vdso = true +enable_rust = true kernel_file = 'arch/riscv/boot/Image' kernel_stem = 'vmlinux' diff --git a/finalize_source b/finalize_source index 8fac27f..55a5e65 100644 --- a/finalize_source +++ b/finalize_source @@ -1,5 +1,5 @@ ( apt-get install --no-install-recommends -y kernel-wedge python3-jinja2 python3-dacite cd "$dir/src" - { PYTHONDONTWRITEBYTECODE=1 make -f debian/rules debian/control-real || true; } | grep 'generated SUCCESSFULLY' + PYTHONDONTWRITEBYTECODE=1 make -f debian/rules debian/control-real && echo "PASS" || echo "FAIL" ) diff --git a/fixes_debian/series b/fixes_debian/series deleted file mode 100644 index 2d20a0c..0000000 --- a/fixes_debian/series +++ /dev/null @@ -1 +0,0 @@ -series.patch diff --git a/fixes_debian/series.patch b/fixes_debian/series.patch deleted file mode 100644 index edd0499..0000000 --- a/fixes_debian/series.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/debian/patches/series 2025-09-10 12:02:09.721924979 +0000 -+++ b/debian/patches/series 2025-09-10 14:50:59.976526194 +0000 -@@ -75,10 +75,6 @@ - bugfix/all/disable-some-marvell-phys.patch - bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch - bugfix/all/documentation-use-relative-source-paths-in-abi-documentation.patch --bugfix/all/ext4-don-t-try-to-clear-the-orphan_present-feature-b.patch --bugfix/all/proc-fix-missing-pde_set_flags-for-net-proc-files.patch --bugfix/all/alloc_fdtable-change-calling-conventions.patch --bugfix/all/net-ipv4-fix-regression-in-local-broadcast-routes.patch - - # Miscellaneous features diff --git a/prepare_source b/prepare_source index 511424d..e356dc7 100755 --- a/prepare_source +++ b/prepare_source @@ -1,10 +1,11 @@ pkg=linux -version_orig=6.12.61 -version="$version_orig-3" +version_orig=6.18.3 +version="$version_orig-1" +version_suffix="experimental" ( debian_repo=https://salsa.debian.org/kernel-team/linux.git - debian_ref="debian/6.12.43-1" + debian_ref="debian/6.18.3-1" tmp_dir="$(mktemp -d)" trap 'cd / && rm -rf "$tmp_dir"' EXIT