Skip to contentSkip to conversation

libucontext: Recognize ppc64le architecture

PATCH In review Khem Raj 2 participants 8 messages Mar 12, 2021 – Mar 14, 2021 RISC-V

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 libucontext: Recognize ppc64le architecture

---
 meta/recipes-core/musl/libucontext_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/musl/libucontext_git.bb +1 -1
index 734ad9c953..11affebb49 100644
@@ -40,8 +40,8 @@ def map_kernel_arch(a, d):
     elif re.match('aarch64_be_ilp32$', a):          return 'aarch64'
     elif re.match('mips(isa|)(32|)(r6|)(el|)$', a): return 'mips'
     elif re.match('mips(isa|)64(r6|)(el|)$', a):    return 'mips64'
+    elif re.match('p(pc64|owerpc64)(le)', a):       return 'ppc64'
     elif re.match('p(pc|owerpc)', a):               return 'ppc'
-    elif re.match('p(pc64|owerpc64)', a):           return 'ppc64'
     elif re.match('riscv64$', a):                   return 'riscv64'
     elif re.match('riscv32$', a):                   return 'riscv32'
     else:
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/4 libunwind: Do not assume libdir for ppc64

This ensures that build respects OE's choice for libdir

---
 ...gure-Do-not-enforce-libdir-for-ppc64.patch | 35 +++++++++++++++++++
 .../libunwind/libunwind_1.5.0.bb              |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch
meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch new file +35 -0
new file mode 100644
index 0000000000..751f1b3404
@@ -0,0 +1,35 @@
+From 154c7465de2aeb9a8ba3416bbed6e6e07f58c583 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 11 Mar 2021 21:52:28 -0800
+Subject: [PATCH] configure: Do not enforce libdir for ppc64
+
+OE has its own multilib configuration, therefore hardcoding libdir
+breaks that, instead respect the settings coming from build environment
+via configure options.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8d68f7..254440f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,12 +206,6 @@ fi
+ AM_CONDITIONAL(USE_DWARF, [test x$use_dwarf = xyes])
+ AC_MSG_RESULT([$use_dwarf])
+ 
+-if test x$target_arch = xppc64; then
+-        libdir='${exec_prefix}/lib64'
+-        AC_MSG_NOTICE([PowerPC64 detected, lib will be installed ${libdir}]);
+-        AC_SUBST([libdir])
+-fi
+-
+ AC_MSG_CHECKING([whether to restrict build to remote support])
+ if test x$target_arch != x$host_arch; then
+   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
+-- 
+2.30.2
+
meta/recipes-support/libunwind/libunwind_1.5.0.bb +1 -0
index 5e4693e205..887a35708e 100644
@@ -6,6 +6,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
            file://0004-Fix-build-on-mips-musl.patch \
            file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \
            file://0006-Fix-for-X32.patch \
+           file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \
            "
 SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
 
Signature · 1 line
2.30.2
author
#2 lore raw

PATCH 3/4 go: Update to 1.16.2

In reply to Khem Raj

This is bugfix release in 1.16 series [1]

[1] https://golang.org/doc/devel/release.html#go1.16.minor

---
 meta/recipes-devtools/go/{go-1.16.inc => go-1.16.2.inc}       | 4 ++--
 .../{go-binary-native_1.16.bb => go-binary-native_1.16.2.bb}  | 4 ++--
 ...{go-cross-canadian_1.16.bb => go-cross-canadian_1.16.2.bb} | 0
 .../go/{go-cross_1.16.bb => go-cross_1.16.2.bb}               | 0
 .../go/{go-crosssdk_1.16.bb => go-crosssdk_1.16.2.bb}         | 0
 .../go/{go-native_1.16.bb => go-native_1.16.2.bb}             | 0
 .../go/{go-runtime_1.16.bb => go-runtime_1.16.2.bb}           | 0
 meta/recipes-devtools/go/{go_1.16.bb => go_1.16.2.bb}         | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/go/{go-1.16.inc => go-1.16.2.inc} (88%)
 rename meta/recipes-devtools/go/{go-binary-native_1.16.bb => go-binary-native_1.16.2.bb} (83%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.16.bb => go-cross-canadian_1.16.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.16.bb => go-cross_1.16.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.16.bb => go-crosssdk_1.16.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-native_1.16.bb => go-native_1.16.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.16.bb => go-runtime_1.16.2.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.16.bb => go_1.16.2.bb} (100%)
