mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
962471bc70
The build error could be reproduced by using qemux86 as the MACHINE or using qemux86-64 as the MACHINE and then running 'bitbake lib32-docker-distribution'. The root cause is the wrong file (s3_64bit.go) is imported. Fix the tag matching to ensure s3_32bit.go is imported in case of 386. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 6970080b10a53d858dd444a643a2bd911de12940 Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Thu, 29 May 2025 11:28:38 +0800
|
|
Subject: [PATCH] s3-aws: fix build for 386
|
|
|
|
When building for 386, we got the following build error:
|
|
|
|
registry/storage/driver/s3-aws/s3.go:312:99: cannot use
|
|
maxChunkSize (untyped int constant 5368709120) as int value
|
|
in argument to getParameterAsInteger (overflows)
|
|
|
|
This is because the s3_64bit.go is used. Adjust the build tag matching
|
|
in s3_32bit.go and s3_64bit.go to fix this issue.
|
|
|
|
Upstream-Status: Submitted [https://github.com/distribution/distribution/pull/4642]
|
|
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
---
|
|
registry/storage/driver/s3-aws/s3_32bit.go | 2 +-
|
|
registry/storage/driver/s3-aws/s3_64bit.go | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/registry/storage/driver/s3-aws/s3_32bit.go b/registry/storage/driver/s3-aws/s3_32bit.go
|
|
index 218e3eab..84161fcb 100644
|
|
--- a/registry/storage/driver/s3-aws/s3_32bit.go
|
|
+++ b/registry/storage/driver/s3-aws/s3_32bit.go
|
|
@@ -1,4 +1,4 @@
|
|
-//go:build arm
|
|
+//go:build arm || 386
|
|
|
|
package s3
|
|
|
|
diff --git a/registry/storage/driver/s3-aws/s3_64bit.go b/registry/storage/driver/s3-aws/s3_64bit.go
|
|
index 55254e49..2ed1f92f 100644
|
|
--- a/registry/storage/driver/s3-aws/s3_64bit.go
|
|
+++ b/registry/storage/driver/s3-aws/s3_64bit.go
|
|
@@ -1,4 +1,4 @@
|
|
-//go:build !arm
|
|
+//go:build !arm && !386
|
|
|
|
package s3
|
|
|
|
--
|
|
2.34.1
|
|
|