已开启
adapt cargo macros #48
Venland创建于 8月11日
adapt cargo macros #48
已开启
共 1 个文件变更+7-13
| @@ -9,12 +9,12 @@ | |||
| 9 | 9 | ||
| 10 | Name: rust-nestos-installer | 10 | Name: rust-nestos-installer |
| 11 | Version: 0.20.0 | 11 | Version: 0.20.0 |
| 12 | -Release: 1 | 12 | +Release: 2 |
| 13 | Summary: Installer for NestOS | 13 | Summary: Installer for NestOS |
| 14 | 14 | ||
| 15 | License: Apache-2.0 | 15 | License: Apache-2.0 |
| 16 | -URL: https://gitee.com/openeuler/nestos-installer | 16 | +URL: https://atomgit.com/openeuler/nestos-installer |
| 17 | -Source0: https://gitee.com/openeuler/nestos-installer/repository/archive/v%{version}.tar.gz | 17 | +Source0: https://atomgit.com/openeuler/nestos-installer/repository/archive/v%{version}.tar.gz |
| 18 | Source1: %{crate}-%{version}-vendor.tar.gz | 18 | Source1: %{crate}-%{version}-vendor.tar.gz |
| 19 | 19 | ||
| 20 | BuildRequires: rust-packaging openssl-devel libzstd-devel | 20 | BuildRequires: rust-packaging openssl-devel libzstd-devel |
| @@ -56,15 +56,7 @@ Obsoletes: nestos-installer-dracut < 0.0.1 | |||
| 56 | %prep | 56 | %prep |
| 57 | %autosetup -n %{crate}-v%{version} -p1 | 57 | %autosetup -n %{crate}-v%{version} -p1 |
| 58 | tar xvf %{SOURCE1} | 58 | tar xvf %{SOURCE1} |
| 59 | -mkdir -p .cargo | 59 | +%cargo_prep -v vendor |
| 60 | -cat >.cargo/config << EOF | ||
| 61 | - | ||
| 62 | -[source.crates-io] | ||
| 63 | -replace-with = "vendored-sources" | ||
| 64 | - | ||
| 65 | -[source.vendored-sources] | ||
| 66 | -directory = "vendor" | ||
| 67 | -EOF | ||
| 68 | 60 | ||
| 69 | %build | 61 | %build |
| 70 | %cargo_build -f rdcore | 62 | %cargo_build -f rdcore |
| @@ -84,7 +76,6 @@ install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer.target | |||
| 84 | install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer-post.target | 76 | install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer-post.target |
| 85 | install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/nestos-installer-generator | 77 | install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/nestos-installer-generator |
| 86 | 78 | ||
| 87 | -cp -r $RPM_BUILD_DIR/%{crate}-v%{version}/.cargo/bin %{buildroot}/usr | ||
| 88 | mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ | 79 | mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ |
| 89 | 80 | ||
| 90 | %package -n nestos-installer-bootinfra | 81 | %package -n nestos-installer-bootinfra |
| @@ -106,6 +97,9 @@ This subpackage contains boot-time infrastructure for NestOS. It is not needed | |||
| 106 | 97 | ||
| 107 | 98 | ||
| 108 | %changelog | 99 | %changelog |
| 100 | +* Tue Aug 11 2026 liweigang <liweiganga@gmail.com> - 0.20.0-2 | ||
| 101 | +- adapt cargo macros | ||
| 102 | + | ||
| 109 | * Thu Jan 25 2024 duyiwei <duyiwei@kylinos.cn> - 0.20.0-1 | 103 | * Thu Jan 25 2024 duyiwei <duyiwei@kylinos.cn> - 0.20.0-1 |
| 110 | - upgrade version to 0.20.0 | 104 | - upgrade version to 0.20.0 |
| 111 | 105 | ||