已开启
[sync] PR-16: fix build error in openEuler-26.09-DevStation #17
openeuler-ci-bot创建于 7月24日
[sync] PR-16: fix build error in openEuler-26.09-DevStation #17
已开启
共 2 个文件变更+102-10
此文件变更行数或变更字符数较多，你可以直接 查看源码
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | Name: isula-rust-extensions | 8 | Name: isula-rust-extensions |
| 9 | Version: 0.0.2 | 9 | Version: 0.0.2 |
| 10 | -Release: 2 | 10 | +Release: 3 |
| 11 | URL: https://gitee.com/openeuler/isula-rust-extensions | 11 | URL: https://gitee.com/openeuler/isula-rust-extensions |
| 12 | Source: %{name}-%{version}.tar.gz | 12 | Source: %{name}-%{version}.tar.gz |
| 13 | Summary: isula-rust-extensions is a rust-extension library for iSulad. | 13 | Summary: isula-rust-extensions is a rust-extension library for iSulad. |
| @@ -18,10 +18,11 @@ ExclusiveArch: x86_64 aarch64 | |||
| 18 | 18 | ||
| 19 | Patch0001: 0001-change-wait-callback-argument-from-u8-to-c_char.patch | 19 | Patch0001: 0001-change-wait-callback-argument-from-u8-to-c_char.patch |
| 20 | Patch0002: 0002-Fix-concurrency-issue-when-calling-sandbox-API.patch | 20 | Patch0002: 0002-Fix-concurrency-issue-when-calling-sandbox-API.patch |
| 21 | +Patch0003: 0003-fix-cmake-min-version-requirement.patch | ||
| 21 | 22 | ||
| 22 | BuildRequires: rust | 23 | BuildRequires: rust |
| 23 | BuildRequires: cargo | 24 | BuildRequires: cargo |
| 24 | -BuildRequires: rust-packaging | 25 | +BuildRequires: cargo-rpm-macros |
| 25 | BuildRequires: cmake gcc | 26 | BuildRequires: cmake gcc |
| 26 | 27 | ||
| 27 | %description | 28 | %description |
| @@ -49,20 +50,14 @@ popd | |||
| 49 | 50 | ||
| 50 | %build | 51 | %build |
| 51 | pushd nri | 52 | pushd nri |
| 52 | -sed -i '/\[source.crates-io\]/{n;d}' ./.cargo/config | ||
| 53 | -sed -i '/\[source.local-registry\]/{n;d}' ./.cargo/config | ||
| 54 | -sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config | ||
| 55 | %ifarch aarch64 | 53 | %ifarch aarch64 |
| 56 | -sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", "-Clink-arg=-lfdt", /g' ./.cargo/config | 54 | +sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", "-Clink-arg=-lfdt", /g' ./.cargo/config.toml |
| 57 | %endif | 55 | %endif |
| 58 | %cargo_build -a | 56 | %cargo_build -a |
| 59 | popd | 57 | popd |
| 60 | pushd sandbox | 58 | pushd sandbox |
| 61 | -sed -i '/\[source.crates-io\]/{n;d}' ./.cargo/config | ||
| 62 | -sed -i '/\[source.local-registry\]/{n;d}' ./.cargo/config | ||
| 63 | -sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config | ||
| 64 | %ifarch aarch64 | 59 | %ifarch aarch64 |
| 65 | -sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", "-Clink-arg=-lfdt", /g' ./.cargo/config | 60 | +sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", "-Clink-arg=-lfdt", /g' ./.cargo/config.toml |
| 66 | %endif | 61 | %endif |
| 67 | %cargo_build -a | 62 | %cargo_build -a |
| 68 | popd | 63 | popd |
| @@ -86,6 +81,9 @@ install -m 0755 sandbox/target/release/libisula_sandbox.so ${RPM_BUILD_ROOT}/%{_ | |||
| 86 | %{_includedir}/isula_sandbox_api.h | 81 | %{_includedir}/isula_sandbox_api.h |
| 87 | 82 | ||
| 88 | %changelog | 83 | %changelog |
| 84 | +* Thu Jul 23 2026 jade_t <yzd50036@gmail.com> - 0.0.2-3 | ||
| 85 | +- fix build error in openEuler-26.09-DevStation | ||
| 86 | + | ||
| 89 | * Wed Mar 12 2025 zhongjiawei <zhongjiawei1@huawei.com> - 0.0.2-2 | 87 | * Wed Mar 12 2025 zhongjiawei <zhongjiawei1@huawei.com> - 0.0.2-2 |
| 90 | - Fix concurrency issue when calling sandbox API | 88 | - Fix concurrency issue when calling sandbox API |
| 91 | 89 | ||