Skip to contentSkip to conversation

Various fixes for master

PATCH New Mark Hatle 1 participant 5 messages Jul 26, 2022

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Various fixes for master

While working on forward porting microblaze support I ran into the following patches.

default-distrovars.inc change, we've been doing this in our petalinux distro -- but it seems like a better idea to do it generically.

The runqemu one is a missing space in code that I THINK is only used by microblaze systems currently. (Or at least Xilinx systems with the custom qemu-xilinx.)

The other two are simple recipe updates.

Mark Hatle (4):
runqemu: Add missing space on default display option
default-distrovars: seccomp doesn't support microblaze
openssl: Move microblaze to linux-latomic config
elfutils: Microblaze does not support symvers

 meta/conf/distro/include/default-distrovars.inc    | 3 +++
 meta/recipes-connectivity/openssl/openssl_3.0.5.bb | 4 ++--
 meta/recipes-devtools/elfutils/elfutils_0.187.bb   | 3 +++
 scripts/runqemu                                    | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/4 runqemu: Add missing space on default display option

---
 scripts/runqemu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runqemu +1 -1
index b4c1ae6d83..b6fc212ebe 100755
@@ -1375,7 +1375,7 @@ class BaseConfig(object):
             elif "-display sdl" in output:
                 self.sdl = True
             else:
-                self.qemu_opt += '-display none'
+                self.qemu_opt += ' -display none'
 
         if self.sdl == True or self.gtk == True or self.egl_headless == True:
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 2/4 default-distrovars: seccomp doesn't support microblaze

In reply to Mark Hatle
---
 meta/conf/distro/include/default-distrovars.inc | 3 +++
 1 file changed, 3 insertions(+)
meta/conf/distro/include/default-distrovars.inc +3 -0
index 9f4617be01..230bab84dd 100644
@@ -16,6 +16,9 @@ DISTRO_FEATURES_DEFAULT:remove:riscv32 = "seccomp"
 # seccomp is not yet ported to ARC
 DISTRO_FEATURES_DEFAULT:remove:arc = "seccomp"
 
+# seccomp is not yet ported to microblaze
+DISTRO_FEATURES_DEFAULT:remove:microblaze = "seccomp"
+
 DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
 IMAGE_FEATURES ?= ""
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 3/4 openssl: Move microblaze to linux-latomic config

In reply to Mark Hatle

When building with the previous a number of atomic functions come back as undefined. Switching to linux-latomic fixes this.

---
 meta/recipes-connectivity/openssl/openssl_3.0.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssl/openssl_3.0.5.bb +2 -2
index e50ff7f8c5..04aff04fab 100644
@@ -77,7 +77,7 @@ do_configure () {
 	esac
 	target="$os-${HOST_ARCH}"
 	case $target in
-	linux-arc)
+	linux-arc | linux-microblaze*)
 		target=linux-latomic
 		;;
 	linux-arm*)
@@ -105,7 +105,7 @@ do_configure () {
 	linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el)
 		target=linux64-mips64
 		;;
-	linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*)
+	linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*)
 		target=linux-generic32
 		;;
 	linux-powerpc)
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 4/4 elfutils: Microblaze does not support symvers

In reply to Mark Hatle
---
 meta/recipes-devtools/elfutils/elfutils_0.187.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/elfutils/elfutils_0.187.bb +3 -0
index d03da61353..561112c580 100644
@@ -49,6 +49,9 @@ RDEPENDS:${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iprout
 
 EXTRA_OECONF:append:class-target = " --disable-tests-rpath"
 
+# symver functions not currently supported on microblaze
+EXTRA_OECONF:append:class-target:microblaze = " --disable-symbol-versioning"
+
 RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-dbg glibc-dev"
 INSANE_SKIP:${PN}-ptest = "debug-deps dev-deps"
 
Signature · 1 line
2.25.1