[PATCH 1/2] docker-distribution: Enable support for riscv64

[PATCH 1/2] docker-distribution: Enable support for riscv64

[mingli.yu]

From: Mingli Yu <mingli.yu@windriver.com>

Revert [1] to enable support for riscv64.

[1] https://git.yoctoproject.org/meta-virtualization/commit/?id=3626f2c9ccd56c6a3ee51304a7da7aafb395a588

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../docker-distribution/docker-distribution_git.bb              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index 3ed91f12..4e64df4f 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -73,5 +73,3 @@ SYSTEMD_AUTO_ENABLE:docker-registry = "enable"
 RDEPENDS:${PN}-ptest:remove = "${PN}"
 
 CVE_PRODUCT = "docker_registry"
-
-COMPATIBLE_HOST:riscv64 = "null"
-- 
2.34.1

[PATCH 2/2] docker-distribution: Use dup3 for riscv64

[mingli.yu]

From: Mingli Yu <mingli.yu@windriver.com>

Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
to fix the below build failure:
  vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../docker-distribution_git.bb                |  1 +
 ...-panicwrap-Use-dup3-on-riscv64-linux.patch | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index 4e64df4f..bb4a7cbf 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -7,6 +7,7 @@ SRCREV_distribution= "d607c6ccb9372e05556624f973119a23d3a42987"
 SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \
            file://docker-registry.service \
            file://0001-build-use-to-use-cross-go-compiler.patch \
+           file://0001-panicwrap-Use-dup3-on-riscv64-linux.patch \
           "
 
 PACKAGES =+ "docker-registry"
diff --git a/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
new file mode 100644
index 00000000..753afef7
--- /dev/null
+++ b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
@@ -0,0 +1,42 @@
+From 21d54c68751760b1f8915807794a432cf01fb733 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Tue, 9 Jul 2024 16:28:14 +0800
+Subject: [PATCH] panicwrap: Use dup3 on riscv64 linux
+
+Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
+to fix the below failure:
+  vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
+
+Upstream-Status: Inappropriate [The upstream has removed the panicwrap as [1]]
+
+[1] https://github.com/distribution/distribution/commit/3e4c4ead4c3aa07c27f95f2a5c92c6d5c2f9dcdb
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ vendor/github.com/bugsnag/panicwrap/dup2.go | 2 +-
+ vendor/github.com/bugsnag/panicwrap/dup3.go | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vendor/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go
+index de523c83..c68ce5ff 100644
+--- a/vendor/github.com/bugsnag/panicwrap/dup2.go
++++ b/vendor/github.com/bugsnag/panicwrap/dup2.go
+@@ -1,4 +1,4 @@
+-// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd
++// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
+ 
+ package panicwrap
+ 
+diff --git a/vendor/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go
+index 9721b36c..c664da85 100644
+--- a/vendor/github.com/bugsnag/panicwrap/dup3.go
++++ b/vendor/github.com/bugsnag/panicwrap/dup3.go
+@@ -1,4 +1,4 @@
+-// +build linux,arm64
++// +build linux,arm64 linux,riscv64
+ 
+ package panicwrap
+ 
+-- 
+2.34.1
+
-- 
2.34.1

Re: [meta-virtualization] [PATCH 2/2] docker-distribution: Use dup3 for riscv64

[Bruce Ashfield]

I'm currently going through an update cycle for the meta-virtualization
packages, so once I've uprev'd past this commit, I'll add patch 1/2 and
test for riscv.

Bruce

In message: [meta-virtualization] [PATCH 2/2] docker-distribution: Use dup3 for riscv64
on 09/07/2024 Yu, Mingli via lists.yoctoproject.org wrote:

