mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 07:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

overlay afterburn: fix arm64 cross-build issue of 5.5.0

Browse Source 
Fix build issue that started to appear in afterburn 5.5.0. Every public
function for the amd64 part must have a corresponding empty function in
the unsupported part, so that cross-compile for arm64 can work.
This commit is contained in:
Dongsu Park 2023-12-05 10:28:23 +01:00
parent 3e80f2bfa0
commit dcea3ebfae
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild vendored
View File

@ -312,6 +312,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/0001-Revert-remove-cl-legacy-feature.patch
"${FILESDIR}"/0002-util-cmdline-Handle-the-cmdline-flags-as-list-of-sup.patch
"${FILESDIR}"/0003-vmware-arm64-unsupported.patch
)
src_unpack() {

41
sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0003-vmware-arm64-unsupported.patch vendored Normal file
View File

@ -0,0 +1,41 @@
From 2a9489f373771e190c4d311d6b934342a3ba98a7 Mon Sep 17 00:00:00 2001
Message-Id: <2a9489f373771e190c4d311d6b934342a3ba98a7.1701767005.git.dpark@linux.microsoft.com>
From: Dongsu Park <dpark@linux.microsoft.com>
Date: Tue, 5 Dec 2023 10:03:10 +0100
Subject: [PATCH] providers/vmware: add missing public functions for non-amd64
VmwareProvider must have a corresponding empty function
`parse_netplan_config()` in unsupported part as well, just like the
amd64 part.
Otherwise build would fail when cross-building afterburn for arm64.
```
error[E0599]: no method named `parse_netplan_config` found for reference
`&VmwareProvider` in the current scope
--> src/providers/vmware/mod.rs:37:14
|
37 | self.parse_netplan_config()
| ^^^^^^^^^^^^^^^^^^^^ method not found in
`&VmwareProvider`
```
---
src/providers/vmware/unsupported.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/providers/vmware/unsupported.rs b/src/providers/vmware/unsupported.rs
index 99dace52..c4c04f20 100644
--- a/src/providers/vmware/unsupported.rs
+++ b/src/providers/vmware/unsupported.rs
@@ -7,4 +7,8 @@ impl VmwareProvider {
pub fn try_new() -> Result<Self> {
bail!("unsupported architecture");
}
+
+ pub fn parse_netplan_config(&self) -> Result<Option<String>> {
+ bail!("unsupported architecture");
+ }
}
--
2.34.1