Skip to content

Commit dcea3eb

Browse files
committed
overlay afterburn: fix arm64 cross-build issue of 5.5.0
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.
1 parent 3e80f2b commit dcea3eb

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ RDEPEND="
312312
PATCHES=(
313313
"${FILESDIR}"/0001-Revert-remove-cl-legacy-feature.patch
314314
"${FILESDIR}"/0002-util-cmdline-Handle-the-cmdline-flags-as-list-of-sup.patch
315+
"${FILESDIR}"/0003-vmware-arm64-unsupported.patch
315316
)
316317

317318
src_unpack() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 2a9489f373771e190c4d311d6b934342a3ba98a7 Mon Sep 17 00:00:00 2001
2+
Message-Id: <2a9489f373771e190c4d311d6b934342a3ba98a7.1701767005.git.dpark@linux.microsoft.com>
3+
From: Dongsu Park <dpark@linux.microsoft.com>
4+
Date: Tue, 5 Dec 2023 10:03:10 +0100
5+
Subject: [PATCH] providers/vmware: add missing public functions for non-amd64
6+
7+
VmwareProvider must have a corresponding empty function
8+
`parse_netplan_config()` in unsupported part as well, just like the
9+
amd64 part.
10+
Otherwise build would fail when cross-building afterburn for arm64.
11+
12+
```
13+
error[E0599]: no method named `parse_netplan_config` found for reference
14+
`&VmwareProvider` in the current scope
15+
--> src/providers/vmware/mod.rs:37:14
16+
|
17+
37 | self.parse_netplan_config()
18+
| ^^^^^^^^^^^^^^^^^^^^ method not found in
19+
`&VmwareProvider`
20+
```
21+
22+
---
23+
src/providers/vmware/unsupported.rs | 3 +++
24+
1 file changed, 3 insertions(+)
25+
26+
diff --git a/src/providers/vmware/unsupported.rs b/src/providers/vmware/unsupported.rs
27+
index 99dace52..c4c04f20 100644
28+
--- a/src/providers/vmware/unsupported.rs
29+
+++ b/src/providers/vmware/unsupported.rs
30+
@@ -7,4 +7,8 @@ impl VmwareProvider {
31+
pub fn try_new() -> Result<Self> {
32+
bail!("unsupported architecture");
33+
}
34+
+
35+
+ pub fn parse_netplan_config(&self) -> Result<Option<String>> {
36+
+ bail!("unsupported architecture");
37+
+ }
38+
}
39+
--
40+
2.34.1
41+

0 commit comments

Comments
 (0)