> From: Mingli Yu <mingli.yu@windriver.com>
> 
> Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
> to fix the below build failure:
>   vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
> 
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  .../docker-distribution_git.bb                |  1 +
>  ...-panicwrap-Use-dup3-on-riscv64-linux.patch | 42 +++++++++++++++++++
>  2 files changed, 43 insertions(+)
>  create mode 100644 recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
> 
> diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
> index 4e64df4f..bb4a7cbf 100644
> --- a/recipes-containers/docker-distribution/docker-distribution_git.bb
> +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
> @@ -7,6 +7,7 @@ SRCREV_distribution= "d607c6ccb9372e05556624f973119a23d3a42987"
>  SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \
>             file://docker-registry.service \
>             file://0001-build-use-to-use-cross-go-compiler.patch \
> +           file://0001-panicwrap-Use-dup3-on-riscv64-linux.patch \
>            "
>  
>  PACKAGES =+ "docker-registry"
> diff --git a/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
> new file mode 100644
> index 00000000..753afef7
> --- /dev/null
> +++ b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
> @@ -0,0 +1,42 @@
> +From 21d54c68751760b1f8915807794a432cf01fb733 Mon Sep 17 00:00:00 2001
> +From: Mingli Yu <mingli.yu@windriver.com>
> +Date: Tue, 9 Jul 2024 16:28:14 +0800
> +Subject: [PATCH] panicwrap: Use dup3 on riscv64 linux
> +
> +Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
> +to fix the below failure:
> +  vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
> +
> +Upstream-Status: Inappropriate [The upstream has removed the panicwrap as [1]]
> +
> +[1] https://github.com/distribution/distribution/commit/3e4c4ead4c3aa07c27f95f2a5c92c6d5c2f9dcdb
> +
> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> +---
> + vendor/github.com/bugsnag/panicwrap/dup2.go | 2 +-
> + vendor/github.com/bugsnag/panicwrap/dup3.go | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/vendor/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go
> +index de523c83..c68ce5ff 100644
> +--- a/vendor/github.com/bugsnag/panicwrap/dup2.go
> ++++ b/vendor/github.com/bugsnag/panicwrap/dup2.go
> +@@ -1,4 +1,4 @@
> +-// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd
> ++// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
> + 
> + package panicwrap
> + 
> +diff --git a/vendor/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go
> +index 9721b36c..c664da85 100644
> +--- a/vendor/github.com/bugsnag/panicwrap/dup3.go
> ++++ b/vendor/github.com/bugsnag/panicwrap/dup3.go
> +@@ -1,4 +1,4 @@
> +-// +build linux,arm64
> ++// +build linux,arm64 linux,riscv64
> + 
> + package panicwrap
> + 
> +-- 
> +2.34.1
> +
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8821): https://lists.yoctoproject.org/g/meta-virtualization/message/8821
> Mute This Topic: https://lists.yoctoproject.org/mt/107119845/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [meta-virtualization] [PATCH 2/2] docker-distribution: Use dup3 for riscv64

[Yu, Mingli]

On 7/10/24 11:56, Bruce Ashfield wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> I'm currently going through an update cycle for the meta-virtualization
> packages, so once I've uprev'd past this commit, I'll add patch 1/2 and
> test for riscv.
> 

Okay, thanks!