meta/recipes-devtools/go/go-1.16.2.inc renamed from meta/recipes-devtools/go/go-1.16.inc +2 -2
similarity index 88%
rename from meta/recipes-devtools/go/go-1.16.inc
rename to meta/recipes-devtools/go/go-1.16.2.inc
index 1ebbbef833..e65caf8197 100644
@@ -1,7 +1,7 @@
 require go-common.inc
 
 GO_BASEVERSION = "1.16"
-PV = "1.16"
+PV = "1.16.2"
 FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -17,4 +17,4 @@ SRC_URI += "\
     file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
     file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
 "
-SRC_URI[main.sha256sum] = "7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a"
+SRC_URI[main.sha256sum] = "37ca14287a23cb8ba2ac3f5c3dd8adbc1f7a54b9701a57824bf19a0b271f83ea"
meta/recipes-devtools/go/go-binary-native_1.16.2.bb renamed from meta/recipes-devtools/go/go-binary-native_1.16.bb +2 -2
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.16.bb
rename to meta/recipes-devtools/go/go-binary-native_1.16.2.bb
index 155a475c95..4fb060173c 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
 PROVIDES = "go-native"
 
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
-SRC_URI[go_linux_arm64.sha256sum] = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"
+SRC_URI[go_linux_amd64.sha256sum] = "542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8"
+SRC_URI[go_linux_arm64.sha256sum] = "6924601d998a0917694fd14261347e3798bd2ad6b13c4d7f2edd70c9d57f62ab"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.16.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb
meta/recipes-devtools/go/go-cross_1.16.2.bb renamed from meta/recipes-devtools/go/go-cross_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.16.bb
rename to meta/recipes-devtools/go/go-cross_1.16.2.bb
meta/recipes-devtools/go/go-crosssdk_1.16.2.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.16.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.16.2.bb
meta/recipes-devtools/go/go-native_1.16.2.bb renamed from meta/recipes-devtools/go/go-native_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.16.bb
rename to meta/recipes-devtools/go/go-native_1.16.2.bb
meta/recipes-devtools/go/go-runtime_1.16.2.bb renamed from meta/recipes-devtools/go/go-runtime_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.16.bb
rename to meta/recipes-devtools/go/go-runtime_1.16.2.bb
meta/recipes-devtools/go/go_1.16.2.bb renamed from meta/recipes-devtools/go/go_1.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.16.bb
rename to meta/recipes-devtools/go/go_1.16.2.bb
Signature · 1 line
2.30.2
author
#3 lore raw

PATCH 4/4 go-dep: Remove

In reply to Khem Raj

go-dep was an effort for dependency management before go modules, which since 2020 has been deprecated in favor of go modules. Since its not developed any longer and go mdules is officially supported, this should be retired from OE-core as well.

Cc Otavio Salvador <[email protected]>
---
 meta/classes/godep.bbclass                    |      8 -
 meta/conf/distro/include/maintainers.inc      |      1 -
 meta/lib/oeqa/selftest/cases/reproducible.py  |      1 -
 .../0001-Add-support-for-mips-mips64.patch    |     54 -
 .../0001-Update-sys-module-to-latest.patch    | 145574 ---------------
 ...bolt_riscv64-Add-support-for-riscv64.patch |     33 -
 meta/recipes-devtools/go/go-dep_0.5.4.bb      |     30 -
 7 files changed, 145701 deletions(-)
 delete mode 100644 meta/classes/godep.bbclass
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Update-sys-module-to-latest.patch
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch
 delete mode 100644 meta/recipes-devtools/go/go-dep_0.5.4.bb
