boba/guard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: cargo-deny CDLA-Permissive-2.0, build.rs asm include path, eclipse-temurin noble tag

Browse source
This commit is contained in:
loki5512344 2026-07-21 16:16:07 +02:00
parent e7631f918a
commit c828915560
Signed by: boba
GPG key ID: 253067914055423B
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/rampart-core/build.rs
View file

@ -16,7 +16,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("cargo:rerun-if-changed={}", src.display()); println!("cargo:rerun-if-changed={}", src.display());
let host_arch = std::env::var("HOST").unwrap_or_default(); let host_triple = std::env::var("HOST").unwrap_or_default();
let arch = host_triple.split('-').next().unwrap_or(&host_triple);
let status = Command::new("clang") let status = Command::new("clang")
.args([ .args([
"-O2", "-O2",
@ -29,7 +30,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"-o", "-o",
dst.to_str().ok_or("dst path is not valid UTF-8")?, dst.to_str().ok_or("dst path is not valid UTF-8")?,
&format!("-I{}", xdp_dir.display()), &format!("-I{}", xdp_dir.display()),
&format!("-I/usr/include/{}-linux-gnu", host_arch), &format!("-I/usr/include/{}-linux-gnu", arch),
]) ])
.status()?; .status()?;

1
deny.toml
View file

@ -23,6 +23,7 @@ allow = [
"Zlib", "Zlib",
"Unlicense", "Unlicense",
"CC0-1.0", "CC0-1.0",
"CDLA-Permissive-2.0",
"GPL-3.0", "GPL-3.0",
"GPL-3.0-only", "GPL-3.0-only",
"MPL-2.0", "MPL-2.0",

2
deploy/docker/Dockerfile.paper
View file

@ -1,4 +1,4 @@
FROM eclipse-temurin:21-jre-bookworm FROM eclipse-temurin:21-jre-noble
ARG PAPER_VERSION=1.21.4 ARG PAPER_VERSION=1.21.4
ARG PAPER_BUILD=latest ARG PAPER_BUILD=latest

2
deploy/docker/Dockerfile.velocity
View file

@ -1,4 +1,4 @@
FROM eclipse-temurin:21-jre-bookworm FROM eclipse-temurin:21-jre-noble
ARG VELOCITY_VERSION=3.4.0-SNAPSHOT ARG VELOCITY_VERSION=3.4.0-SNAPSHOT
ARG VELOCITY_BUILD=latest ARG VELOCITY_BUILD=latest