> Bruce
> 
> In message: [meta-virtualization] [PATCH 2/2] docker-distribution: Use dup3 for riscv64
> on 09/07/2024 Yu, Mingli via lists.yoctoproject.org wrote:
> 
>> From: Mingli Yu <mingli.yu@windriver.com>
>>
>> Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
>> to fix the below build failure:
>>    vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> ---
>>   .../docker-distribution_git.bb                |  1 +
>>   ...-panicwrap-Use-dup3-on-riscv64-linux.patch | 42 +++++++++++++++++++
>>   2 files changed, 43 insertions(+)
>>   create mode 100644 recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
>>
>> diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
>> index 4e64df4f..bb4a7cbf 100644
>> --- a/recipes-containers/docker-distribution/docker-distribution_git.bb
>> +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
>> @@ -7,6 +7,7 @@ SRCREV_distribution= "d607c6ccb9372e05556624f973119a23d3a42987"
>>   SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \
>>              file://docker-registry.service \
>>              file://0001-build-use-to-use-cross-go-compiler.patch \
>> +           file://0001-panicwrap-Use-dup3-on-riscv64-linux.patch \
>>             "
>>
>>   PACKAGES =+ "docker-registry"
>> diff --git a/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
>> new file mode 100644
>> index 00000000..753afef7
>> --- /dev/null
>> +++ b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
>> @@ -0,0 +1,42 @@
>> +From 21d54c68751760b1f8915807794a432cf01fb733 Mon Sep 17 00:00:00 2001
>> +From: Mingli Yu <mingli.yu@windriver.com>
>> +Date: Tue, 9 Jul 2024 16:28:14 +0800
>> +Subject: [PATCH] panicwrap: Use dup3 on riscv64 linux
>> +
>> +Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
>> +to fix the below failure:
>> +  vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
>> +
>> +Upstream-Status: Inappropriate [The upstream has removed the panicwrap as [1]]
>> +
>> +[1] https://github.com/distribution/distribution/commit/3e4c4ead4c3aa07c27f95f2a5c92c6d5c2f9dcdb
>> +
>> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> +---
>> + vendor/github.com/bugsnag/panicwrap/dup2.go | 2 +-
>> + vendor/github.com/bugsnag/panicwrap/dup3.go | 2 +-
>> + 2 files changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/vendor/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go
>> +index de523c83..c68ce5ff 100644
>> +--- a/vendor/github.com/bugsnag/panicwrap/dup2.go
>> ++++ b/vendor/github.com/bugsnag/panicwrap/dup2.go
>> +@@ -1,4 +1,4 @@
>> +-// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd
>> ++// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
>> +
>> + package panicwrap
>> +
>> +diff --git a/vendor/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go
>> +index 9721b36c..c664da85 100644
>> +--- a/vendor/github.com/bugsnag/panicwrap/dup3.go
>> ++++ b/vendor/github.com/bugsnag/panicwrap/dup3.go
>> +@@ -1,4 +1,4 @@
>> +-// +build linux,arm64
>> ++// +build linux,arm64 linux,riscv64
>> +
>> + package panicwrap
>> +
>> +--
>> +2.34.1
>> +
>> --
>> 2.34.1
>>
> 
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#8821): https://lists.yoctoproject.org/g/meta-virtualization/message/8821
>> Mute This Topic: https://lists.yoctoproject.org/mt/107119845/1050810
>> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
>> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
> 

Re: [meta-virtualization] [PATCH 1/2] docker-distribution: Enable support for riscv64

[Bruce Ashfield]

staged to master-next.

Bruce

In message: [meta-virtualization] [PATCH 1/2] docker-distribution: Enable support for riscv64
on 09/07/2024 Yu, Mingli via lists.yoctoproject.org wrote:

> From: Mingli Yu <mingli.yu@windriver.com>
> 
> Revert [1] to enable support for riscv64.
> 
> [1] https://git.yoctoproject.org/meta-virtualization/commit/?id=3626f2c9ccd56c6a3ee51304a7da7aafb395a588
> 
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  .../docker-distribution/docker-distribution_git.bb              | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
> index 3ed91f12..4e64df4f 100644
> --- a/recipes-containers/docker-distribution/docker-distribution_git.bb
> +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
> @@ -73,5 +73,3 @@ SYSTEMD_AUTO_ENABLE:docker-registry = "enable"
>  RDEPENDS:${PN}-ptest:remove = "${PN}"
>  
>  CVE_PRODUCT = "docker_registry"
> -
> -COMPATIBLE_HOST:riscv64 = "null"
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8820): https://lists.yoctoproject.org/g/meta-virtualization/message/8820
> Mute This Topic: https://lists.yoctoproject.org/mt/107119844/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>