meta/classes/godep.bbclass deleted +0 -8
deleted file mode 100644
index c82401c313..0000000000
@@ -1,8 +0,0 @@
-DEPENDS_append = " go-dep-native"
-
-do_compile_prepend() {
-    rm -f ${WORKDIR}/build/src/${GO_IMPORT}/Gopkg.toml
-    rm -f ${WORKDIR}/build/src/${GO_IMPORT}/Gopkg.lock
-    ( cd ${WORKDIR}/build/src/${GO_IMPORT} && dep init && dep ensure )
-}
-
meta/conf/distro/include/maintainers.inc +0 -1
index 1272affaf5..ebaece9cb5 100644
@@ -224,7 +224,6 @@ RECIPE_MAINTAINER_pn-go-binary-native = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-cross-${TUNE_PKGARCH} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-crosssdk-${SDK_SYS} = "Khem Raj <[email protected]>"
-RECIPE_MAINTAINER_pn-go-dep = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-go-helloworld = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-native = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-runtime = "Khem Raj <[email protected]>"
meta/lib/oeqa/selftest/cases/reproducible.py +0 -1
index 86cf6c5daa..d301c8dd88 100644
@@ -29,7 +29,6 @@ import datetime
 #https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210215-0_td9la2/packages/diff-html/
 exclude_packages = [
 	'glide',
-	'go-dep',
 	'go-helloworld',
 	'go-runtime',
 	'go_',
meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch deleted +0 -54

54 lines not on this page · raw message

meta/recipes-devtools/go/go-dep/0001-Update-sys-module-to-latest.patch deleted +0 -145574

2,924 lines not on this page · raw message

meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch deleted +0 -33
deleted file mode 100644
index 4d97d48243..0000000000

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/go/go-dep_0.5.4.bb deleted +0 -30
deleted file mode 100644
index 0da2c6607c..0000000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.30.2

Part of the diff is not shown here. View the raw message.

#4 lore raw

Re: [OE-core] [PATCH 4/4] go-dep: Remove

Quoted 15 lines · Khem Raj

go-dep was an effort for dependency management before go modules, which since 2020 has been deprecated in favor of go modules. Since its not developed any longer and go mdules is officially supported, this should be retired from OE-core as well.

Cc Otavio Salvador <[email protected]>

---

 meta/classes/godep.bbclass                    |      8 -
 meta/conf/distro/include/maintainers.inc      |      1 -
 meta/lib/oeqa/selftest/cases/reproducible.py  |      1 -
 .../0001-Add-support-for-mips-mips64.patch    |     54 -
 ...bolt_riscv64-Add-support-for-riscv64.patch |     33 -
 meta/recipes-devtools/go/go-dep_0.5.4.bb      |     30 -
 7 files changed, 145701 deletions(-)
Quoted 4 lines

 delete mode 100644 meta/classes/godep.bbclass
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch delete mode 100644 meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch delete mode 100644 meta/recipes-devtools/go/go-dep_0.5.4.bb

So we also need to remove the go-dep tests?

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1950/steps/14/logs/stdio

If so, is there some other go test we could replace them with?

Cheers,

Richard

author
#5 lore raw

Re: [OE-core] [PATCH 4/4] go-dep: Remove

Quoted 21 lines · Richard Purdie
Quoted 15 lines · Khem Raj

go-dep was an effort for dependency management before go modules, which since 2020 has been deprecated in favor of go modules. Since its not developed any longer and go mdules is officially supported, this should be retired from OE-core as well.

Cc Otavio Salvador <[email protected]>
---
  meta/classes/godep.bbclass                    |      8 -
  meta/conf/distro/include/maintainers.inc      |      1 -
  meta/lib/oeqa/selftest/cases/reproducible.py  |      1 -
  .../0001-Add-support-for-mips-mips64.patch    |     54 -
  ...bolt_riscv64-Add-support-for-riscv64.patch |     33 -
  meta/recipes-devtools/go/go-dep_0.5.4.bb      |     30 -
  7 files changed, 145701 deletions(-)
Quoted 4 lines

 delete mode 100644 meta/classes/godep.bbclass
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch delete mode 100644 meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch delete mode 100644 meta/recipes-devtools/go/go-dep_0.5.4.bb

Quoted 5 lines

So we also need to remove the go-dep tests?

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1950/steps/14/logs/stdio

If so, is there some other go test we could replace them with?

thats already replaced with github.com/direnv
but this failure seems to be related to go 1.16.2 upgrade. I will take a look.

Quoted 5 lines

Cheers,

Richard

author
#6 lore raw

Re: [OE-core] [PATCH 4/4] go-dep: Remove

In reply to Richard Purdie
Quoted 21 lines · Richard Purdie
Quoted 15 lines · Khem Raj

go-dep was an effort for dependency management before go modules, which since 2020 has been deprecated in favor of go modules. Since its not developed any longer and go mdules is officially supported, this should be retired from OE-core as well.

Cc Otavio Salvador <[email protected]>
---
  meta/classes/godep.bbclass                    |      8 -
  meta/conf/distro/include/maintainers.inc      |      1 -
  meta/lib/oeqa/selftest/cases/reproducible.py  |      1 -
  .../0001-Add-support-for-mips-mips64.patch    |     54 -
  ...bolt_riscv64-Add-support-for-riscv64.patch |     33 -
  meta/recipes-devtools/go/go-dep_0.5.4.bb      |     30 -
  7 files changed, 145701 deletions(-)
Quoted 4 lines

 delete mode 100644 meta/classes/godep.bbclass
 delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch delete mode 100644 meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch delete mode 100644 meta/recipes-devtools/go/go-dep_0.5.4.bb

Quoted 5 lines

So we also need to remove the go-dep tests?

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1950/steps/14/logs/stdio

If so, is there some other go test we could replace them with?

I think this is some connectivity issue. see the below error I pasted from your logs.

File
"/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/gotoolchain.py", line 68, in test_go_dep_build
retv = self.run_sdk_go_command('build', proj, name)
File
"/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/gotoolchain.py", line 54, in run_sdk_go_command
return runCmd(cmd).status
File
"/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/commands.py", line 210, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status
%d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'cd /tmp/SDKQA52f_qj7f/go/src/github.com/direnv/direnv; . /tmp/SDKQA52f_qj7f/environment-setup-core2-64-poky-linux; export GOPATH=/tmp/SDKQA52f_qj7f/go; ${CROSS_COMPILE}go build' returned non-zero exit status 1:
go: github.com/BurntSushi/[email protected]: Get "https://proxy.golang.org/github.com/%21burnt%21sushi/toml/@v/v0.3.1.mod": net/http: TLS handshake timeout

Quoted 4 lines

Cheers,

Richard

#7 lore raw

Re: [OE-core] [PATCH 4/4] go-dep: Remove

Quoted 46 lines · Khem Raj
Quoted 21 lines · Richard Purdie
Quoted 15 lines · Khem Raj

go-dep was an effort for dependency management before go modules, which since 2020 has been deprecated in favor of go modules. Since its not developed any longer and go mdules is officially supported, this should be retired from OE-core as well.

Cc Otavio Salvador <[email protected]>

---

  meta/classes/godep.bbclass                    |      8 -
  meta/conf/distro/include/maintainers.inc      |      1 -
  meta/lib/oeqa/selftest/cases/reproducible.py  |      1 -
  .../0001-Add-support-for-mips-mips64.patch    |     54 -
  ...bolt_riscv64-Add-support-for-riscv64.patch |     33 -
  meta/recipes-devtools/go/go-dep_0.5.4.bb      |     30 -
  7 files changed, 145701 deletions(-)
Quoted 4 lines

  delete mode 100644 meta/classes/godep.bbclass
  delete mode 100644 meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch delete mode 100644 meta/recipes-devtools/go/go-dep/0001-bolt_riscv64-Add-support-for-riscv64.patch delete mode 100644 meta/recipes-devtools/go/go-dep_0.5.4.bb

Quoted 5 lines

So we also need to remove the go-dep tests?

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1950/steps/14/logs/stdio

If so, is there some other go test we could replace them with?

I think this is some connectivity issue. see the below error I pasted from your logs.

    File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/gotoolchain.py", line 68, in test_go_dep_build
     retv = self.run_sdk_go_command('build', proj, name)
   File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/gotoolchain.py", line 54, in run_sdk_go_command
     return runCmd(cmd).status
   File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/commands.py", line 210, in runCmd
     raise AssertionError("Command '%s' returned non-zero exit status
%d:\n%s" % (command, result.status, exc_output))

Quoted 8 lines

AssertionError: Command 'cd /tmp/SDKQA52f_qj7f/go/src/github.com/direnv/direnv; . /tmp/SDKQA52f_qj7f/environment-setup-core2-64-poky-linux; export GOPATH=/tmp/SDKQA52f_qj7f/go; ${CROSS_COMPILE}go build' returned non-zero exit status 1:
go: github.com/BurntSushi/[email protected]: Get "https://proxy.golang.org/github.com/%21burnt%21sushi/toml/@v/v0.3.1.mod":
net/http: TLS handshake timeout

We have an open bug for a connectivity issue but the tests really shouldn't be relying on the network if we can help it. I doubt this is a connectivity issue as such, more likely rate limiting or some kind of DoS defence from github. It was odd that all the selftests failed with the same error.

I can rerun the build again, see if it happens to work but is there something we can do to avoid the network?

Cheers,

Richard