Re: [OE-core] [PATCH] qemuriscv: Add to common MACHINE_FEATURES instead of overriding them
On Tue, Oct 31, 2023 at 5:16 AM Khem Raj wrote: > > machine features like vfat are needed for ptests to pass ( e..g. parted) > This brings it closer to what x86 qemu config looks like as well. > > Signed-off-by: Khem Raj Reviewed-by: Alistair Francis Alistair > --- > meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc > b/meta/conf/machine/include/riscv/qemuriscv.inc > index 46ae66b9e50..7024bd0a4e6 100644 > --- a/meta/conf/machine/include/riscv/qemuriscv.inc > +++ b/meta/conf/machine/include/riscv/qemuriscv.inc > @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" > require conf/machine/include/qemu.inc > require conf/machine/include/riscv/tune-riscv.inc > > -MACHINE_FEATURES = "screen keyboard ext2 ext3 serial" > +MACHINE_FEATURES += "keyboard ext2 ext3 serial" > > KERNEL_IMAGETYPE = "Image" > KERNEL_IMAGETYPES += "uImage" > -- > 2.42.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#189823): https://lists.openembedded.org/g/openembedded-core/message/189823 Mute This Topic: https://lists.openembedded.org/mt/102282740/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] should local.conf.sample include MACHINEs related to RISC-V?
On Wed, May 11, 2022 at 12:06 PM Robert P. J. Day wrote: > > > just now noticed that while oe-core includes machine definitions for > qemuriscv*, local.conf.sample does not mention them. is this just an > oversight? Yeah, that's just an oversight. If you want you can send a patch :) Alistair > > rday > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165492): https://lists.openembedded.org/g/openembedded-core/message/165492 Mute This Topic: https://lists.openembedded.org/mt/91032184/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/6] riscv: Add tunes for rv64 without compressed instructions
On Thu, Apr 14, 2022 at 12:52 PM Khem Raj wrote:
>
> Signed-off-by: Khem Raj
> ---
> meta/conf/machine/include/riscv/arch-riscv.inc | 2 ++
> meta/conf/machine/include/riscv/tune-riscv.inc | 8
> 2 files changed, 10 insertions(+)
>
> diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> b/meta/conf/machine/include/riscv/arch-riscv.inc
> index e5611a12a66..230a266563a 100644
> --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> @@ -7,6 +7,8 @@ TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
> TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', '
> -mabi=lp64', ' ', d)}"
> TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', '
> -mabi=ilp32', ' ', d)}"
>
> +TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nc', '
> -march=rv64imafd', ' ', d)}"
I thought Linux expected compressed instruction support, is there
actual hardware that doesn't have compressed instructions?
Alistair
> +
> # Fix: ld: unrecognized option '--hash-style=sysv'
> LINKER_HASH_STYLE:libc-newlib = ""
> # Fix: ld: unrecognized option '--hash-style=gnu'
> diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
> b/meta/conf/machine/include/riscv/tune-riscv.inc
> index cc2896f277b..659801496c9 100644
> --- a/meta/conf/machine/include/riscv/tune-riscv.inc
> +++ b/meta/conf/machine/include/riscv/tune-riscv.inc
> @@ -6,6 +6,8 @@ TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
> TUNEVALID[riscv64nf] = "Enable 64-bit RISC-V optimizations no floating point"
> TUNEVALID[riscv32nf] = "Enable 32-bit RISC-V optimizations no floating point"
>
> +TUNEVALID[riscv64nc] = "Enable 64-bit RISC-V optimizations without
> compressed instructions"
> +
> TUNEVALID[bigendian] = "Big endian mode"
>
> AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf"
> @@ -31,3 +33,9 @@ TUNE_FEATURES:tune-riscv32nf =
> "${TUNE_FEATURES:tune-riscv32} riscv32nf"
> TUNE_ARCH:tune-riscv32nf = "riscv32"
> TUNE_PKGARCH:tune-riscv32nf = "riscv32nf"
> PACKAGE_EXTRA_ARCHS:tune-riscv32nf = "riscv32nf"
> +
> +# no compressed
> +TUNE_FEATURES:tune-riscv64nc = "${TUNE_FEATURES:tune-riscv64} riscv64nc"
> +TUNE_ARCH:tune-riscv64nc = "riscv64"
> +TUNE_PKGARCH:tune-riscv64nc = "riscv64nc"
> +PACKAGE_EXTRA_ARCHS:tune-riscv64nc = "riscv64nc"
> --
> 2.35.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#164393):
https://lists.openembedded.org/g/openembedded-core/message/164393
Mute This Topic: https://lists.openembedded.org/mt/90456787/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/2] opensbi: Upgrade to 1.0
On Tue, Feb 15, 2022 at 9:37 AM Khem Raj wrote:
>
> Drop OE specific patch to shunt march/mabi
> this seems to work fine now.
>
> unset CLANG_TARGET so it can compile with OE produced clang toolchain
> which provides --target itself
>
> Signed-off-by: Khem Raj
> Cc: Alistair Francis
Reviewed-by: Alistair Francis
Alistair
> ---
> ...Makefile-Don-t-specify-mabi-or-march.patch | 36 ---
> .../{opensbi_0.9.bb => opensbi_1.0.bb}| 5 ++-
> 2 files changed, 2 insertions(+), 39 deletions(-)
> delete mode 100644
> meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
> rename meta/recipes-bsp/opensbi/{opensbi_0.9.bb => opensbi_1.0.bb} (91%)
>
> diff --git
> a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
>
> b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
> deleted file mode 100644
> index d2a8048e87e..000
> ---
> a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001
> -From: Alistair Francis
> -Date: Fri, 15 Feb 2019 14:57:41 -0800
> -Subject: [PATCH] Makefile: Don't specify mabi or march
> -
> -To avoid
> -can't link double-float modules with soft-float modules
> -errors when building 32-bit openSBI don't specify mabi or march.
> -
> -Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug]
> -Signed-off-by: Alistair Francis
> -
>
> - Makefile | 2 --
> - 1 file changed, 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index ccf8ea3..69e5b38 100644
> a/Makefile
> -+++ b/Makefile
> -@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y)
> - CFLAGS= -g -Wall -Werror -ffreestanding -nostdlib
> -fno-strict-aliasing -O2
> - CFLAGS+= -fno-omit-frame-pointer
> -fno-optimize-sibling-calls
> - CFLAGS+= -mno-save-restore -mstrict-align
> --CFLAGS+= -mabi=$(PLATFORM_RISCV_ABI)
> -march=$(PLATFORM_RISCV_ISA)
> - CFLAGS+= -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
> - CFLAGS+= $(GENFLAGS)
> - CFLAGS+= $(platform-cflags-y)
> -@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y)
> - ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
> - ASFLAGS += -fno-omit-frame-pointer
> -fno-optimize-sibling-calls
> - ASFLAGS += -mno-save-restore -mstrict-align
> --ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI)
> -march=$(PLATFORM_RISCV_ISA)
> - ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
> - ASFLAGS += $(GENFLAGS)
> - ASFLAGS += $(platform-asflags-y)
> diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
> b/meta/recipes-bsp/opensbi/opensbi_1.0.bb
> similarity index 91%
> rename from meta/recipes-bsp/opensbi/opensbi_0.9.bb
> rename to meta/recipes-bsp/opensbi/opensbi_1.0.bb
> index 1956fbf9ffc..8430f62543a 100644
> --- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
> +++ b/meta/recipes-bsp/opensbi/opensbi_1.0.bb
> @@ -8,14 +8,13 @@ require opensbi-payloads.inc
>
> inherit autotools-brokensep deploy
>
> -SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351"
> +SRCREV = "ce4c0188d96b2c20c2e08d24646a5e517fe15a4b"
> SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
> - file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
>"
>
> S = "${WORKDIR}/git"
>
> -EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
> +EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= "
> # If RISCV_SBI_PAYLOAD is set then include it as a payload
> EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}"
> EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_fdt(d)}"
> --
> 2.35.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161760):
https://lists.openembedded.org/g/openembedded-core/message/161760
Mute This Topic: https://lists.openembedded.org/mt/89150183/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] opensbi-payloads.inc: Use strings for fallback
On Fri, Oct 15, 2021 at 1:17 PM Khem Raj wrote:
>
> This function is evaluated during parse and some machines maynot use
> external payload, on such machines this fails to parse
>
> Fixes
> bb.data_smart.ExpansionError: Failure expanding variable do_compile[depends],
> expression was ${@riscv_get_do_compile_depends(d)} which triggered exception
> TypeError: argument of type 'NoneType' is not iterab
> le
>
> Signed-off-by: Khem Raj
> Cc: Alistair Francis
Acked-by: Alistair Francis
Alistair
> ---
> meta/recipes-bsp/opensbi/opensbi-payloads.inc | 8
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
> b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
> index cc31ab3b1d..ce537c0587 100644
> --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
> +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
> @@ -17,13 +17,13 @@ def riscv_get_extra_oemake_fdt(d):
> return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt
>
> def riscv_get_do_compile_depends(d):
> -sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
> -sbi_fdt = d.getVar('RISCV_SBI_FDT')
> +sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') or ""
> +sbi_fdt = d.getVar('RISCV_SBI_FDT') or ""
>
> -if sbi_payload is None and sbi_fdt is None:
> +if sbi_payload == "" and sbi_fdt == "":
> return ""
>
> -if sbi_fdt is not None and 'u-boot.bin' in sbi_payload:
> +if sbi_fdt != "" and 'u-boot.bin' in sbi_payload:
> return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
>
> if 'linux' in sbi_payload or 'Image' in sbi_payload:
> --
> 2.33.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156986):
https://lists.openembedded.org/g/openembedded-core/message/156986
Mute This Topic: https://lists.openembedded.org/mt/86331377/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] baremetal-helloworld: Enable RISC-V 32 port
On Sun, Aug 8, 2021 at 2:15 PM Alejandro Hernandez Samaniego
wrote:
>
> $ runqemu nographic
> runqemu - INFO - Running bitbake -e ...
> KERNEL:
> [tmp/deploy/images/qemuriscv32/baremetal-helloworld-image-qemuriscv32.bin]
> MACHINE: [qemuriscv32]
> runqemu - INFO - Running
> tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-riscv32
>
> Hello OpenEmbedded on RISC-V 32!
>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego
Reviewed-by: Alistair Francis
Alistair
> ---
> .../baremetal-examples/baremetal-helloworld_git.bb | 5 +++--
> meta/classes/baremetal-image.bbclass | 3 +++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
>
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> index 37193f5a33..d11e2e530e 100644
> ---
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> +++
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "These are introductory examples to showcase
> the use of QEMU to ru
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449"
>
> -SRCREV = "0bf9ea216e6f76be50726a3a74e527b7bbb0ad93"
> +SRCREV = "31b4e5a337018b4a00a7426b0e5ed83b81df30c7"
> PV = "0.1+git${SRCPV}"
>
> SRC_URI =
> "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> @@ -28,13 +28,14 @@ inherit baremetal-image
> # machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57
> # but the examples can also be run on other architectures/machines
> # such as vexpress-a15 by overriding the setting on the machine.conf
> -COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64"
> +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64|qemuriscv32"
>
> BAREMETAL_QEMUARCH ?= ""
> BAREMETAL_QEMUARCH:qemuarmv5 = "versatile"
> BAREMETAL_QEMUARCH:qemuarm = "arm"
> BAREMETAL_QEMUARCH:qemuarm64 = "aarch64"
> BAREMETAL_QEMUARCH:qemuriscv64 = "riscv64"
> +BAREMETAL_QEMUARCH:qemuriscv32 = "riscv32"
>
> EXTRA_OEMAKE:append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1"
>
> diff --git a/meta/classes/baremetal-image.bbclass
> b/meta/classes/baremetal-image.bbclass
> index 9ec3f1460b..089c445522 100644
> --- a/meta/classes/baremetal-image.bbclass
> +++ b/meta/classes/baremetal-image.bbclass
> @@ -82,12 +82,15 @@ QB_OPT_APPEND:append = " -nographic"
> # RISC-V tunes set the BIOS, unset, and instruct QEMU to
> # ignore the BIOS and boot from -kernel
> QB_DEFAULT_BIOS:qemuriscv64 = ""
> +QB_DEFAULT_BIOS:qemuriscv32 = ""
> QB_OPT_APPEND:append:qemuriscv64 = " -bios none"
> +QB_OPT_APPEND:append:qemuriscv32 = " -bios none"
>
>
> # Use the medium-any code model for the RISC-V 64 bit implementation,
> # since medlow can only access addresses below 0x8000 and RAM
> # starts at 0x8000 on RISC-V 64
> +# Keep RISC-V 32 using -mcmodel=medlow (symbols lie between -2GB:2GB)
> CFLAGS:append:qemuriscv64 = " -mcmodel=medany"
>
>
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154590):
https://lists.openembedded.org/g/openembedded-core/message/154590
Mute This Topic: https://lists.openembedded.org/mt/84741607/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] qemuriscv: Enable 4 core emulation
On Fri, Jun 11, 2021 at 12:44 PM Khem Raj wrote: > > Helps in running tests a bit faster > > Signed-off-by: Khem Raj Reviewed-by: Alistair Francis Alistair > --- > meta/conf/machine/include/riscv/qemuriscv.inc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc > b/meta/conf/machine/include/riscv/qemuriscv.inc > index 428d28bde1..20e2d465a1 100644 > --- a/meta/conf/machine/include/riscv/qemuriscv.inc > +++ b/meta/conf/machine/include/riscv/qemuriscv.inc > @@ -26,6 +26,7 @@ UBOOT_ENTRYPOINT_riscv32 = "0x8040" > UBOOT_ENTRYPOINT_riscv64 = "0x8020" > > # qemuboot options > +QB_SMP = "-smp 4" > QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" > QB_MACHINE = "-machine virt" > QB_DEFAULT_BIOS = "fw_jump.elf" > -- > 2.32.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152857): https://lists.openembedded.org/g/openembedded-core/message/152857 Mute This Topic: https://lists.openembedded.org/mt/83460687/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
Signed-off-by: Alistair Francis
---
meta/classes/uboot-config.bbclass | 4
meta/recipes-bsp/u-boot/u-boot.inc | 7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/classes/uboot-config.bbclass
b/meta/classes/uboot-config.bbclass
index 3bba02828b..6444f58437 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -71,6 +71,10 @@ UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}"
UBOOT_MKIMAGE_SIGN_ARGS ?= ""
SPL_MKIMAGE_SIGN_ARGS ?= ""
+# Options to deploy the u-boot device tree
+UBOOT_DTB ?= ""
+UBOOT_DTB_BINARY ?= ""
+
python () {
ubootmachine = d.getVar("UBOOT_MACHINE")
ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index 5398c2e621..8ccc532f7e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS += "kern-tools-native"
-inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native
+inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1
python3native kernel-arch
DEPENDS += "swig-native"
@@ -346,6 +346,11 @@ do_deploy () {
ln -sf ${UBOOT_EXTLINUX_SYMLINK}
${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}
ln -sf ${UBOOT_EXTLINUX_SYMLINK}
${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}
fi
+
+if [ -n "${UBOOT_DTB}" ]
+then
+install -m 644 ${B}/arch/${UBOOT_ARCH}/dts/${UBOOT_DTB_BINARY}
${DEPLOYDIR}/
+fi
}
addtask deploy before do_build after do_compile
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#152553):
https://lists.openembedded.org/g/openembedded-core/message/152553
Mute This Topic: https://lists.openembedded.org/mt/83272059/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] recipes-bsp/opensbi: Add support for specifying a device tree
Signed-off-by: Alistair Francis
---
meta/recipes-bsp/opensbi/opensbi-payloads.inc | 15 ++-
meta/recipes-bsp/opensbi/opensbi_0.9.bb | 1 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
index 2e32943245..cc31ab3b1d 100644
--- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
+++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
@@ -7,12 +7,25 @@ def riscv_get_extra_oemake_image(d):
return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
+def riscv_get_extra_oemake_fdt(d):
+sbi_fdt = d.getVar('RISCV_SBI_FDT')
+deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
+
+if sbi_fdt is None:
+return ""
+
+return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt
+
def riscv_get_do_compile_depends(d):
sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
+sbi_fdt = d.getVar('RISCV_SBI_FDT')
-if sbi_payload is None:
+if sbi_payload is None and sbi_fdt is None:
return ""
+if sbi_fdt is not None and 'u-boot.bin' in sbi_payload:
+return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
+
if 'linux' in sbi_payload or 'Image' in sbi_payload:
return "virtual/kernel:do_deploy"
if 'u-boot.bin' in sbi_payload:
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
index 52965abda5..5fee52136d 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -18,6 +18,7 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
# If RISCV_SBI_PAYLOAD is set then include it as a payload
EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
+EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_fdt(d)}"
# Required if specifying a custom payload
do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#152554):
https://lists.openembedded.org/g/openembedded-core/message/152554
Mute This Topic: https://lists.openembedded.org/mt/83272061/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC
Disable FW_PIC to fix the error message:
opensbi-0.9-r0 do_package_qa: QA Issue: File
/share/opensbi/lp64/generic/firmware/fw_jump.elf in package opensbi doesn't
have GNU_HASH (didn't pass LDFLAGS?)
This is seen in newer versions of OpenSBI that enable FW_PIC by default.
Signed-off-by: Alistair Francis
---
meta/recipes-bsp/opensbi/opensbi_0.9.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
index cb1c3f2ebf..52965abda5 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
S = "${WORKDIR}/git"
-EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
+EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
# If RISCV_SBI_PAYLOAD is set then include it as a payload
EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#152552):
https://lists.openembedded.org/g/openembedded-core/message/152552
Mute This Topic: https://lists.openembedded.org/mt/83272037/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] baremetal-helloworld: Enable RISC-V 64 port
On Tue, May 11, 2021 at 3:31 PM Alejandro Hernandez Samaniego
wrote:
>
> Add support for MACHINE=qemuriscv64.
>
> $ runqemu nographic
>
> KERNEL:
> [tmp/deploy/images/qemuriscv64/baremetal-helloworld-image-qemuriscv64.bin]
> MACHINE: [qemuriscv64]
> FSTYPE: [bin]
>
> runqemu - INFO - Running
> tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-riscv64
>
> Hello OpenEmbedded on RISC-V 64!
>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego
Reviewed-by: Alistair Francis
Alistair
> ---
> .../baremetal-examples/baremetal-helloworld_git.bb | 5 +++--
> meta/classes/baremetal-image.bbclass | 14 +-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
>
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> index ee945c1ff0..19ef16988f 100644
> ---
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> +++
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "These are introductory examples to showcase
> the use of QEMU to ru
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449"
>
> -SRCREV = "99f4fa4a3b266b42b52af302610b0f4f429ba5e3"
> +SRCREV = "0bf9ea216e6f76be50726a3a74e527b7bbb0ad93"
> PV = "0.1+git${SRCPV}"
>
> SRC_URI =
> "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> @@ -28,12 +28,13 @@ inherit baremetal-image
> # machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57
> # but the examples can also be run on other architectures/machines
> # such as vexpress-a15 by overriding the setting on the machine.conf
> -COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64"
> +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64"
>
> BAREMETAL_QEMUARCH ?= ""
> BAREMETAL_QEMUARCH_qemuarmv5 = "versatile"
> BAREMETAL_QEMUARCH_qemuarm = "arm"
> BAREMETAL_QEMUARCH_qemuarm64 = "aarch64"
> +BAREMETAL_QEMUARCH_qemuriscv64 = "riscv64"
>
> EXTRA_OEMAKE_append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1"
>
> diff --git a/meta/classes/baremetal-image.bbclass
> b/meta/classes/baremetal-image.bbclass
> index b0f5e885b5..319b61c7cd 100644
> --- a/meta/classes/baremetal-image.bbclass
> +++ b/meta/classes/baremetal-image.bbclass
> @@ -73,7 +73,19 @@ QB_DEFAULT_KERNEL ?= "${IMAGE_LINK_NAME}.bin"
> QB_MEM ?= "-m 256"
> QB_DEFAULT_FSTYPE ?= "bin"
> QB_DTB ?= ""
> -QB_OPT_APPEND = "-nographic"
> +QB_OPT_APPEND_append = " -nographic"
> +
> +# RISC-V tunes set the BIOS, unset, and instruct QEMU to
> +# ignore the BIOS and boot from -kernel
> +QB_DEFAULT_BIOS_qemuriscv64 = ""
> +QB_OPT_APPEND_append_qemuriscv64 = " -bios none"
> +
> +
> +# Use the medium-any code model for the RISC-V 64 bit implementation,
> +# since medlow can only access addresses below 0x8000 and RAM
> +# starts at 0x8000 on RISC-V 64
> +CFLAGS_append_qemuriscv64 = " -mcmodel=medany"
> +
>
> # This next part is necessary to trick the build system into thinking
> # its building an image recipe so it generates the qemuboot.conf
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151692):
https://lists.openembedded.org/g/openembedded-core/message/151692
Mute This Topic: https://lists.openembedded.org/mt/82739900/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] baremetal-helloworld: Enable RISC-V 64 port
On Tue, May 11, 2021 at 3:31 PM Alejandro Hernandez Samaniego
wrote:
>
> Add support for MACHINE=qemuriscv64.
>
> $ runqemu nographic
>
> KERNEL:
> [tmp/deploy/images/qemuriscv64/baremetal-helloworld-image-qemuriscv64.bin]
> MACHINE: [qemuriscv64]
> FSTYPE: [bin]
>
> runqemu - INFO - Running
> tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-riscv64
>
> Hello OpenEmbedded on RISC-V 64!
>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego
> ---
> .../baremetal-examples/baremetal-helloworld_git.bb | 5 +++--
> meta/classes/baremetal-image.bbclass | 14 +-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
>
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> index ee945c1ff0..19ef16988f 100644
> ---
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> +++
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "These are introductory examples to showcase
> the use of QEMU to ru
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449"
>
> -SRCREV = "99f4fa4a3b266b42b52af302610b0f4f429ba5e3"
> +SRCREV = "0bf9ea216e6f76be50726a3a74e527b7bbb0ad93"
> PV = "0.1+git${SRCPV}"
>
> SRC_URI =
> "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> @@ -28,12 +28,13 @@ inherit baremetal-image
> # machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57
> # but the examples can also be run on other architectures/machines
> # such as vexpress-a15 by overriding the setting on the machine.conf
> -COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64"
> +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64"
>
> BAREMETAL_QEMUARCH ?= ""
> BAREMETAL_QEMUARCH_qemuarmv5 = "versatile"
> BAREMETAL_QEMUARCH_qemuarm = "arm"
> BAREMETAL_QEMUARCH_qemuarm64 = "aarch64"
> +BAREMETAL_QEMUARCH_qemuriscv64 = "riscv64"
>
> EXTRA_OEMAKE_append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1"
>
> diff --git a/meta/classes/baremetal-image.bbclass
> b/meta/classes/baremetal-image.bbclass
> index b0f5e885b5..319b61c7cd 100644
> --- a/meta/classes/baremetal-image.bbclass
> +++ b/meta/classes/baremetal-image.bbclass
> @@ -73,7 +73,19 @@ QB_DEFAULT_KERNEL ?= "${IMAGE_LINK_NAME}.bin"
> QB_MEM ?= "-m 256"
> QB_DEFAULT_FSTYPE ?= "bin"
> QB_DTB ?= ""
> -QB_OPT_APPEND = "-nographic"
> +QB_OPT_APPEND_append = " -nographic"
> +
> +# RISC-V tunes set the BIOS, unset, and instruct QEMU to
> +# ignore the BIOS and boot from -kernel
> +QB_DEFAULT_BIOS_qemuriscv64 = ""
> +QB_OPT_APPEND_append_qemuriscv64 = " -bios none"
Sorry, I forgot to reply to the other thread.
Can't you just set QB_DEFAULT_BIOS to "none"?
Alistair
> +
> +
> +# Use the medium-any code model for the RISC-V 64 bit implementation,
> +# since medlow can only access addresses below 0x8000 and RAM
> +# starts at 0x8000 on RISC-V 64
> +CFLAGS_append_qemuriscv64 = " -mcmodel=medany"
> +
>
> # This next part is necessary to trick the build system into thinking
> # its building an image recipe so it generates the qemuboot.conf
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151582):
https://lists.openembedded.org/g/openembedded-core/message/151582
Mute This Topic: https://lists.openembedded.org/mt/82739900/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] baremetal-helloworld: Enable RISC-V 64 port
On Sat, May 8, 2021 at 6:30 PM Alejandro Hernandez Samaniego
wrote:
>
> Add support for MACHINE=qemuriscv64.
>
> $ runqemu nographic
>
> BIOS:
> [tmp/deploy/images/qemuriscv64/baremetal-helloworld-image-qemuriscv64.elf]
> MACHINE: [qemuriscv64]
>
> runqemu - INFO - Running
> tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-riscv64
>
> Hello OpenEmbedded on RISC-V 64!
>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego
> ---
> .../baremetal-examples/baremetal-helloworld_git.bb | 12 ++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
>
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> index ee945c1ff0..3b7b8193a7 100644
> ---
> a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> +++
> b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "These are introductory examples to showcase
> the use of QEMU to ru
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449"
>
> -SRCREV = "99f4fa4a3b266b42b52af302610b0f4f429ba5e3"
> +SRCREV = "0bf9ea216e6f76be50726a3a74e527b7bbb0ad93"
> PV = "0.1+git${SRCPV}"
>
> SRC_URI =
> "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> @@ -28,12 +28,13 @@ inherit baremetal-image
> # machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57
> # but the examples can also be run on other architectures/machines
> # such as vexpress-a15 by overriding the setting on the machine.conf
> -COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64"
> +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64"
>
> BAREMETAL_QEMUARCH ?= ""
> BAREMETAL_QEMUARCH_qemuarmv5 = "versatile"
> BAREMETAL_QEMUARCH_qemuarm = "arm"
> BAREMETAL_QEMUARCH_qemuarm64 = "aarch64"
> +BAREMETAL_QEMUARCH_qemuriscv64 = "riscv64"
>
> EXTRA_OEMAKE_append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1"
>
> @@ -49,3 +50,10 @@ FILES_${PN} += " \
> ${base_libdir}/firmware/${BAREMETAL_BINNAME}.bin \
> ${base_libdir}/firmware/${BAREMETAL_BINNAME}.elf \
> "
> +
> +# RISC-V tunes set the BIOS, redefine since runqemu jumps there
> +QB_DEFAULT_BIOS_qemuriscv64 = "${IMAGE_LINK_NAME}.elf"
You should also just be able to say `-bios none` and then use the
-kernel argument as normal.
Alistair
> +
> +# Use the medium-any code model for the RISC-V 64 bit implementation,
> +# since medlow can only access addresses below 0x8000
> +CFLAGS_append_qemuriscv64 = " -mcmodel=medany"
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151500):
https://lists.openembedded.org/g/openembedded-core/message/151500
Mute This Topic: https://lists.openembedded.org/mt/82674159/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] conf/machine: Enable bochs-display on RISC-V machines
Enable the bochs-display as q QEMU argument when running on RISC-V machines. Signed-off-by: Alistair Francis --- meta/conf/machine/include/riscv/qemuriscv.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 47d7e9b174..493124d946 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -34,3 +34,4 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +QB_GRAPHICS = "-device bochs-display" -- 2.31.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150166): https://lists.openembedded.org/g/openembedded-core/message/150166 Mute This Topic: https://lists.openembedded.org/mt/81782174/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] grub2: Disable for RISCV32
On Fri, Mar 26, 2021 at 12:37 AM Khem Raj wrote: > > A full working port is not available yet, until such time disable it > > Signed-off-by: Khem Raj > Cc: Alistair Francis Reviewed-by: Alistair Francis Alistair > --- > meta/recipes-bsp/grub/grub2.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc > index bcff676c26..d88c3fd3ad 100644 > --- a/meta/recipes-bsp/grub/grub2.inc > +++ b/meta/recipes-bsp/grub/grub2.inc > @@ -33,7 +33,7 @@ UPSTREAM_CHECK_REGEX = > "grub-(?P\d+(\.\d+)+)\.tar\.(gz|xz)" > > DEPENDS = "flex-native bison-native gettext-native" > > -COMPATIBLE_HOST = > '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv.*)-(linux.*|freebsd.*)' > +COMPATIBLE_HOST = > '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv64)-(linux.*|freebsd.*)' > COMPATIBLE_HOST_armv7a = 'null' > COMPATIBLE_HOST_armv7ve = 'null' > > -- > 2.31.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150019): https://lists.openembedded.org/g/openembedded-core/message/150019 Mute This Topic: https://lists.openembedded.org/mt/81621162/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] grub-efi: Fix build failure on RISCV32
On Thu, Mar 25, 2021 at 12:15 AM Khem Raj wrote:
>
> Signed-off-by: Khem Raj
> Cc: Alistair Francis
I'm not sure if this is the right thing to do here.
Have you tested this does GRUB boot with this check removed?
>From memory I don't think the original GRUB port would have been tested on
>RV32.
Alistair
> ---
> ...sable-offset-overflow-check-for-rv32.patch | 45 +++
> meta/recipes-bsp/grub/grub2.inc | 1 +
> 2 files changed, 46 insertions(+)
> create mode 100644
> meta/recipes-bsp/grub/files/0001-Disable-offset-overflow-check-for-rv32.patch
>
> diff --git
> a/meta/recipes-bsp/grub/files/0001-Disable-offset-overflow-check-for-rv32.patch
>
> b/meta/recipes-bsp/grub/files/0001-Disable-offset-overflow-check-for-rv32.patch
> new file mode 100644
> index 00..6547bf2261
> --- /dev/null
> +++
> b/meta/recipes-bsp/grub/files/0001-Disable-offset-overflow-check-for-rv32.patch
> @@ -0,0 +1,45 @@
> +From ce1cea0563011698e4a70c9a60e7da66b57ab1d6 Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Wed, 24 Mar 2021 20:55:56 -0700
> +Subject: [PATCH] Disable offset overflow check for rv32
> +
> +Fixes
> +/tmp/grub/grub-mkimage: error: target 17c6 not reachable from pc=936.
> +
> +Upstream-Status: Reported [https://savannah.gnu.org/bugs/index.php?60283]
> +Signed-off-by: Khem Raj
> +---
> + util/grub-mkimagexx.c | 6 --
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
> +index 00f49ccaa..6deb66226 100644
> +--- a/util/grub-mkimagexx.c
> b/util/grub-mkimagexx.c
> +@@ -1297,9 +1297,10 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct
> section_metadata *smd,
> +{
> + grub_uint32_t hi20, lo12;
> +
> ++#ifdef MKIMAGE_ELF64
> + if (off != (grub_int32_t)off)
> +grub_util_error ("target %lx not reachable from
> pc=%lx", (long)sym_addr, (long)((char *)target - (char *)e));
> +-
> ++#endif
> + hi20 = (off + 0x800) & 0xf000;
> + lo12 = (off - hi20) & 0xfff;
> + t32[0] = grub_host_to_target32 ((grub_target_to_host32
> (t32[0]) & 0xfff) | hi20);
> +@@ -1336,9 +1337,10 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct
> section_metadata *smd,
> +{
> + grub_int32_t hi20;
> +
> ++#ifdef MKIMAGE_ELF64
> + if (off != (grub_int32_t)off)
> +grub_util_error ("target %lx not reachable from
> pc=%lx", (long)sym_addr, (long)((char *)target - (char *)e));
> +-
> ++#endif
> + hi20 = (off + 0x800) & 0xf000;
> + *t32 = grub_host_to_target32 ((grub_target_to_host32
> (*t32) & 0xfff) | hi20);
> +}
> +--
> +2.31.0
> +
> diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
> index bcff676c26..d8a556e06c 100644
> --- a/meta/recipes-bsp/grub/grub2.inc
> +++ b/meta/recipes-bsp/grub/grub2.inc
> @@ -19,6 +19,7 @@ SRC_URI =
> "https://alpha.gnu.org/gnu/grub/grub-${REALPV}.tar.xz \
> file://grub-module-explicitly-keeps-symbole-.module_license.patch
> \
> file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
> file://determinism.patch \
> + file://0001-Disable-offset-overflow-check-for-rv32.patch \
> "
>
> SRC_URI[sha256sum] =
> "2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484"
> --
> 2.31.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149951):
https://lists.openembedded.org/g/openembedded-core/message/149951
Mute This Topic: https://lists.openembedded.org/mt/81595170/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] u-boot: Add support for building for qemuriscv32
Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv32.conf| 7 ++-- ...iscv32-Use-double-float-ABI-for-rv32.patch | 42 +++ meta/recipes-bsp/u-boot/u-boot_2021.01.bb | 2 + 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch diff --git a/meta/conf/machine/qemuriscv32.conf b/meta/conf/machine/qemuriscv32.conf index 1413775ad6..d3858dc051 100644 --- a/meta/conf/machine/qemuriscv32.conf +++ b/meta/conf/machine/qemuriscv32.conf @@ -11,7 +11,6 @@ PREFERRED_VERSION_openocd = "riscv" XVISOR_PLAT = "riscv/virt32" -# u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules" -# EXTRA_IMAGEDEPENDS += "u-boot" -# UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" -# UBOOT_ELF = "u-boot" +EXTRA_IMAGEDEPENDS += "u-boot" +UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" +UBOOT_ELF = "u-boot" diff --git a/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch new file mode 100644 index 00..0ed3de4914 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch @@ -0,0 +1,42 @@ +From 66dfe0fa886f6289add06d1af8642ce2b5302852 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 9 Feb 2021 16:40:12 -0800 +Subject: [PATCH] riscv32: Use double-float ABI for rv32 + +So it can use libgcc built with OE toolchain +Fixes +error: "can't link hard-float modules with soft-float modules" + +Signed-off-by: Khem Raj +Upstream-Status: Inappropriate [embedded specific] +--- + arch/riscv/Makefile | 6 -- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d86..7324946f48 100644 +--- a/arch/riscv/Makefile b/arch/riscv/Makefile +@@ -9,7 +9,9 @@ ifeq ($(CONFIG_ARCH_RV64I),y) + endif + ifeq ($(CONFIG_ARCH_RV32I),y) + ARCH_BASE = rv32im +- ABI = ilp32 ++ ABI = ilp32d ++ ARCH_D = d ++ ARCH_F = f + endif + ifeq ($(CONFIG_RISCV_ISA_A),y) + ARCH_A = a +@@ -24,7 +26,7 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \ +-mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.30.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb index 2eef1e900e..bbbc99bf8d 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb @@ -1,4 +1,6 @@ require u-boot-common.inc require u-boot.inc +SRC_URI_append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch" + DEPENDS += "bc-native dtc-native python3-setuptools-native" -- 2.30.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149372): https://lists.openembedded.org/g/openembedded-core/message/149372 Mute This Topic: https://lists.openembedded.org/mt/81291107/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] perf: Remove libunwind for rv32
On Thu, Mar 11, 2021 at 8:36 PM Khem Raj wrote:
>
> libunwind is not yet ported to RISCV32
>
> Signed-off-by: Khem Raj
> Cc: Alistair Francis
Reviewed-by: Alistair Francis
Alistair
> ---
> meta/recipes-kernel/perf/perf.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index c7653e523c..edb1335154 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -32,6 +32,7 @@ PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd"
> # libunwind is not yet ported for some architectures
> PACKAGECONFIG_remove_arc = "libunwind"
> PACKAGECONFIG_remove_riscv64 = "libunwind"
> +PACKAGECONFIG_remove_riscv32 = "libunwind"
>
> DEPENDS = " \
> virtual/${MLPREFIX}libc \
> --
> 2.30.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149371):
https://lists.openembedded.org/g/openembedded-core/message/149371
Mute This Topic: https://lists.openembedded.org/mt/81269600/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] u-boot: Add support for building for qemuriscv32
Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv32.conf| 7 ++-- ...iscv32-Use-double-float-ABI-for-rv32.patch | 42 +++ meta/recipes-bsp/u-boot/u-boot_2021.01.bb | 2 + 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch diff --git a/meta/conf/machine/qemuriscv32.conf b/meta/conf/machine/qemuriscv32.conf index 1413775ad6..d3858dc051 100644 --- a/meta/conf/machine/qemuriscv32.conf +++ b/meta/conf/machine/qemuriscv32.conf @@ -11,7 +11,6 @@ PREFERRED_VERSION_openocd = "riscv" XVISOR_PLAT = "riscv/virt32" -# u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules" -# EXTRA_IMAGEDEPENDS += "u-boot" -# UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" -# UBOOT_ELF = "u-boot" +EXTRA_IMAGEDEPENDS += "u-boot" +UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" +UBOOT_ELF = "u-boot" diff --git a/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch new file mode 100644 index 00..55b649db50 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch @@ -0,0 +1,42 @@ +From 66dfe0fa886f6289add06d1af8642ce2b5302852 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 9 Feb 2021 16:40:12 -0800 +Subject: [PATCH] riscv32: Use double-float ABI for rv32 + +So it can use libgcc built with OE toolchain +Fixes +error: "can't link hard-float modules with soft-float modules" + +Signed-off-by: Khem Raj +Upstream-Status: Inappropriate [configuration] +--- + arch/riscv/Makefile | 6 -- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d86..7324946f48 100644 +--- a/arch/riscv/Makefile b/arch/riscv/Makefile +@@ -9,7 +9,9 @@ ifeq ($(CONFIG_ARCH_RV64I),y) + endif + ifeq ($(CONFIG_ARCH_RV32I),y) + ARCH_BASE = rv32im +- ABI = ilp32 ++ ABI = ilp32d ++ ARCH_D = d ++ ARCH_F = f + endif + ifeq ($(CONFIG_RISCV_ISA_A),y) + ARCH_A = a +@@ -24,7 +26,7 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \ +-mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.30.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb index 2eef1e900e..2b7aeb78f4 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb @@ -1,4 +1,6 @@ require u-boot-common.inc require u-boot.inc +SRC_URI_append_qemuriscv32 = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch" + DEPENDS += "bc-native dtc-native python3-setuptools-native" -- 2.30.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149286): https://lists.openembedded.org/g/openembedded-core/message/149286 Mute This Topic: https://lists.openembedded.org/mt/81253846/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] machine: Initial commit of qemuriscv32
Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv32.conf | 17 + 1 file changed, 17 insertions(+) create mode 100644 meta/conf/machine/qemuriscv32.conf diff --git a/meta/conf/machine/qemuriscv32.conf b/meta/conf/machine/qemuriscv32.conf new file mode 100644 index 00..1413775ad6 --- /dev/null +++ b/meta/conf/machine/qemuriscv32.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: generic riscv32 machine +#@DESCRIPTION: Machine configuration for running a generic riscv32 + +require conf/machine/include/riscv/qemuriscv.inc + +DEFAULTTUNE = "riscv32" + +PREFERRED_VERSION_openocd-native = "riscv" +PREFERRED_VERSION_openocd = "riscv" + +XVISOR_PLAT = "riscv/virt32" + +# u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules" +# EXTRA_IMAGEDEPENDS += "u-boot" +# UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" +# UBOOT_ELF = "u-boot" -- 2.30.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149169): https://lists.openembedded.org/g/openembedded-core/message/149169 Mute This Topic: https://lists.openembedded.org/mt/81204642/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] openssl: Enable building for RISC-V 32-bit
Signed-off-by: Alistair Francis
---
...ort-for-io_pgetevents_time64-syscall.patch | 62
...ort-for-io_pgetevents_time64-syscall.patch | 99 +++
.../openssl/openssl_1.1.1j.bb | 5 +
3 files changed, 166 insertions(+)
create mode 100644
meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl/0004-Fixup-support-for-io_pgetevents_time64-syscall.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
new file mode 100644
index 00..d62b9344c1
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
@@ -0,0 +1,62 @@
+From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the
+syscall has been replaced with the io_pgetevents_time64 syscall instead.
+
+This patch changes the io_getevents() function to use the correct
+syscall based on the avaliable syscalls and the time_t size. We will
+only use the new 64-bit time_t syscall if the architecture is using a
+64-bit time_t. This is to avoid having to deal with 32/64-bit
+conversions and relying on a 64-bit timespec struct on 32-bit time_t
+platforms. As of Linux 5.3 there are no 32-bit time_t architectures
+without __NR_io_getevents. In the future if a 32-bit time_t architecture
+wants to use the 64-bit syscalls we can handle the conversion.
+
+This fixes build failures on 32-bit RISC-V.
+
+Signed-off-by: Alistair Francis
+
+Reviewed-by: Richard Levitte
+Reviewed-by: Paul Dale
+(Merged from https://github.com/openssl/openssl/pull/9819)
+Upstream-Status: Accepted
+---
+ engines/e_afalg.c | 16
+ 1 file changed, 16 insertions(+)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index dacbe358cb..99516cb1bb 100644
+--- a/engines/e_afalg.c
b/engines/e_afalg.c
+@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx,
long min, long max,
+struct io_event *events,
+struct timespec *timeout)
+ {
++#if defined(__NR_io_getevents)
+ return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#elif defined(__NR_io_pgetevents_time64)
++/* Let's only support the 64 suffix syscalls for 64-bit time_t.
++ * This simplifies the code for us as we don't need to use a 64-bit
++ * version of timespec with a 32-bit time_t and handle converting
++ * between 64-bit and 32-bit times and check for overflows.
++ */
++if (sizeof(timeout->tv_sec) == 8)
++return syscall(__NR_io_pgetevents_time64, ctx, min, max, events,
timeout, NULL);
++else {
++errno = ENOSYS;
++return -1;
++}
++#else
++# error "We require either the io_getevents syscall or
__NR_io_pgetevents_time64."
++#endif
+ }
+
+ static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
+--
+2.30.1
+
diff --git
a/meta/recipes-connectivity/openssl/openssl/0004-Fixup-support-for-io_pgetevents_time64-syscall.patch
b/meta/recipes-connectivity/openssl/openssl/0004-Fixup-support-for-io_pgetevents_time64-syscall.patch
new file mode 100644
index 00..c8bc6f5c68
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl/0004-Fixup-support-for-io_pgetevents_time64-syscall.patch
@@ -0,0 +1,99 @@
+From e5499a3cac1e823c3e0697e8667e952317b70cc8 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 4 Mar 2021 12:10:11 -0500
+Subject: [PATCH] Fixup support for io_pgetevents_time64 syscall
+
+This is a fixup for the original commit
5b5e2985f355c8e99c196d9ce5d02c15bebadfbc
+"Add support for io_pgetevents_time64 syscall" that didn't correctly
+work for 32-bit architecutres with a 64-bit time_t that aren't RISC-V.
+
+For a full discussion of the issue see:
+https://github.com/openssl/openssl/commit/5b5e2985f355c8e99c196d9ce5d02c15bebadfbc
+
+Signed-off-by: Alistair Francis
+
+Reviewed-by: Tomas Mraz
+Reviewed-by: Paul Dale
+(Merged from https://github.com/openssl/openssl/pull/14432)
+Upstream-Status: Accepted
+---
+ engines/e_afalg.c | 55 ---
+ 1 file changed, 42 insertions(+), 13 deletions(-)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index 9480d7c24b..4e9d67db2d 100644
+--- a/engines/e_afalg.c
b/engines/e_afalg.c
+@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long
n, struct iocb **ioc
[OE-core] [PATCH 2/3] linux-yocto: Add qemuriscv32 as a compatible machine
Signed-off-by: Alistair Francis --- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 6c0bec76d7..5f77a42b04 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -8,6 +8,7 @@ KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" KBRANCH_qemuriscv64 ?= "v5.10/standard/base" +KBRANCH_qemuriscv32 ?= "v5.10/standard/base" KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" @@ -17,6 +18,7 @@ SRCREV_machine_qemuarm64 ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" SRCREV_machine_qemumips ?= "d6e16284f4bd6e627ef6dc2f6aea7116ae871d3e" SRCREV_machine_qemuppc ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" SRCREV_machine_qemuriscv64 ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" +SRCREV_machine_qemuriscv32 ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" SRCREV_machine_qemux86 ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" SRCREV_machine_qemux86-64 ?= "5b86278250511c301540dc2ce5bf9561621b0bb4" SRCREV_machine_qemumips64 ?= "40975f4cdd7da46177e9b7817740a0aa22313897" @@ -43,7 +45,7 @@ KCONF_BSP_AUDIT_LEVEL = "1" KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" -COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -- 2.30.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149170): https://lists.openembedded.org/g/openembedded-core/message/149170 Mute This Topic: https://lists.openembedded.org/mt/81204643/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] openssl: Enable building for RISC-V 32-bit
On Thu, Feb 11, 2021 at 9:13 AM Andrey Zhizhikin wrote:
>
> Hello Alistair,
>
> On Thu, Feb 11, 2021 at 5:52 PM Alistair Francis
> wrote:
> >
> > Signed-off-by: Alistair Francis
> > ---
> > ...ort-for-io_pgetevents_time64-syscall.patch | 58 +++
> > .../openssl/openssl_1.1.1i.bb | 4 ++
> > 2 files changed, 62 insertions(+)
> > create mode 100644
> > meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
> >
> > diff --git
> > a/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
> >
> > b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
> > new file mode 100644
> > index 00..591354fbb9
> > --- /dev/null
> > +++
> > b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
> > @@ -0,0 +1,58 @@
> > +From d1a1b797d961301fd58513e50ac5de9ad5b8bc08 Mon Sep 17 00:00:00 2001
> > +From: Alistair Francis
> > +Date: Thu, 29 Aug 2019 13:56:21 -0700
> > +Subject: [PATCH] Add support for io_pgetevents_time64 syscall
> > +
> > +32-bit architectures that are y2038 safe don't include syscalls that use
> > +32-bit time_t. Instead these architectures have suffixed syscalls that
> > +always use a 64-bit time_t. In the case of the io_getevents syscall the
> > +syscall has been replaced with the io_pgetevents_time64 syscall instead.
> > +
> > +This patch changes the io_getevents() function to use the correct
> > +syscall based on the avaliable syscalls and the time_t size. We will
> > +only use the new 64-bit time_t syscall if the architecture is using a
> > +64-bit time_t. This is to avoid having to deal with 32/64-bit
> > +conversions and relying on a 64-bit timespec struct on 32-bit time_t
> > +platforms. As of Linux 5.3 there are no 32-bit time_t architectures
> > +without __NR_io_getevents. In the future if a 32-bit time_t architecture
> > +wants to use the 64-bit syscalls we can handle the conversion.
> > +
> > +This fixes build failures on 32-bit RISC-V.
> > +
> > +Signed-off-by: Alistair Francis
> > +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9819]
>
> This PR and related commit has not been integrated in 1.1.1-stable
> branch, and according to Arnd [1] - it might be wrong.
>
> I do not know if this can be taken like that, but just want to point
> out that upstream did not fully take the change you're providing here.
Thanks for pointing that out, I'll have to look into it more then.
Alistair
>
> > +---
> > + engines/e_afalg.c | 16
> > + 1 file changed, 16 insertions(+)
> > +
> > +diff --git a/engines/e_afalg.c b/engines/e_afalg.c
> > +index dacbe358cb..99516cb1bb 100644
> > +--- a/engines/e_afalg.c
> > b/engines/e_afalg.c
> > +@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t
> > ctx, long min, long max,
> > +struct io_event *events,
> > +struct timespec *timeout)
> > + {
> > ++#if defined(__NR_io_getevents)
> > + return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
> > ++#elif defined(__NR_io_pgetevents_time64)
> > ++/* Let's only support the 64 suffix syscalls for 64-bit time_t.
> > ++ * This simplifies the code for us as we don't need to use a 64-bit
> > ++ * version of timespec with a 32-bit time_t and handle converting
> > ++ * between 64-bit and 32-bit times and check for overflows.
> > ++ */
> > ++if (sizeof(timeout->tv_sec) == 8)
> > ++return syscall(__NR_io_pgetevents_time64, ctx, min, max, events,
> > timeout, NULL);
> > ++else {
> > ++errno = ENOSYS;
> > ++return -1;
> > ++}
> > ++#else
> > ++# error "We require either the io_getevents syscall or
> > __NR_io_pgetevents_time64."
> > ++#endif
> > + }
> > +
> > + static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
> > +--
> > +2.23.0
> > +
> > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
> > b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
> > index 86950f7544..599d78abea 100644
> > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
> > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
> > @@ -23,6 +23,10 @@ SRC_URI_append_class-nativesdk = " \
> > file://environment.d-openssl.sh \
&
[OE-core] [PATCH] openssl: Enable building for RISC-V 32-bit
Signed-off-by: Alistair Francis
---
...ort-for-io_pgetevents_time64-syscall.patch | 58 +++
.../openssl/openssl_1.1.1i.bb | 4 ++
2 files changed, 62 insertions(+)
create mode 100644
meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
new file mode 100644
index 00..591354fbb9
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch
@@ -0,0 +1,58 @@
+From d1a1b797d961301fd58513e50ac5de9ad5b8bc08 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the
+syscall has been replaced with the io_pgetevents_time64 syscall instead.
+
+This patch changes the io_getevents() function to use the correct
+syscall based on the avaliable syscalls and the time_t size. We will
+only use the new 64-bit time_t syscall if the architecture is using a
+64-bit time_t. This is to avoid having to deal with 32/64-bit
+conversions and relying on a 64-bit timespec struct on 32-bit time_t
+platforms. As of Linux 5.3 there are no 32-bit time_t architectures
+without __NR_io_getevents. In the future if a 32-bit time_t architecture
+wants to use the 64-bit syscalls we can handle the conversion.
+
+This fixes build failures on 32-bit RISC-V.
+
+Signed-off-by: Alistair Francis
+Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9819]
+---
+ engines/e_afalg.c | 16
+ 1 file changed, 16 insertions(+)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index dacbe358cb..99516cb1bb 100644
+--- a/engines/e_afalg.c
b/engines/e_afalg.c
+@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx,
long min, long max,
+struct io_event *events,
+struct timespec *timeout)
+ {
++#if defined(__NR_io_getevents)
+ return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#elif defined(__NR_io_pgetevents_time64)
++/* Let's only support the 64 suffix syscalls for 64-bit time_t.
++ * This simplifies the code for us as we don't need to use a 64-bit
++ * version of timespec with a 32-bit time_t and handle converting
++ * between 64-bit and 32-bit times and check for overflows.
++ */
++if (sizeof(timeout->tv_sec) == 8)
++return syscall(__NR_io_pgetevents_time64, ctx, min, max, events,
timeout, NULL);
++else {
++errno = ENOSYS;
++return -1;
++}
++#else
++# error "We require either the io_getevents syscall or
__NR_io_pgetevents_time64."
++#endif
+ }
+
+ static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
+--
+2.23.0
+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
index 86950f7544..599d78abea 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb
@@ -23,6 +23,10 @@ SRC_URI_append_class-nativesdk = " \
file://environment.d-openssl.sh \
"
+SRC_URI_append_riscv32 = " \
+ file://0003-Add-support-for-io_pgetevents_time64-syscall.patch \
+ "
+
SRC_URI[sha256sum] =
"e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
inherit lib_package multilib_header multilib_script ptest
--
2.30.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#147968):
https://lists.openembedded.org/g/openembedded-core/message/147968
Mute This Topic: https://lists.openembedded.org/mt/80562146/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] opensbi: Bump from 0.8 to 0.9
Signed-off-by: Alistair Francis
---
meta/recipes-bsp/opensbi/{opensbi_0.8.bb => opensbi_0.9.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-bsp/opensbi/{opensbi_0.8.bb => opensbi_0.9.bb} (97%)
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.8.bb
b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
similarity index 97%
rename from meta/recipes-bsp/opensbi/opensbi_0.8.bb
rename to meta/recipes-bsp/opensbi/opensbi_0.9.bb
index 818efac733..9f17258edb 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.8.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -7,7 +7,7 @@ require opensbi-payloads.inc
inherit autotools-brokensep deploy
-SRCREV = "a98258d0b537a295f517bbc8d813007336731fa9"
+SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351"
SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
"
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#147096):
https://lists.openembedded.org/g/openembedded-core/message/147096
Mute This Topic: https://lists.openembedded.org/mt/80016073/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/4] qemu: Upgrade 5.1.0->5.2.0
On Wed, Jan 6, 2021 at 2:36 PM Richard Purdie
wrote:
>
> This involves some pretty major changes for qemu. In particular, they
> switched to meson+ninja so we have to adapt to that.
>
> Patch changes:
> * CVE patches - dropped as backports
> * cflags fix - upstream code changed significantly, need new patch if still
> issues
> * mips TLB entries - dropped as merged upstream
> * usb fix - dropped as merged upstream
> * find_datadir - dropped as code no longer present that I could find
>
> A patch was added to allow us to force the configure script into "cross" mode
> without setting cross_prefix which has other effects we don't need/want.
>
> Dependencies on meson/ninja were added.
>
> Specifying the python interpreter causes the internal meson copy to be
> built/used which is undesireable for us so don't do that. The correct
> python is in PATH anyway.
>
> Signed-off-by: Richard Purdie
Acked-by: Alistair Francis
Alistair
> ---
> meta/conf/distro/include/tcmode-default.inc | 2 +-
> ...u-native_5.1.0.bb => qemu-native_5.2.0.bb} | 0
> ...e_5.1.0.bb => qemu-system-native_5.2.0.bb} | 0
> meta/recipes-devtools/qemu/qemu.inc | 19 ++--
> .../qemu/0001-Add-enable-disable-udev.patch | 8 +-
> ...emu-Add-missing-wacom-HID-descriptor.patch | 16 +--
> ...mu-Do-not-include-file-if-not-exists.patch | 8 +-
> ...ease-number-of-TLB-entries-on-the-34.patch | 59 --
> ...test-which-runs-all-unit-test-cases-.patch | 12 +--
> ...n-environment-space-to-boot-loader-q.patch | 8 +-
> .../qemu/0004-qemu-disable-Valgrind.patch | 8 +-
> ...ld.bfd-fix-cflags-and-set-some-envir.patch | 28 -
> ...-connect-socket-to-a-spawned-command.patch | 44
> .../0007-apic-fixup-fallthrough-to-PIC.patch | 8 +-
> ...webkitgtk-hangs-on-32-bit-x86-target.patch | 6 +-
> .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 40 +++
> ...dd-pkg-config-handling-for-libgcrypt.patch | 23 ++--
> .../qemu/qemu/CVE-2020-24352.patch| 52 -
> .../qemu/qemu/CVE-2020-25624.patch| 101 --
> .../qemu/qemu/CVE-2020-25723.patch| 51 -
> .../qemu/qemu/CVE-2020-28916.patch| 49 -
> .../qemu/CVE-2020-29129-CVE-2020-29130.patch | 64 ---
> meta/recipes-devtools/qemu/qemu/cross.patch | 30 ++
> .../qemu/qemu/find_datadir.patch | 39 ---
> .../qemu/qemu/usb-fix-setup_len-init.patch| 89 ---
> .../qemu/{qemu_5.1.0.bb => qemu_5.2.0.bb} | 2 +-
> 26 files changed, 127 insertions(+), 639 deletions(-)
> rename meta/recipes-devtools/qemu/{qemu-native_5.1.0.bb =>
> qemu-native_5.2.0.bb} (100%)
> rename meta/recipes-devtools/qemu/{qemu-system-native_5.1.0.bb =>
> qemu-system-native_5.2.0.bb} (100%)
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch
> delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-24352.patch
> delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-25624.patch
> delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch
> delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/CVE-2020-29129-CVE-2020-29130.patch
> create mode 100644 meta/recipes-devtools/qemu/qemu/cross.patch
> delete mode 100644 meta/recipes-devtools/qemu/qemu/find_datadir.patch
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/usb-fix-setup_len-init.patch
> rename meta/recipes-devtools/qemu/{qemu_5.1.0.bb => qemu_5.2.0.bb} (93%)
>
> diff --git a/meta/conf/distro/include/tcmode-default.inc
> b/meta/conf/distro/include/tcmode-default.inc
> index fd4d760b3fe..5540e37bcf9 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -22,7 +22,7 @@ BINUVERSION ?= "2.35%"
> GDBVERSION ?= "10.%"
> GLIBCVERSION ?= "2.32"
> LINUXLIBCVERSION ?= "5.10%"
> -QEMUVERSION ?= "5.1%"
> +QEMUVERSION ?= "5.2%"
> GOVERSION ?= "1.15%"
> # This can not use wildcards like 8.0.% since it is also used in mesa to
> denote
> # llvm version being used, so always bump it with llvm recipe version bump
> diff --git a/meta/recipes-devtools/qemu/qemu-native_5.1.0.bb
> b/meta/recipes-devtools/qemu/qemu-native_5.2.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/qemu/qemu-native_5.1.0.bb
> rename to meta/recipes-devtools/qemu/qemu-native_5.2.0.bb
>
Re: [OE-core] [PATCH 3/4] qemu: Drop vm reservation changes to resolve build issues
On Wed, Jan 6, 2021 at 2:36 PM Richard Purdie
wrote:
>
> When building with the new version of qemu we see errors like:
>
> """
> qemu-i386: Unable to reserve 0x7000 bytes of virtual address space at
> 0x1000 (Success) for use as guest address space (check your virtual memory
> ulimit setting, min_mmap_addr or reserve less using -R option)
>
> ERROR: The postinstall intercept hook 'update_gio_module_cache-nativesdk'
> failed
> """
>
> The VM reseration patches we're carrying look suspicious in this context.
> Drop them since we don't appear to be seeing those issues any more on the
> autobuilder and I suspect the patches have become broken and a liability.
> webkitgtk builds seem to be ok now.
Yes! Getting rid of these patches is great!
>
> Signed-off-by: Richard Purdie
Reviewed-by: Alistair Francis
Alistair
> ---
> meta/recipes-devtools/qemu/qemu.inc | 2 -
> ...webkitgtk-hangs-on-32-bit-x86-target.patch | 33 -
> .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 137 --
> 3 files changed, 172 deletions(-)
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
> delete mode 100644
> meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch
>
> diff --git a/meta/recipes-devtools/qemu/qemu.inc
> b/meta/recipes-devtools/qemu/qemu.inc
> index 23d0adb901a..4c1502da7f1 100644
> --- a/meta/recipes-devtools/qemu/qemu.inc
> +++ b/meta/recipes-devtools/qemu/qemu.inc
> @@ -23,8 +23,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
> file://0004-qemu-disable-Valgrind.patch \
> file://0006-chardev-connect-socket-to-a-spawned-command.patch \
> file://0007-apic-fixup-fallthrough-to-PIC.patch \
> -
> file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
> - file://0009-Fix-webkitgtk-builds.patch \
> file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch
> \
> file://0001-Add-enable-disable-udev.patch \
> file://0001-qemu-Do-not-include-file-if-not-exists.patch \
> diff --git
> a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
>
> b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
> deleted file mode 100644
> index 74621a08e80..000
> ---
> a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001
> -From: Alistair Francis
> -Date: Wed, 17 Jan 2018 10:51:49 -0800
> -Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target
> -
> -Since commit "linux-user: Tidy and enforce reserved_va initialization"
> -(18e80c55bb6ec17c05ec0ba717ec83933c2bfc07) the Yocto webkitgtk build
> -hangs when cross compiling for 32-bit x86 on a 64-bit x86 machine using
> -musl.
> -
> -To fix the issue reduce the MAX_RESERVED_VA macro to be a closer match
> -to what it was before the problematic commit.
> -
> -Upstream-Status: Submitted
> http://lists.gnu.org/archive/html/qemu-devel/2018-01/msg04185.html
> -Signed-off-by: Alistair Francis
> -
>
> - linux-user/main.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -Index: qemu-5.2.0/linux-user/main.c
> -===
> qemu-5.2.0.orig/linux-user/main.c
> -+++ qemu-5.2.0/linux-user/main.c
> -@@ -92,7 +92,7 @@ static int last_log_mask;
> - (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32))
> - /* There are a number of places where we assign reserved_va to a variable
> -of type abi_ulong and expect it to fit. Avoid the last page. */
> --# define MAX_RESERVED_VA(CPU) (0xul & TARGET_PAGE_MASK)
> -+# define MAX_RESERVED_VA(CPU) (0x7ffful & TARGET_PAGE_MASK)
> - # else
> - # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS)
> - # endif
> diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch
> b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch
> deleted file mode 100644
> index 2ddc09966c4..000
> --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch
> +++ /dev/null
> @@ -1,137 +0,0 @@
> -From 815c97ba0de02da9dace3fcfcbdf9b20e029f0d7 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa
> -Date: Fri, 1 Jun 2018 08:41:07 +
> -Subject: [PATCH] Fix webkitgtk builds
> -
> -This is a partial revert of "linux-user: fix
> mmap/munmap/mprotect/mrema
Re: [OE-core] [PATCH 1/2] mesa: add more details to elf-tls patch
On Thu, Dec 10, 2020 at 11:37 PM Anuj Mittal wrote: > > Include link to upstream report and the last autobuilder failure [1] > so it's easy to identify why this is needed in future. > > [1] > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1160/steps/8/logs/step1c > > Signed-off-by: Anuj Mittal Reviewed-by: Alistair Francis Alistair > --- > .../0002-meson.build-make-TLS-ELF-optional.patch | 15 +++ > 1 file changed, 15 insertions(+) > > diff --git > a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch > > b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch > index 74f7fe5c2d..89c0d150fa 100644 > --- > a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch > +++ > b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch > @@ -6,6 +6,21 @@ Subject: [PATCH] meson.build: make TLS ELF optional > USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make > TLS GLX optional again" patch updated to the latest mesa. > > +For details, see: > +https://gitlab.freedesktop.org/mesa/mesa/-/issues/966 > + > +This prevents runtime segfault on musl: > + > +Traceback (most recent call last): > + File > "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", > line 36, in wrapped_f > +return func(*args, **kwargs) > + File > "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", > line 378, in test_parselogs > +self.assertEqual(errcount, 0, msg=self.msg) > +AssertionError: 1 != 0 : Log: > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log > +--- > +Central error: [10.477] (EE) Failed to load > /usr/lib/xorg/modules/extensions/libglx.so: Error relocating > /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic > definition in /usr/lib/libGL.so.1 > +*** > + > Upstream-Status: Inappropriate [configuration] > Signed-off-by: Alistair Francis > > -- > 2.29.2 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145473): https://lists.openembedded.org/g/openembedded-core/message/145473 Mute This Topic: https://lists.openembedded.org/mt/78874718/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] mesa: remove patch disabling asm
On Thu, Dec 10, 2020 at 11:37 PM Anuj Mittal wrote:
>
> This was originally added for musl only [1]. Upstream has removed this
> option but we reverted that change during an upgrade to fix certain
> musl specific compile time issues [2].
>
> I compile tested without this patch on musl-x86 and musl-x86-64 and
> don't see the warnings anymore. Similar textrel issues were fixed
> upstream so perhaps those helped [3].
>
> [1]
> https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit?id=68bf128e901e89d5b49a28b15d5083b2bf6b536f
> [2]
> https://www.openembedded.org/pipermail/openembedded-core/2019-November/289222.html
> [3]
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/45206d7673adb1484cbdb3eadaf82e0849c9cdcf?merge_request_iid=1974
>
> Signed-off-by: Anuj Mittal
Reviewed-by: Alistair Francis
Alistair
> ---
> ...le-asm-unconditionally-now-that-gen_.patch | 147 --
> meta/recipes-graphics/mesa/mesa.inc | 4 -
> 2 files changed, 151 deletions(-)
> delete mode 100644
> meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
>
> diff --git
> a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
>
> b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
> deleted file mode 100644
> index 833742359f..00
> ---
> a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
> +++ /dev/null
> @@ -1,147 +0,0 @@
> -From 43d9e40db7357f27e91002b2bb7688b6775ebb43 Mon Sep 17 00:00:00 2001
> -From: Alistair Francis
> -Date: Thu, 14 Nov 2019 09:06:02 -0800
> -Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that
> - gen_matypes is gone."
> -
> -This reverts commit 20294dceebc23236e33b22578245f7e6f41b6997.
> -
> -Upstream-Status: Inappropriate [configuration]
> -Signed-off-by: Alistair Francis
> -
>
> - meson.build | 94 ++-
> - meson_options.txt | 6 +++
> - 2 files changed, 67 insertions(+), 33 deletions(-)
> -
> -diff --git a/meson.build b/meson.build
> -index e7dc599..e2fc934 100644
> a/meson.build
> -+++ b/meson.build
> -@@ -52,6 +52,7 @@ pre_args = [
> - with_vulkan_icd_dir = get_option('vulkan-icd-dir')
> - with_tests = get_option('build-tests')
> - with_aco_tests = get_option('build-aco-tests')
> -+with_asm = get_option('asm')
> - with_glx_read_only_text = get_option('glx-read-only-text')
> - with_glx_direct = get_option('glx-direct')
> - with_osmesa = get_option('osmesa')
> -@@ -1154,41 +1155,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required :
> with_platform_windows)
> -
> - # TODO: shared/static? Is this even worth doing?
> -
> -+# When cross compiling we generally need to turn off the use of assembly,
> -+# because mesa's assembly relies on building an executable for the host
> system,
> -+# and running it to get information about struct sizes. There is at least
> one
> -+# case of cross compiling where we can use asm, and that's x86_64 -> x86
> when
> -+# host OS == build OS, since in that case the build machine can run the
> host's
> -+# binaries.
> -+if with_asm and meson.is_cross_build()
> -+ if build_machine.system() != host_machine.system()
> -+# TODO: It may be possible to do this with an exe_wrapper (like wine).
> -+message('Cross compiling from one OS to another, disabling assembly.')
> -+with_asm = false
> -+ elif not (build_machine.cpu_family().startswith('x86') and
> host_machine.cpu_family() == 'x86')
> -+# FIXME: Gentoo always sets -m32 for x86_64 -> x86 builds, resulting in
> an
> -+# x86 -> x86 cross compile. We use startswith rather than == to handle
> this
> -+# case.
> -+# TODO: There may be other cases where the 64 bit version of the
> -+# architecture can run 32 bit binaries (aarch64 and armv7 for example)
> -+message('''
> -+ Cross compiling to different architectures, and the host cannot run
> -+ the build machine's binaries. Disabling assembly.
> -+''')
> -+with_asm = false
> -+ endif
> -+endif
> -+
> - with_asm_arch = ''
> --if host_machine.cpu_family() == 'x86'
> -- if system_has_kms_drm or host_machine.system() == 'gnu'
> --with_asm_arch = 'x86'
> --pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM',
> -- '-DUSE_SSE_ASM']
> --
> --if with_glx_read_only_text
> -- pre_args += ['-DGLX_X86_READONLY_TEXT']
> -+if with_asm
> -+ if host_machine.cpu_family() == 'x86'
> -+if system_has_kms_drm or host_machine.system() == 'gnu'
Re: [OE-core] [PATCH V2] python-numpy: Add support for riscv32
On Mon, Nov 16, 2020 at 11:56 AM Khem Raj wrote:
>
> Signed-off-by: Khem Raj
Reviewed-by: Alistair Francis
Alistair
> ---
> v2: Address upstream comments in proposed patch
>
> ...1-numpy-core-Define-RISCV-32-support.patch | 56 +++
> .../python-numpy/python-numpy.inc | 1 +
> 2 files changed, 57 insertions(+)
> create mode 100644
> meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
>
> diff --git
> a/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
>
> b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
> new file mode 100644
> index 00..b60ca1d216
> --- /dev/null
> +++
> b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
> @@ -0,0 +1,56 @@
> +From dbcf296f84e5cef6a3ff0f1c469a4508f1e0fb15 Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Sun, 15 Nov 2020 15:32:39 -0800
> +Subject: [PATCH] numpy/core: Define RISCV-32 support
> +
> +Helps compile on riscv32
> +
> +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780]
> +Signed-off-by: Khem Raj
> +---
> + numpy/core/include/numpy/npy_cpu.h| 9 +++--
> + numpy/core/include/numpy/npy_endian.h | 1 +
> + 2 files changed, 8 insertions(+), 2 deletions(-)
> +
> +diff --git a/numpy/core/include/numpy/npy_cpu.h
> b/numpy/core/include/numpy/npy_cpu.h
> +index 4dbf9d84e..bc41a7eda 100644
> +--- a/numpy/core/include/numpy/npy_cpu.h
> b/numpy/core/include/numpy/npy_cpu.h
> +@@ -18,6 +18,7 @@
> + * NPY_CPU_ARCEL
> + * NPY_CPU_ARCEB
> + * NPY_CPU_RISCV64
> ++ * NPY_CPU_RISCV32
> + * NPY_CPU_WASM
> + */
> + #ifndef _NPY_CPUARCH_H_
> +@@ -100,8 +101,12 @@
> + #define NPY_CPU_ARCEL
> + #elif defined(__arc__) && defined(__BIG_ENDIAN__)
> + #define NPY_CPU_ARCEB
> +-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
> +-#define NPY_CPU_RISCV64
> ++#elif defined(__riscv)
> ++#if __riscv_xlen == 64
> ++ #define NPY_CPU_RISCV64
> ++#elif __riscv_xlen == 32
> ++ #define NPY_CPU_RISCV32
> ++#endif
> + #elif defined(__EMSCRIPTEN__)
> + /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */
> + #define NPY_CPU_WASM
> +diff --git a/numpy/core/include/numpy/npy_endian.h
> b/numpy/core/include/numpy/npy_endian.h
> +index aa367a002..d59484573 100644
> +--- a/numpy/core/include/numpy/npy_endian.h
> b/numpy/core/include/numpy/npy_endian.h
> +@@ -49,6 +49,7 @@
> + || defined(NPY_CPU_PPC64LE) \
> + || defined(NPY_CPU_ARCEL) \
> + || defined(NPY_CPU_RISCV64) \
> ++|| defined(NPY_CPU_RISCV32) \
> + || defined(NPY_CPU_WASM)
> + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
> + #elif defined(NPY_CPU_PPC)\
> +--
> +2.29.2
> +
> diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc
> b/meta/recipes-devtools/python-numpy/python-numpy.inc
> index b1058b26c8..40f81046ee 100644
> --- a/meta/recipes-devtools/python-numpy/python-numpy.inc
> +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
> @@ -7,6 +7,7 @@ SRCNAME = "numpy"
>
> SRC_URI =
> "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz
> \
>
> file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
> + file://0001-numpy-core-Define-RISCV-32-support.patch \
> "
> SRC_URI[sha256sum] =
> "9179d259a9bc53ed7b153d31fc3156d1ca560d61079f53191cf177c3efc4a498"
>
> --
> 2.29.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144672):
https://lists.openembedded.org/g/openembedded-core/message/144672
Mute This Topic: https://lists.openembedded.org/mt/78300730/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] arch-riscv: Enable qemu-usermode on rv32
On Sat, Nov 14, 2020 at 11:59 AM Khem Raj wrote:
>
> Current version of Qemu in OE-core now works fine in rv32/user-mode the
> said nvalid instruction errors are gone, so we can enable it now
>
> Signed-off-by: Khem Raj
Reviewed-by: Alistair Francis
Alistair
> ---
> meta/conf/machine/include/riscv/arch-riscv.inc | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> b/meta/conf/machine/include/riscv/arch-riscv.inc
> index e3dbef7fe3..eae2b88778 100644
> --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> @@ -7,9 +7,6 @@ TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
> TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', '
> -mabi=lp64', ' ', d)}"
> TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', '
> -mabi=ilp32', ' ', d)}"
>
> -# QEMU usermode fails with invalid instruction error (For riscv32)
> -MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
> "${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
> -
> # Fix: ld: unrecognized option '--hash-style=sysv'
> LINKER_HASH_STYLE_libc-newlib = ""
> # Fix: ld: unrecognized option '--hash-style=gnu'
> --
> 2.29.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144623):
https://lists.openembedded.org/g/openembedded-core/message/144623
Mute This Topic: https://lists.openembedded.org/mt/78257855/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] python-numpy: Add support for riscv32
On Sun, Nov 15, 2020 at 3:42 PM Khem Raj wrote:
>
> Signed-off-by: Khem Raj
Reviewed-by: Alistair Francis
Alistair
> ---
> ...1-numpy-core-Define-RISCV-32-support.patch | 35 +++
> .../python-numpy/python-numpy.inc | 1 +
> 2 files changed, 36 insertions(+)
> create mode 100644
> meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
>
> diff --git
> a/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
>
> b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
> new file mode 100644
> index 00..b7a9e42b30
> --- /dev/null
> +++
> b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch
> @@ -0,0 +1,35 @@
> +From fff0371f043177b4a23998241beaaa2a3413106a Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Sun, 15 Nov 2020 15:32:39 -0800
> +Subject: [PATCH] numpy/core: Define RISCV-32 support
> +
> +Helps compile on riscv32
> +
> +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780]
> +Signed-off-by: Khem Raj
> +---
> + numpy/core/include/numpy/npy_cpu.h | 8 ++--
> + 1 file changed, 6 insertions(+), 2 deletions(-)
> +
> +diff --git a/numpy/core/include/numpy/npy_cpu.h
> b/numpy/core/include/numpy/npy_cpu.h
> +index 4dbf9d84e..045e84d63 100644
> +--- a/numpy/core/include/numpy/npy_cpu.h
> b/numpy/core/include/numpy/npy_cpu.h
> +@@ -100,8 +100,12 @@
> + #define NPY_CPU_ARCEL
> + #elif defined(__arc__) && defined(__BIG_ENDIAN__)
> + #define NPY_CPU_ARCEB
> +-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
> +-#define NPY_CPU_RISCV64
> ++#elif defined(__riscv)
> ++#if __riscv_xlen == 64
> ++ #define NPY_CPU_RISCV64
> ++#elif __riscv_xlen == 32
> ++ #define NPY_CPU_RISCV32
> ++#endif
> + #elif defined(__EMSCRIPTEN__)
> + /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */
> + #define NPY_CPU_WASM
> +--
> +2.29.2
> +
> diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc
> b/meta/recipes-devtools/python-numpy/python-numpy.inc
> index b1058b26c8..40f81046ee 100644
> --- a/meta/recipes-devtools/python-numpy/python-numpy.inc
> +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
> @@ -7,6 +7,7 @@ SRCNAME = "numpy"
>
> SRC_URI =
> "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz
> \
>
> file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
> + file://0001-numpy-core-Define-RISCV-32-support.patch \
> "
> SRC_URI[sha256sum] =
> "9179d259a9bc53ed7b153d31fc3156d1ca560d61079f53191cf177c3efc4a498"
>
> --
> 2.29.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144622):
https://lists.openembedded.org/g/openembedded-core/message/144622
Mute This Topic: https://lists.openembedded.org/mt/78281759/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/5] python3: split python target configuration into own class
On Fri, Nov 13, 2020 at 11:49 AM Alexander Kanavin
wrote:
>
> Setting _PYTHON_SYSCONFIGDATA_NAME in python3native class globally was
> problematic as it was leaking into host python environment, which
> was causing tracebacks depending on host distro and action
> (typically anything involving importing sysconfig module).
>
> The new class sets the variable only in specific tasks where it is needed,
> and should be inherited explicitly:
> - use python3native to run scripts with native python
> - use python3targetconfig to run scripts with native python
> if those scripts need to access target config data (such
> as correct installation directories). This also adds a dependency
> on target python, so should be used carefully to avoid lengthening builds.
>
> Signed-off-by: Alexander Kanavin
This fixes the devtool modify u-boot failure for me on Arch.
Alistair
> ---
> meta/classes/python3native.bbclass | 2 --
> meta/classes/python3targetconfig.bbclass | 15 +++
> 2 files changed, 15 insertions(+), 2 deletions(-)
> create mode 100644 meta/classes/python3targetconfig.bbclass
>
> diff --git a/meta/classes/python3native.bbclass
> b/meta/classes/python3native.bbclass
> index d98fb4c758..2e3a88c126 100644
> --- a/meta/classes/python3native.bbclass
> +++ b/meta/classes/python3native.bbclass
> @@ -17,8 +17,6 @@ export STAGING_LIBDIR
> export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
> export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
>
> -export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
> -
> # suppress host user's site-packages dirs.
> export PYTHONNOUSERSITE = "1"
>
> diff --git a/meta/classes/python3targetconfig.bbclass
> b/meta/classes/python3targetconfig.bbclass
> new file mode 100644
> index 00..640d0c97b6
> --- /dev/null
> +++ b/meta/classes/python3targetconfig.bbclass
> @@ -0,0 +1,15 @@
> +inherit python3native
> +
> +DEPENDS_append = " python3"
> +
> +do_configure_prepend() {
> +export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
> +}
> +
> +do_compile_prepend() {
> +export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
> +}
> +
> +do_install_prepend() {
> +export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
> +}
> --
> 2.29.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144589):
https://lists.openembedded.org/g/openembedded-core/message/144589
Mute This Topic: https://lists.openembedded.org/mt/78237681/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] qemuboot: Add QB_RNG variable
On Wed, Sep 23, 2020 at 6:25 PM Khem Raj wrote:
>
> RNG passthru has been enabled on all qemu machines but its being added
> to each one of them, with this patch its turned into QB variables which
> defaults to host passthru, yet it can be overridden if needed via
> machine or config metadata if needed.
>
> Signed-off-by: Khem Raj
Good idea!
Reviewed-by: Alistair Francis
Alistair
> ---
> meta/classes/qemuboot.bbclass | 4
> meta/conf/machine/include/qemuboot-mips.inc | 2 --
> meta/conf/machine/include/qemuboot-x86.inc| 2 --
> meta/conf/machine/include/riscv/qemuriscv.inc | 3 ---
> meta/conf/machine/qemuarm.conf| 2 --
> meta/conf/machine/qemuarm64.conf | 2 --
> meta/conf/machine/qemuarmv5.conf | 2 --
> meta/conf/machine/qemuppc.conf| 2 --
> scripts/runqemu | 2 +-
> 9 files changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
> index d8f62ef6ea..824676216e 100644
> --- a/meta/classes/qemuboot.bbclass
> +++ b/meta/classes/qemuboot.bbclass
> @@ -29,6 +29,9 @@
> # QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used
> # when QB_AUDIO_DRV is set.
> #
> +# QB_RNG: Pass-through for host random number generator, it can speedup boot
> +# in system mode, where system is experiencing entropy starvation
> +#
> # QB_KERNEL_ROOT: kernel's root, e.g., /dev/vda
> #
> # QB_NETWORK_DEVICE: network device, e.g., "-device
> virtio-net-pci,netdev=net0,mac=@MAC@",
> @@ -77,6 +80,7 @@ QB_MEM ?= "-m 256"
> QB_SERIAL_OPT ?= "-serial mon:stdio -serial null"
> QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}"
> QB_DEFAULT_FSTYPE ?= "ext4"
> +QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-pci,rng=rng0"
> QB_OPT_APPEND ?= ""
> QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
> QB_CMDLINE_IP_SLIRP ?= "ip=dhcp"
> diff --git a/meta/conf/machine/include/qemuboot-mips.inc
> b/meta/conf/machine/include/qemuboot-mips.inc
> index e99bade2e3..230f032c53 100644
> --- a/meta/conf/machine/include/qemuboot-mips.inc
> +++ b/meta/conf/machine/include/qemuboot-mips.inc
> @@ -3,8 +3,6 @@ IMAGE_CLASSES += "qemuboot"
> QB_MACHINE = "-machine malta"
> QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty"
> QB_OPT_APPEND = "-usb -device usb-tablet"
> -# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
> -QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-pci,rng=rng0"
>
> # For graphics to work we need to define the VGA device as well as the
> necessary USB devices
> QB_OPT_APPEND += "-vga std"
> diff --git a/meta/conf/machine/include/qemuboot-x86.inc
> b/meta/conf/machine/include/qemuboot-x86.inc
> index ccc6dcd3bf..2a4760c717 100644
> --- a/meta/conf/machine/include/qemuboot-x86.inc
> +++ b/meta/conf/machine/include/qemuboot-x86.inc
> @@ -10,6 +10,4 @@ QB_AUDIO_DRV = "alsa"
> QB_AUDIO_OPT = "-soundhw ac97,es1370"
> QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1"
> QB_OPT_APPEND = "-usb -device usb-tablet"
> -# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
> -QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-pci,rng=rng0"
>
> diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc
> b/meta/conf/machine/include/riscv/qemuriscv.inc
> index 759c8a196e..0e88c91aa6 100644
> --- a/meta/conf/machine/include/riscv/qemuriscv.inc
> +++ b/meta/conf/machine/include/riscv/qemuriscv.inc
> @@ -33,6 +33,3 @@ QB_NETWORK_DEVICE = "-device
> virtio-net-device,netdev=net0,mac=@MAC@"
> QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device
> virtio-blk-device,drive=disk0"
> QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon
> -device virtconsole,chardev=virtcon"
> QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev
> socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device
> virtconsole,chardev=virtcon"
> -# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
> -QB_OPT_APPEND = " -object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-device,rng=rng0"
> -
> diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
> index 3364dcf042..702b850cbb 100644
> --- a/meta/conf/machine/qemuarm.conf
> +++ b/
[OE-core] [PATCH] binutils: Remove RISC-V PIE patch
Remove the out of tree patch that is trying to address a PIE issue. This
patch causes RISC-V applications to seg fault when running
_dl_relocate_object.
This fixes: https://github.com/riscv/meta-riscv/issues/236
Signed-off-by: Alistair Francis
---
.../binutils/binutils-2.35.inc| 1 -
...SCV_NONE-reloc-in-the-extra-unused-r.patch | 42 ---
2 files changed, 43 deletions(-)
delete mode 100644
meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.35.inc
b/meta/recipes-devtools/binutils/binutils-2.35.inc
index 9aa5e7efe3..5ae9ec4226 100644
--- a/meta/recipes-devtools/binutils/binutils-2.35.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.35.inc
@@ -41,6 +41,5 @@ SRC_URI = "\
file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
file://0015-sync-with-OE-libtool-changes.patch \
file://0016-Check-for-clang-before-checking-gcc-version.patch \
- file://0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch \
"
S = "${WORKDIR}/git"
diff --git
a/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch
b/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch
deleted file mode 100644
index 99bb38eb67..00
---
a/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5b61c40c34c3db699de723c3128ba704501ccdac Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 20 Apr 2020 14:23:57 -0700
-Subject: [PATCH 17/17] Do not emit R_RISCV_NONE reloc in the extra unused
- reloc space.
-
-Redundant R_RISCV_DTPMOD* R_RISCV_DTPREL* results from Global Dynamic -> Local
Exec relaxation
-which generates
-
-Patch from https://sourceware.org/bugzilla/show_bug.cgi?id=24673
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- bfd/elfnn-riscv.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
-index a5fa415309a..1e582052aa9 100644
a/bfd/elfnn-riscv.c
-+++ b/bfd/elfnn-riscv.c
-@@ -2090,13 +2090,14 @@ riscv_elf_relocate_section (bfd *output_bfd,
- pic = bfd_link_pic (info);
-
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
--&& (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
-+&& (bfd_link_dll (info)
-+|| !SYMBOL_REFERENCES_LOCAL (info, h)))
- indx = h->dynindx;
- }
-
- /* The GOT entries have not been initialized yet. Do it
-now, and emit any relocations. */
--if ((bfd_link_pic (info) || indx != 0)
-+if ((bfd_link_dll (info) || indx != 0)
- && (h == NULL
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
- || h->root.type != bfd_link_hash_undefweak))
---
-2.28.0
-
--
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#141373):
https://lists.openembedded.org/g/openembedded-core/message/141373
Mute This Topic: https://lists.openembedded.org/mt/76127630/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] opensbi: Update to OpenSBI v0.8 release
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/qemuriscv.inc | 2 +-
.../{opensbi_0.6.bb => opensbi_0.8.bb}| 21 +--
2 files changed, 11 insertions(+), 12 deletions(-)
rename meta/recipes-bsp/opensbi/{opensbi_0.6.bb => opensbi_0.8.bb} (65%)
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc
b/meta/conf/machine/include/riscv/qemuriscv.inc
index a42346f361..759c8a196e 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -18,7 +18,7 @@ WKS_FILE ?= "qemuriscv.wks"
MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
EXTRA_IMAGEDEPENDS += "opensbi"
-RISCV_SBI_PLAT ?= "qemu/virt"
+RISCV_SBI_PLAT ?= "generic"
RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
UBOOT_ENTRYPOINT_riscv32 = "0x8040"
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.6.bb
b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
similarity index 65%
rename from meta/recipes-bsp/opensbi/opensbi_0.6.bb
rename to meta/recipes-bsp/opensbi/opensbi_0.8.bb
index 56f2d4b915..818efac733 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.6.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
@@ -7,8 +7,8 @@ require opensbi-payloads.inc
inherit autotools-brokensep deploy
-SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862"
-SRC_URI = "git://github.com/riscv/opensbi.git \
+SRCREV = "a98258d0b537a295f517bbc8d813007336731fa9"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
"
@@ -25,22 +25,21 @@ do_install_append() {
# In the future these might be required as a dependency for other
packages.
# At the moment just delete them to avoid warnings
rm -r ${D}/include
- rm -r ${D}/platform/${RISCV_SBI_PLAT}/lib
- rm -r ${D}/platform/${RISCV_SBI_PLAT}/firmware/payloads
- rm -r ${D}/lib
+ rm -r ${D}/lib*
+ rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads
}
do_deploy () {
- install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*
${DEPLOYDIR}/
- install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*
${DEPLOYDIR}/
- install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*
${DEPLOYDIR}/
+ install -m 755
${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/
+ install -m 755
${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/
+ install -m 755
${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/
}
addtask deploy before do_build after do_install
-FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
-FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
-FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
+FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
+FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
+FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
COMPATIBLE_HOST = "(riscv64|riscv32).*"
INHIBIT_PACKAGE_STRIP = "1"
--
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139894):
https://lists.openembedded.org/g/openembedded-core/message/139894
Mute This Topic: https://lists.openembedded.org/mt/75089210/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] opensbi: Update to v0.6
Signed-off-by: Alistair Francis
---
...Makefile-Don-t-specify-mabi-or-march.patch | 13 +
.../files/0001-build-Use-ffreestanding.patch | 28 ---
.../{opensbi_0.5.bb => opensbi_0.6.bb}| 6 +---
3 files changed, 9 insertions(+), 38 deletions(-)
delete mode 100644
meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
rename meta/recipes-bsp/opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} (88%)
diff --git
a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
index 74d93618b2..d2a8048e87 100644
---
a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
+++
b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
@@ -1,4 +1,4 @@
-From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001
+From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001
From: Alistair Francis
Date: Fri, 15 Feb 2019 14:57:41 -0800
Subject: [PATCH] Makefile: Don't specify mabi or march
@@ -7,23 +7,26 @@ To avoid
can't link double-float modules with soft-float modules
errors when building 32-bit openSBI don't specify mabi or march.
-Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug]
+Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug]
Signed-off-by: Alistair Francis
+
---
Makefile | 2 --
1 file changed, 2 deletions(-)
+diff --git a/Makefile b/Makefile
+index ccf8ea3..69e5b38 100644
--- a/Makefile
+++ b/Makefile
-@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y)
- CFLAGS= -g -Wall -Werror -nostdlib -fno-strict-aliasing
-O2
+@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y)
+ CFLAGS= -g -Wall -Werror -ffreestanding -nostdlib
-fno-strict-aliasing -O2
CFLAGS+= -fno-omit-frame-pointer
-fno-optimize-sibling-calls
CFLAGS+= -mno-save-restore -mstrict-align
-CFLAGS+= -mabi=$(PLATFORM_RISCV_ABI)
-march=$(PLATFORM_RISCV_ISA)
CFLAGS+= -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
CFLAGS+= $(GENFLAGS)
CFLAGS+= $(platform-cflags-y)
-@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y)
+@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y)
ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
ASFLAGS += -fno-omit-frame-pointer
-fno-optimize-sibling-calls
ASFLAGS += -mno-save-restore -mstrict-align
diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
deleted file mode 100644
index 4899fad6aa..00
--- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 6 Jan 2020 18:21:02 -0800
-Subject: [PATCH] build: Use -ffreestanding
-
-this is a stand-alone/baremetal application, therefore demanding
--ffreestanding would help it compile with hosted toolchains e.g. ( linux
-toolchains ), it also ensures that it won't be using platform
-optimizations like inlining mem* str* functions which gcc might decide
-especially with wrapper string functions in opensbi code
-
-Upstream-Status: Accepted
[https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961]
-Signed-off-by: Khem Raj
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
a/Makefile
-+++ b/Makefile
-@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y)
- GENFLAGS += $(platform-genflags-y)
- GENFLAGS += $(firmware-genflags-y)
-
--CFLAGS= -g -Wall -Werror -nostdlib -fno-strict-aliasing
-O2
-+CFLAGS= -g -Wall -Werror -ffreestanding -nostdlib
-fno-strict-aliasing -O2
- CFLAGS+= -fno-omit-frame-pointer
-fno-optimize-sibling-calls
- CFLAGS+= -mno-save-restore -mstrict-align
- CFLAGS+= -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
b/meta/recipes-bsp/opensbi/opensbi_0.6.bb
similarity index 88%
rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb
rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb
index 71d64fa324..56f2d4b915 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb
@@ -7,17 +7,13 @@ require opensbi-payloads.inc
inherit autotools-brokensep deploy
-SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09"
+SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862"
SRC_URI = "git://github.com/riscv/opensbi.git \
file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
- file://0001-build-Use-ffreesta
[OE-core] [PATCH] clutter: Build cluter with the GDK backend
ClutterActors can crash with strange segfaults when built without the GDK
backend but run ontop of GDK. To fix this let's add a PACKAGECONFIG to
enable/disable GDK backend support and enable it by default.
Signed-off-by: Alistair Francis
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc
b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 5dc45ebf21..e0ac819e4c 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -24,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config"
# Disable pretty much everything, override in platform specific set up
EXTRA_OECONF += "--disable-quartz-backend \
--disable-win32-backend\
---disable-gdk-backend \
--disable-cex100-backend \
--disable-tslib-input \
"
+PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3"
PACKAGECONFIG[x11] =
"--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}"
PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
PACKAGECONFIG[egl] =
"--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,${E
PACKAGECONFIG[wayland-compositor] =
"--enable-wayland-compositor,--disable-wayland-compositor,wayland"
# Default configuration, distros might want to override
-PACKAGECONFIG ??= "egl \
+PACKAGECONFIG ??= "egl gdk \
${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11',
'', d)}"
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemuriscv64: Set the Xvisor platform
Set the platform information required to build Xvisor. https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-extended/xvisor Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv64.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index b45fdd556d..a753af0576 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,6 +4,8 @@ require conf/machine/include/riscv/qemuriscv.inc +XVISOR_PLAT = "riscv/virt64" + EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- 2.25.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] strace: Update to 5.5
On Thu, Feb 13, 2020 at 4:24 PM akuster808 wrote:
>
>
>
> On 2/13/20 3:25 PM, Alistair Francis wrote:
> > Update strace to 5.5. This includes a small change in the license file
> > to change the date to 2020.
>
> Have you run the ptests for this?
I haven't.
> Will this help help address this following open defect?
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=13785
I'm not sure.
Alistair
>
> - armin
>
> > Signed-off-by: Alistair Francis
> > ---
> > ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +-
> > ...yscall_info-to-__ptrace_syscall_info.patch | 52 ---
> > .../strace/strace/Makefile-ptest.patch| 6 ++-
> > .../strace/disable-git-version-gen.patch | 4 +-
> > .../strace/strace/mips-SIGEMT.patch | 2 +-
> > ...st-test-for-m32-mx32-compile-support.patch | 43 ---
> > .../strace/strace/ptest-spacesave.patch | 17 --
> > .../strace/strace/sys_headers.patch | 25 -
> > .../strace/strace/uintptr_t.patch | 12 -
> > .../strace/strace/update-gawk-paths.patch | 2 +-
> > .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++--
> > 11 files changed, 36 insertions(+), 138 deletions(-)
> > delete mode 100644
> > meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
> > delete mode 100644
> > meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
> > delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch
> > rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%)
> >
> > diff --git
> > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
> >
> > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
> > index 52d2cdcdc5..235e803641 100644
> > ---
> > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
> > +++
> > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
> > @@ -1,4 +1,4 @@
> > -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001
> > +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001
> > From: Robert Yang
> > Date: Thu, 9 Feb 2017 01:27:49 -0800
> > Subject: [PATCH] caps-abbrev.awk: fix gawk's path
> > diff --git
> > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
> >
> > b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
> > deleted file mode 100644
> > index dd0617a15f..00
> > ---
> > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
> > +++ /dev/null
> > @@ -1,52 +0,0 @@
> > -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001
> > -From: Khem Raj
> > -Date: Sat, 21 Dec 2019 10:18:38 -0800
> > -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info
> > -
> > -glibc 2.31+ has defined __ptrace_syscall_info [1]
> > -
> > -[1]
> > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7
> > -
> > -Upstream-Status: Pending
> > -Signed-off-by: Khem Raj
> >
> > - get_personality.h | 2 ++
> > - ptrace.h | 2 ++
> > - 2 files changed, 4 insertions(+)
> > -
> > a/get_personality.h
> > -+++ b/get_personality.h
> > -@@ -10,7 +10,9 @@
> > -
> > - # include "ptrace.h"
> > -
> > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
> > - extern int
> > - get_personality_from_syscall_info(const struct ptrace_syscall_info *);
> > -+# endif
> > -
> > - #endif /* !STRACE_GET_PERSONALITY_H */
> > a/ptrace.h
> > -+++ b/ptrace.h
> > -@@ -186,6 +186,9 @@ struct ptrace_syscall_info {
> > - };
> > - # endif
> > -
> > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
> > -+# define ptrace_syscall_info __ptrace_syscall_info
> > -+# endif
> > - # if !HAVE_DECL_PTRACE_PEEKUSER
> > - # define PTRACE_PEEKUSER PTRACE_PEEKUSR
> > - # endif
> > a/configure.ac
> > -+++ b/configure.ac
> > -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n
> > - AC_CHECK_TYPES(m4_normalize([
> > - struct pt_all_user_regs,
> > - struct ia64_fpreg,
> > --struct ptrace_peeksiginfo_args
> > -+struct ptrace_peeksiginfo_args,
>
[OE-core] [PATCH] strace: Update to 5.5
Update strace to 5.5. This includes a small change in the license file
to change the date to 2020.
Signed-off-by: Alistair Francis
---
...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +-
...yscall_info-to-__ptrace_syscall_info.patch | 52 ---
.../strace/strace/Makefile-ptest.patch| 6 ++-
.../strace/disable-git-version-gen.patch | 4 +-
.../strace/strace/mips-SIGEMT.patch | 2 +-
...st-test-for-m32-mx32-compile-support.patch | 43 ---
.../strace/strace/ptest-spacesave.patch | 17 --
.../strace/strace/sys_headers.patch | 25 -
.../strace/strace/uintptr_t.patch | 12 -
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++--
11 files changed, 36 insertions(+), 138 deletions(-)
delete mode 100644
meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
delete mode 100644
meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch
rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%)
diff --git
a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
index 52d2cdcdc5..235e803641 100644
---
a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
+++
b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
@@ -1,4 +1,4 @@
-From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001
+From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001
From: Robert Yang
Date: Thu, 9 Feb 2017 01:27:49 -0800
Subject: [PATCH] caps-abbrev.awk: fix gawk's path
diff --git
a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
deleted file mode 100644
index dd0617a15f..00
---
a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sat, 21 Dec 2019 10:18:38 -0800
-Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info
-
-glibc 2.31+ has defined __ptrace_syscall_info [1]
-
-[1]
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
- get_personality.h | 2 ++
- ptrace.h | 2 ++
- 2 files changed, 4 insertions(+)
-
a/get_personality.h
-+++ b/get_personality.h
-@@ -10,7 +10,9 @@
-
- # include "ptrace.h"
-
-+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
- extern int
- get_personality_from_syscall_info(const struct ptrace_syscall_info *);
-+# endif
-
- #endif /* !STRACE_GET_PERSONALITY_H */
a/ptrace.h
-+++ b/ptrace.h
-@@ -186,6 +186,9 @@ struct ptrace_syscall_info {
- };
- # endif
-
-+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
-+# define ptrace_syscall_info __ptrace_syscall_info
-+# endif
- # if !HAVE_DECL_PTRACE_PEEKUSER
- # define PTRACE_PEEKUSER PTRACE_PEEKUSR
- # endif
a/configure.ac
-+++ b/configure.ac
-@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n
- AC_CHECK_TYPES(m4_normalize([
- struct pt_all_user_regs,
- struct ia64_fpreg,
-- struct ptrace_peeksiginfo_args
-+ struct ptrace_peeksiginfo_args,
-+ struct __ptrace_syscall_info
- ]),,, [#include ])
-
- # For kernels that do not have v3.10-rc1~201^2~11
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 1f01ef79f2..42c1893f39 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
-From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001
+From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001
From: Gabriel Barbu
Date: Thu, 25 Jul 2013 15:28:33 +0200
Subject: [PATCH] strace: Add ptest
@@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal
tests/Makefile.am | 19 +++
1 file changed, 19 insertions(+)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8cf4c36..66162eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal
AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = $(ARCH_MFLAGS) \
-I$(builddir) \
-@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h
+@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h
CLEANFILES = ksysent.h
include ../scno.am
diff --git a/meta/recipes-devtools/strace/strace/dis
[OE-core] [PATCH v3] qemu: Upgrade to 4.2.0
While we are upgrading let's refresh patches and remove the outdated
patches.
Signed-off-by: Alistair Francis
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/qemu/qemu-native.inc| 4 +-
...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0
...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 7 +-
...emu-Add-missing-wacom-HID-descriptor.patch | 4 +-
...test-which-runs-all-unit-test-cases-.patch | 6 +-
...n-environment-space-to-boot-loader-q.patch | 16 +--
.../qemu/0004-qemu-disable-Valgrind.patch | 6 +-
...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +-
...-connect-socket-to-a-spawned-command.patch | 14 +--
.../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +-
...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-
.../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-
...dd-pkg-config-handling-for-libgcrypt.patch | 14 +--
...egression-in-parsing-vga-cmdline-par.patch | 54 +
...linux-user-remove-host-stime-syscall.patch | 61 --
...-libcap-header-issue-on-some-distro.patch} | 0
...messages-when-qemi_cpu_kick_thread-.patch} | 0
.../qemu/qemu/CVE-2019-12068.patch| 108 --
.../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0
21 files changed, 108 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb =>
qemu-native_4.2.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb =>
qemu-system-native_4.2.0.bb} (100%)
create mode 100644
meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch
delete mode 100644
meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
rename
meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch
=> 0012-fix-libcap-header-issue-on-some-distro.patch} (100%)
rename
meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
=> 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch
rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 936db5ae16..23f2ce97c3 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%"
GDBVERSION ?= "8.3%"
GLIBCVERSION ?= "2.31"
LINUXLIBCVERSION ?= "5.4%"
-QEMUVERSION ?= "4.1%"
+QEMUVERSION ?= "4.2%"
GOVERSION ?= "1.13%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc
b/meta/recipes-devtools/qemu/qemu-native.inc
index 69c2c43e6b..28cfd2cca3 100644
--- a/meta/recipes-devtools/qemu/qemu-native.inc
+++ b/meta/recipes-devtools/qemu/qemu-native.inc
@@ -3,8 +3,8 @@ inherit native
require qemu.inc
SRC_URI_append = " \
-file://0010-fix-libcap-header-issue-on-some-distro.patch \
-
file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
+file://0012-fix-libcap-header-issue-on-some-distro.patch \
+
file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
"
EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}'
LDFLAGS='${LDFLAGS}'"
diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index eb9f060997..a557e74e97 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
file://0009-Fix-webkitgtk-builds.patch \
file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
- file://0011-linux-user-remove-host-stime-syscall.patch \
+
file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \
file://CVE-2019-15890.patch \
- file://CVE-2019-12068.patch \
"
U
[OE-core] [PATCH v2] qemu: Upgrade to 4.2.0
While we are upgrading let's refresh patches and remove the outdated
patches.
Signed-off-by: Alistair Francis
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/qemu/qemu-native.inc| 4 +-
...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0
...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 7 +-
...emu-Add-missing-wacom-HID-descriptor.patch | 4 +-
...test-which-runs-all-unit-test-cases-.patch | 6 +-
...n-environment-space-to-boot-loader-q.patch | 16 +--
.../qemu/0004-qemu-disable-Valgrind.patch | 6 +-
...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +-
...-connect-socket-to-a-spawned-command.patch | 14 +--
.../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +-
...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-
.../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-
...dd-pkg-config-handling-for-libgcrypt.patch | 14 +--
...egression-in-parsing-vga-cmdline-par.patch | 53 +
...linux-user-remove-host-stime-syscall.patch | 61 --
...-libcap-header-issue-on-some-distro.patch} | 0
...messages-when-qemi_cpu_kick_thread-.patch} | 0
.../qemu/qemu/CVE-2019-12068.patch| 108 --
.../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0
21 files changed, 107 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb =>
qemu-native_4.2.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb =>
qemu-system-native_4.2.0.bb} (100%)
create mode 100644
meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch
delete mode 100644
meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
rename
meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch
=> 0012-fix-libcap-header-issue-on-some-distro.patch} (100%)
rename
meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
=> 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch
rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 936db5ae16..23f2ce97c3 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%"
GDBVERSION ?= "8.3%"
GLIBCVERSION ?= "2.31"
LINUXLIBCVERSION ?= "5.4%"
-QEMUVERSION ?= "4.1%"
+QEMUVERSION ?= "4.2%"
GOVERSION ?= "1.13%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc
b/meta/recipes-devtools/qemu/qemu-native.inc
index 69c2c43e6b..28cfd2cca3 100644
--- a/meta/recipes-devtools/qemu/qemu-native.inc
+++ b/meta/recipes-devtools/qemu/qemu-native.inc
@@ -3,8 +3,8 @@ inherit native
require qemu.inc
SRC_URI_append = " \
-file://0010-fix-libcap-header-issue-on-some-distro.patch \
-
file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
+file://0012-fix-libcap-header-issue-on-some-distro.patch \
+
file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
"
EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}'
LDFLAGS='${LDFLAGS}'"
diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index eb9f060997..a557e74e97 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
file://0009-Fix-webkitgtk-builds.patch \
file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
- file://0011-linux-user-remove-host-stime-syscall.patch \
+
file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \
file://CVE-2019-15890.patch \
- file://CVE-2019-12068.patch \
"
U
Re: [OE-core] [PATCH] qemu: Upgrade to 4.2.0
On Sat, Feb 8, 2020 at 10:10 AM Alexander Kanavin wrote: > > I think this backport should address the problem: > https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c Thanks for that! I have sent a v2 with this patch included. Alistair > > Alex > > On Sat, 8 Feb 2020 at 08:45, Richard Purdie > wrote: >> >> On Tue, 2020-02-04 at 10:41 -0800, Alistair Francis wrote: >> > While we are upgrading let's refresh patches and remove the outdated >> > patches. >> > >> > Signed-off-by: Alistair Francis >> >> I think this stopped qemu running on the autobuilder, we saw many >> versions of: >> >> https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1538 >> >> Failed to run qemu: qemu: can't parse 'vga' parameter: Invalid argument >> >> Cheers, >> >> Richard >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu: Upgrade to 4.2.0
While we are upgrading let's refresh patches and remove the outdated
patches.
Signed-off-by: Alistair Francis
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/qemu/qemu-native.inc| 4 +-
...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0
...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 6 +-
...emu-Add-missing-wacom-HID-descriptor.patch | 4 +-
...test-which-runs-all-unit-test-cases-.patch | 6 +-
...n-environment-space-to-boot-loader-q.patch | 16 +--
.../qemu/0004-qemu-disable-Valgrind.patch | 6 +-
...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +-
...-connect-socket-to-a-spawned-command.patch | 14 +--
.../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +-
...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-
.../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-
...dd-pkg-config-handling-for-libgcrypt.patch | 14 +--
...-libcap-header-issue-on-some-distro.patch} | 0
...linux-user-remove-host-stime-syscall.patch | 61 --
...messages-when-qemi_cpu_kick_thread-.patch} | 0
.../qemu/qemu/CVE-2019-12068.patch| 108 --
.../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0
20 files changed, 53 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb =>
qemu-native_4.2.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb =>
qemu-system-native_4.2.0.bb} (100%)
rename
meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch
=> 0011-fix-libcap-header-issue-on-some-distro.patch} (100%)
delete mode 100644
meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
rename
meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
=> 0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch
rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 936db5ae16..23f2ce97c3 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%"
GDBVERSION ?= "8.3%"
GLIBCVERSION ?= "2.31"
LINUXLIBCVERSION ?= "5.4%"
-QEMUVERSION ?= "4.1%"
+QEMUVERSION ?= "4.2%"
GOVERSION ?= "1.13%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc
b/meta/recipes-devtools/qemu/qemu-native.inc
index 69c2c43e6b..c04297cad0 100644
--- a/meta/recipes-devtools/qemu/qemu-native.inc
+++ b/meta/recipes-devtools/qemu/qemu-native.inc
@@ -3,8 +3,8 @@ inherit native
require qemu.inc
SRC_URI_append = " \
-file://0010-fix-libcap-header-issue-on-some-distro.patch \
-
file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
+file://0011-fix-libcap-header-issue-on-some-distro.patch \
+
file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
"
EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}'
LDFLAGS='${LDFLAGS}'"
diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index eb9f060997..deca13acae 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,14 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
file://0009-Fix-webkitgtk-builds.patch \
file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
- file://0011-linux-user-remove-host-stime-syscall.patch \
file://CVE-2019-15890.patch \
- file://CVE-2019-12068.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar"
-SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8"
-SRC_URI[sha256sum] =
"656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6"
+SRC_URI[md5sum] = "278
[OE-core] [PATCH] qemu: Upgrade to 4.2.0
While we are upgrading let's refresh patches and remove the outdated
patches.
Signed-off-by: Alistair Francis
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/qemu/qemu-native.inc| 4 +-
...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0
...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 6 +-
...emu-Add-missing-wacom-HID-descriptor.patch | 4 +-
...test-which-runs-all-unit-test-cases-.patch | 6 +-
...n-environment-space-to-boot-loader-q.patch | 16 +--
.../qemu/0004-qemu-disable-Valgrind.patch | 6 +-
...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +-
...-connect-socket-to-a-spawned-command.patch | 14 +--
.../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +-
...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-
.../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-
...dd-pkg-config-handling-for-libgcrypt.patch | 14 +--
...-libcap-header-issue-on-some-distro.patch} | 0
...linux-user-remove-host-stime-syscall.patch | 61 --
...messages-when-qemi_cpu_kick_thread-.patch} | 0
.../qemu/qemu/CVE-2019-12068.patch| 108 --
.../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0
20 files changed, 53 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb =>
qemu-native_4.2.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb =>
qemu-system-native_4.2.0.bb} (100%)
rename
meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch
=> 0011-fix-libcap-header-issue-on-some-distro.patch} (100%)
delete mode 100644
meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
rename
meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
=> 0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch
rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 936db5ae16..23f2ce97c3 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%"
GDBVERSION ?= "8.3%"
GLIBCVERSION ?= "2.31"
LINUXLIBCVERSION ?= "5.4%"
-QEMUVERSION ?= "4.1%"
+QEMUVERSION ?= "4.2%"
GOVERSION ?= "1.13%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc
b/meta/recipes-devtools/qemu/qemu-native.inc
index 69c2c43e6b..c04297cad0 100644
--- a/meta/recipes-devtools/qemu/qemu-native.inc
+++ b/meta/recipes-devtools/qemu/qemu-native.inc
@@ -3,8 +3,8 @@ inherit native
require qemu.inc
SRC_URI_append = " \
-file://0010-fix-libcap-header-issue-on-some-distro.patch \
-
file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
+file://0011-fix-libcap-header-issue-on-some-distro.patch \
+
file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
"
EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}'
LDFLAGS='${LDFLAGS}'"
diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index eb9f060997..deca13acae 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,14 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
file://0009-Fix-webkitgtk-builds.patch \
file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
- file://0011-linux-user-remove-host-stime-syscall.patch \
file://CVE-2019-15890.patch \
- file://CVE-2019-12068.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar"
-SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8"
-SRC_URI[sha256sum] =
"656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6"
+SRC_URI[md5sum] = "278
Re: [OE-core] [PATCH] libchamplain: Add support for building libchamplain
On Sat, Feb 1, 2020 at 6:43 PM Tim Orling wrote:
>
>
>
> On Sat, Feb 1, 2020 at 6:11 PM Alistair Francis
> wrote:
>
> Maybe some explanation of what is for and why we want it in core would be
> helpful here.
On second thought it probably should go into meta-openembeded. I'll
send a patch there.
Alistair
>
>> Signed-off-by: Alistair Francis
>> ---
>> .../libchamplain/libchamplain_0.12.20.bb | 12
>> 1 file changed, 12 insertions(+)
>> create mode 100644 meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>>
>> diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> new file mode 100644
>> index 00..90e5533015
>> --- /dev/null
>> +++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> @@ -0,0 +1,12 @@
>> +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable
>> maps"
>> +LICENSE = "LGPLv2.1"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
>> +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0
>> libsoup-2.4"
>> +
>> +inherit meson gobject-introspection
>> +
>> +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e"
>> +SRC_URI = "git://github.com/gnome/libchamplain.git"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> --
>> 2.25.0
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libchamplain: Add support for building libchamplain
Signed-off-by: Alistair Francis
---
.../libchamplain/libchamplain_0.12.20.bb | 12
1 file changed, 12 insertions(+)
create mode 100644 meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
new file mode 100644
index 00..90e5533015
--- /dev/null
+++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
@@ -0,0 +1,12 @@
+SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4"
+
+inherit meson gobject-introspection
+
+SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e"
+SRC_URI = "git://github.com/gnome/libchamplain.git"
+
+S = "${WORKDIR}/git"
+
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] opensbi: Remove dependency on FDT
U-Boot no longer requires OpenSBI to include a FDT for the HiFive
Unleashed, so remove the support from OpenSBI.
Signed-off-by: Alistair Francis
---
meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +--
meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +---
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
index b9714a7acb..2e32943245 100644
--- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
+++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
@@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d):
return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
-def riscv_get_extra_oemake_fdt(d):
-sbi_fdt_payload = d.getVar('RISCV_SBI_FDT')
-deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
-
-if sbi_fdt_payload is None:
-return ""
-
-return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload
-
def riscv_get_do_compile_depends(d):
sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
-sbi_fdt_payload = d.getVar('RISCV_SBI_FDT')
if sbi_payload is None:
return ""
@@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d):
if 'linux' in sbi_payload or 'Image' in sbi_payload:
return "virtual/kernel:do_deploy"
if 'u-boot.bin' in sbi_payload:
-# If we want U-Boot and a FDT then we need to depend on U-Boot and
-# the kernel
-if sbi_fdt_payload is not None:
-return "virtual/bootloader:do_deploy virtual/kernel:do_deploy"
-else:
-return "virtual/bootloader:do_deploy"
-# If we want a custom FDT then we need to depend on the kernel
-if sbi_fdt_payload is not None:
-return "virtual/kernel:do_deploy"
+return "virtual/bootloader:do_deploy"
return ""
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
index 6a9026254c..71d64fa324 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
@@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface
(OpenSBI)"
DESCRIPTION = "OpenSBI aims to provide an open-source and extensible
implementation of the RISC-V SBI specification for a platform specific firmware
(M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or
HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or
System-on-Chip vendors to fit a particular hadware configuration."
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5"
-DEPENDS += "dtc-native"
require opensbi-payloads.inc
@@ -21,7 +20,7 @@ SRC_URI[sha256sum] =
"07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22
EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
# If RISCV_SBI_PAYLOAD is set then include it as a payload
-EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}
${@riscv_get_extra_oemake_fdt(d)}"
+EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
# Required if specifying a custom payload
do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"
@@ -47,7 +46,6 @@ FILES_${PN} +=
"/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
-
COMPATIBLE_HOST = "(riscv64|riscv32).*"
INHIBIT_PACKAGE_STRIP = "1"
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to v2020.01-rc5
On Sun, Dec 29, 2019 at 5:46 AM Tom Rini wrote: > > On Sun, Dec 29, 2019 at 09:23:47AM +, Richard Purdie wrote: > > On Tue, 2019-12-24 at 14:41 -0800, Alistair Francis wrote: > > > Signed-off-by: Alistair Francis > > > --- > > > meta/recipes-bsp/u-boot/u-boot-common.inc | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc > > > b/meta/recipes-bsp/u-boot/u-boot-common.inc > > > index a0f9c41469..4799948bb1 100644 > > > --- a/meta/recipes-bsp/u-boot/u-boot-common.inc > > > +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc > > > @@ -11,11 +11,11 @@ LIC_FILES_CHKSUM = " > > > file://Licenses/README;md5=30503fd321432fc713238f582193b78e" > > > PE = "1" > > > > > > # Drop this line when updating to 2020.01 final > > > -PV = "2020.01~rc3" > > > +PV = "2020.01~rc5" > > > > > > # We use the revision in order to avoid having to fetch it from the > > > # repo during parse > > > -SRCREV = "d4a31e8ee5592072d8d5208b3e950cba2d89b6bd" > > > +SRCREV = "ef7c2af65966a57c98d3c47e6c2fe1ce2103b7f6" > > > > > > SRC_URI = "git://git.denx.de/u-boot.git \ > > > > Seems to break on musl: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1392 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1396 > > Looks like the Gentoo folks hit this as well: > http://patchwork.ozlabs.org/patch/1211367/ > > Can someone review/ack that please if that's the best way (rather than > reworking include/u-boot/crc.h) to deal with the problem? Thanks! Thanks! I have sent a v2. Alistair > > -- > Tom > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] u-boot: Update to v2020.01-rc5
Signed-off-by: Alistair Francis --- ...nclude-env.h-Ensure-ulong-is-defined.patch | 6 +- ...fix-ulong-definition-on-musl-targets.patch | 83 +++ meta/recipes-bsp/u-boot/u-boot-common.inc | 4 +- .../u-boot/u-boot-fw-utils_2020.01.bb | 4 +- 4 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch diff --git a/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch b/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch index b9118164df..4d623c1f34 100644 --- a/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch +++ b/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch @@ -1,4 +1,4 @@ -From 0565a080d153d5bcfeb5045a832e126f4f9e Mon Sep 17 00:00:00 2001 +From 718170ff3a5e677db7212a86b129dacb28b1cac2 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 14 Oct 2019 17:37:30 -0700 Subject: [PATCH] include/env.h: Ensure ulong is defined @@ -14,7 +14,7 @@ Signed-off-by: Alistair Francis 1 file changed, 2 insertions(+) diff --git a/include/env.h b/include/env.h -index b72239f6a5..5ca49a3456 100644 +index d6c2d751d6..6cf5053431 100644 --- a/include/env.h +++ b/include/env.h @@ -13,6 +13,8 @@ @@ -27,5 +27,5 @@ index b72239f6a5..5ca49a3456 100644 /* Value for environment validity */ -- -2.23.0 +2.24.1 diff --git a/meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch b/meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch new file mode 100644 index 00..0d965813b0 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0002-include-fix-ulong-definition-on-musl-targets.patch @@ -0,0 +1,83 @@ +From dccfea2e95cd3f26d1295e02d41012d014827dd9 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 16 Dec 2019 23:36:40 + +Subject: [PATCH 2/2] include: fix 'ulong' definition on musl targets + +The build failure was originally reported on arm64-musl +target at https://bugs.gentoo.org/703132. Here is the amd64-musl +variant: + +``` +$ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-only_defconfig -j$(nproc) +$ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-all -j$(nproc) +... +In file included from tools/env/../../env/flags.c:7, + from tools/env/env_flags.c:1: +include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'? + 159 | ulong env_get_ulong(const char *name, int base, ulong default_val); + | ^ + | long +``` + +Note: 'ulong' is not defined there. + +On glibc 'ulong' comes from : + +```c +/* Old compatibility names for C types. */ +typedef unsigned long int ulong; +``` + +On musl it comes from as well but from under different guards: + +```c +typedef unsigned long u_long, ulong; +``` + +The change inlines 'ulong' define similar to 'uint' define. + +Upstream-Status: Pending +Bug: https://bugs.gentoo.org/703132 +Signed-off-by: Sergei Trofimovich +Message-Id: <20191216233640.518168-1-sly...@gentoo.org> +--- + include/compiler.h | 2 +- + include/u-boot/crc.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/compiler.h b/include/compiler.h +index 29507f9840..90372f239c 100644 +--- a/include/compiler.h b/include/compiler.h +@@ -46,7 +46,6 @@ + # include + #elif defined(__MACH__) || defined(__FreeBSD__) + # include +-typedef unsigned long ulong; + #endif + #ifdef __FreeBSD__ + # include /* htole32 and friends */ +@@ -66,6 +65,7 @@ typedef uint8_t __u8; + typedef uint16_t __u16; + typedef uint32_t __u32; + typedef unsigned int uint; ++typedef unsigned long ulong; + + #define uswap_16(x) \ + x) & 0xff00) >> 8) | \ +diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h +index 1086d2168c..b96b50d98b 100644 +--- a/include/u-boot/crc.h b/include/u-boot/crc.h +@@ -8,6 +8,8 @@ + #ifndef _UBOOT_CRC_H + #define _UBOOT_CRC_H + ++#include /* unit definition */ ++ + /** + * crc8() - Calculate and return CRC-8 of the data + * +-- +2.24.1 + diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index a0f9c41469..4799948bb1 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -11,11 +11,11 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" PE = "1" # Drop this line when updating to 2020.01 final -PV = "2020.01~rc3" +PV = "2020.01~rc5" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "d4a31e8ee5592072d8d5208b3e950cba2d89b6bd" +SRCREV = "ef7c2af65966a57c98d3c47e6c2fe1ce2103b7f6" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/meta/recipes-bsp/u-boot/
Re: [OE-core] [PATCH v4 2/2] mesa: Upgrade to 19.3.1
On Tue, Dec 31, 2019 at 3:14 AM Richard Purdie wrote: > > On Mon, 2019-12-30 at 17:05 -0800, Alistair Francis wrote: > > On Fri, Dec 20, 2019 at 10:36 PM Alistair Francis > > wrote: > > > Upgrade mesa to 19.3 and refresh the patches. > > > > > > As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are > > > going > > > to change the do_install and add a patch to libepoxy to use the new > > > define. > > > > > > 1: > > > https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb > > > > > > Signed-off-by: Alistair Francis > > > > Ping! > > Sorry, the delay is that the patch is non-trivial and doesn't apply > cleanly. I think I have it ready to test in -next now. No worries, I just wanted to make sure it didn't slip through the cracks. I'm sorry it didn't apply cleanly. Alistair > > Cheers, > > Richard > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 2/2] mesa: Upgrade to 19.3.1
On Fri, Dec 20, 2019 at 10:36 PM Alistair Francis
wrote:
>
> Upgrade mesa to 19.3 and refresh the patches.
>
> As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going
> to change the do_install and add a patch to libepoxy to use the new
> define.
>
> 1:
> https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
>
> Signed-off-by: Alistair Francis
Ping!
Alistair
> ---
> ...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++
> .../libepoxy/libepoxy_1.5.4.bb| 1 +
> ...k-for-all-linux-host_os-combinations.patch | 18 ++---
> ...02-meson.build-make-TLS-ELF-optional.patch | 18 ++---
> ...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++
> ...le-asm-unconditionally-now-that-gen_.patch | 10 +++
> .../{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb} | 0
> .../mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} | 6 ++---
> 8 files changed, 58 insertions(+), 31 deletions(-)
> create mode 100644
> meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
> rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb}
> (100%)
> rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} (66%)
>
> diff --git
> a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
>
> b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
> new file mode 100644
> index 00..7262945181
> --- /dev/null
> +++
> b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
> @@ -0,0 +1,26 @@
> +From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001
> +From: Martin Jansa
> +Date: Fri, 25 Oct 2019 11:09:34 +
> +Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11
> +
> +MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:
> +https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
> +
> +Signed-off-by: Martin Jansa
> +Upstream-Status: Pending
> +---
> + src/dispatch_common.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/dispatch_common.h b/src/dispatch_common.h
> +index dcb3a35..c206253 100644
> +--- a/src/dispatch_common.h
> b/src/dispatch_common.h
> +@@ -52,6 +52,7 @@
> + * should do the same
> + */
> + # define MESA_EGL_NO_X11_HEADERS 1
> ++# define EGL_NO_X11 1
> + # endif
> + #include "epoxy/egl.h"
> + #endif
> diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
> b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
> index 4caf672369..af9867407e 100644
> --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
> +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
> @@ -10,6 +10,7 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
>
> SRC_URI =
> "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
> + file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \
> "
> SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
> SRC_URI[sha256sum] =
> "0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
> diff --git
> a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
>
> b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
> index 1869e11059..085254323c 100644
> ---
> a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
> +++
> b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
> @@ -1,6 +1,6 @@
> -From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
> -From: Alistair Francis
> -Date: Mon, 11 Nov 2019 09:38:15 -0800
> +From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
> +From: Alistair Francis
> +Date: Thu, 14 Nov 2019 13:04:49 -0800
> Subject: [PATCH] meson.build: check for all linux host_os combinations
>
> Make sure that we are also looking for our host_os combinations like
> @@ -13,30 +13,30 @@ Upstream-Status: Pending
> Signed-off-by: Anuj Mittal
> Signed-off-by: Fabio Berton
> Signed-off-by: Otavio Salvador
> -Signed-off-by: Alistair Francis
> +Signed-off-by: Alistair Francis
>
> ---
> meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> -index d584152..a1f098c 100644
> +index 898d025..09e3759 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -117,7
[OE-core] [PATCH] u-boot: Update to v2020.01-rc5
Signed-off-by: Alistair Francis --- meta/recipes-bsp/u-boot/u-boot-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index a0f9c41469..4799948bb1 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -11,11 +11,11 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" PE = "1" # Drop this line when updating to 2020.01 final -PV = "2020.01~rc3" +PV = "2020.01~rc5" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "d4a31e8ee5592072d8d5208b3e950cba2d89b6bd" +SRCREV = "ef7c2af65966a57c98d3c47e6c2fe1ce2103b7f6" SRC_URI = "git://git.denx.de/u-boot.git \ " -- 2.24.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/2] mesa: Upgrade to 19.3.1
Upgrade mesa to 19.3 and refresh the patches.
As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going
to change the do_install and add a patch to libepoxy to use the new
define.
1:
https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
Signed-off-by: Alistair Francis
---
...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++
.../libepoxy/libepoxy_1.5.4.bb| 1 +
...k-for-all-linux-host_os-combinations.patch | 18 ++---
...02-meson.build-make-TLS-ELF-optional.patch | 18 ++---
...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++
...le-asm-unconditionally-now-that-gen_.patch | 10 +++
.../{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb} | 0
.../mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} | 6 ++---
8 files changed, 58 insertions(+), 31 deletions(-)
create mode 100644
meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} (66%)
diff --git
a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
new file mode 100644
index 00..7262945181
--- /dev/null
+++
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
@@ -0,0 +1,26 @@
+From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Fri, 25 Oct 2019 11:09:34 +
+Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11
+
+MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:
+https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
+
+Signed-off-by: Martin Jansa
+Upstream-Status: Pending
+---
+ src/dispatch_common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index dcb3a35..c206253 100644
+--- a/src/dispatch_common.h
b/src/dispatch_common.h
+@@ -52,6 +52,7 @@
+ * should do the same
+ */
+ # define MESA_EGL_NO_X11_HEADERS 1
++# define EGL_NO_X11 1
+ # endif
+ #include "epoxy/egl.h"
+ #endif
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 4caf672369..af9867407e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -10,6 +10,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+ file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \
"
SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 1869e11059..085254323c 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,6 +1,6 @@
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Mon, 11 Nov 2019 09:38:15 -0800
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
Make sure that we are also looking for our host_os combinations like
@@ -13,30 +13,30 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
-Signed-off-by: Alistair Francis
+Signed-off-by: Alistair Francis
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index d584152..a1f098c 100644
+index 898d025..09e3759 100644
--- a/meson.build
+++ b/meson.build
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl
+ with_shared_glapi = with_shared_glapi and with_any_opengl
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
[OE-core] [PATCH v4 1/2] libepoxy: Update to 1.5.4
Signed-off-by: Alistair Francis
---
.../libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb}
(91%)
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
similarity index 91%
rename from meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
rename to meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 71a2c91353..4caf672369 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
"
-SRC_URI[md5sum] = "e2845de8d2782b2d31c01ae8d7cd4cbb"
-SRC_URI[sha256sum] =
"002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"
+SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
+SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases;
inherit meson pkgconfig features_check
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/2] mesa: Upgrade to 19.3.1
On Thu, Dec 19, 2019 at 11:33 PM Alexander Kanavin
wrote:
>
> On Fri, 20 Dec 2019 at 05:15, Alistair Francis wrote:
>>
>> Upgrade mesa to 19.3 and refresh the patches.
>>
>> Also change the regex to not look for x.x.0 versions as they are
>> development versions
>
>
> Old: mesa-(?P\d+(\.\d+)+)
> New: mesa-(?P\d+(\.^[1-9]\d+)+)
>
> I'm not sure what you had in mind, but the new regex does not work at all, as
> ^ outside of [] means "beginning of string", and placing [1-9] where it is
> would mean it would also exclude x.0.x versions.
The goal was to skip all x.x.0 versions, the idea being that they are
test releases.
>
> To test, use https://regex101.com/, and you should also run 'devtool
> latest-version mesa'. I actually think it's fine to leave the regex as it is,
> x.x.1 versions are usually quick to follow, and it's good to get an earlier
> notice of a new release.
I did test with devtool check-update-status (I can't remember the name
exactly) and it seemed to work.
Looking at regex101 it seems like this is what I actually want:
mesa-(?P\d+(\.\d)(\.[1-9]+)+)
I see your point about seeing the update early, but then we don't want
to accidentlly update to a test version.
Should I update to the regex I mentioned above or just drop the change?
Alistair
>
> Alex
>
>>
>> As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going
>> to change the do_install and add a patch to libepoxy to use the new
>> define.
>>
>> 1:
>> https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
>>
>> Signed-off-by: Alistair Francis
>> ---
>> ...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++
>> .../libepoxy/libepoxy_1.5.4.bb| 1 +
>> ...k-for-all-linux-host_os-combinations.patch | 18 ++---
>> ...02-meson.build-make-TLS-ELF-optional.patch | 18 ++---
>> ...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++
>> ...le-asm-unconditionally-now-that-gen_.patch | 10 +++
>> .../{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb} | 0
>> .../mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} | 8 +++---
>> 8 files changed, 59 insertions(+), 32 deletions(-)
>> create mode 100644
>> meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
>> rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb}
>> (100%)
>> rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} (60%)
>>
>> diff --git
>> a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
>>
>> b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
>> new file mode 100644
>> index 00..7262945181
>> --- /dev/null
>> +++
>> b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
>> @@ -0,0 +1,26 @@
>> +From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001
>> +From: Martin Jansa
>> +Date: Fri, 25 Oct 2019 11:09:34 +
>> +Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11
>> +
>> +MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:
>> +https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
>> +
>> +Signed-off-by: Martin Jansa
>> +Upstream-Status: Pending
>> +---
>> + src/dispatch_common.h | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/src/dispatch_common.h b/src/dispatch_common.h
>> +index dcb3a35..c206253 100644
>> +--- a/src/dispatch_common.h
>> b/src/dispatch_common.h
>> +@@ -52,6 +52,7 @@
>> + * should do the same
>> + */
>> + # define MESA_EGL_NO_X11_HEADERS 1
>> ++# define EGL_NO_X11 1
>> + # endif
>> + #include "epoxy/egl.h"
>> + #endif
>> diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
>> b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
>> index 4caf672369..af9867407e 100644
>> --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
>> +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
>> @@ -10,6 +10,7 @@ LICENSE = "MIT"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
>>
>> SRC_URI =
>> "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
>> + file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \
>> "
>> SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
>> SRC_URI[sha256sum] =
>> "0bd2cc681df
Re: [OE-core] [PATCH v2 2/2] mesa: Upgrade to 19.3.0
On Thu, Dec 19, 2019 at 3:36 AM Ross Burton wrote: > > On 19/12/2019 05:15, Alistair Francis wrote: > > Upgrade mesa to 19.3 and refresh the patches. > > > > As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going > > to change the do_install and add a patch to libepoxy to use the new > > define. > > I just remembered last night that a Mesa .0 release isn't intended for use: > > "Mesa 19.3.0 is released. This is a new development release. See the > release notes for mor information about this release." > > 19.3.1 was just released, we should ship that and change the version > checking regex to skip .0 releases. Done! I just sent the v3 patches. Alistair > > Ross > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] libepoxy: Update to 1.5.4
Signed-off-by: Alistair Francis
---
.../libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb}
(91%)
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
similarity index 91%
rename from meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
rename to meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 71a2c91353..4caf672369 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
"
-SRC_URI[md5sum] = "e2845de8d2782b2d31c01ae8d7cd4cbb"
-SRC_URI[sha256sum] =
"002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"
+SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
+SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases;
inherit meson pkgconfig features_check
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] mesa: Upgrade to 19.3.1
Upgrade mesa to 19.3 and refresh the patches.
Also change the regex to not look for x.x.0 versions as they are
development versions.
As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going
to change the do_install and add a patch to libepoxy to use the new
define.
1:
https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
Signed-off-by: Alistair Francis
---
...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++
.../libepoxy/libepoxy_1.5.4.bb| 1 +
...k-for-all-linux-host_os-combinations.patch | 18 ++---
...02-meson.build-make-TLS-ELF-optional.patch | 18 ++---
...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++
...le-asm-unconditionally-now-that-gen_.patch | 10 +++
.../{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb} | 0
.../mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} | 8 +++---
8 files changed, 59 insertions(+), 32 deletions(-)
create mode 100644
meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.1.bb} (60%)
diff --git
a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
new file mode 100644
index 00..7262945181
--- /dev/null
+++
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
@@ -0,0 +1,26 @@
+From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Fri, 25 Oct 2019 11:09:34 +
+Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11
+
+MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:
+https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
+
+Signed-off-by: Martin Jansa
+Upstream-Status: Pending
+---
+ src/dispatch_common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index dcb3a35..c206253 100644
+--- a/src/dispatch_common.h
b/src/dispatch_common.h
+@@ -52,6 +52,7 @@
+ * should do the same
+ */
+ # define MESA_EGL_NO_X11_HEADERS 1
++# define EGL_NO_X11 1
+ # endif
+ #include "epoxy/egl.h"
+ #endif
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 4caf672369..af9867407e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -10,6 +10,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+ file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \
"
SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 1869e11059..085254323c 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,6 +1,6 @@
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Mon, 11 Nov 2019 09:38:15 -0800
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
Make sure that we are also looking for our host_os combinations like
@@ -13,30 +13,30 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
-Signed-off-by: Alistair Francis
+Signed-off-by: Alistair Francis
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index d584152..a1f098c 100644
+index 898d025..09e3759 100644
--- a/meson.build
+++ b/meson.build
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl
+ with_shared_glapi = with_shared_glapi and with_any_opengl
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfl
[OE-core] [PATCH v3] tune-riscv: Add support for no float
Signed-off-by: Alistair Francis
---
v3:
- Don't use overrides
- Improve the PACKAGE_EXTRA_ARCHS's setting
meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
meta/conf/machine/include/riscv/tune-riscv.inc | 16 +++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index 8ed9874389..e3dbef7fe3 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
-TUNE_CCARGS .= ""
+TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', '
-mabi=lp64', ' ', d)}"
+TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', '
-mabi=ilp32', ' ', d)}"
# QEMU usermode fails with invalid instruction error (For riscv32)
MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
"${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
b/meta/conf/machine/include/riscv/tune-riscv.inc
index 25d0463492..741eeb34db 100644
--- a/meta/conf/machine/include/riscv/tune-riscv.inc
+++ b/meta/conf/machine/include/riscv/tune-riscv.inc
@@ -3,10 +3,14 @@ require conf/machine/include/riscv/arch-riscv.inc
TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
+TUNEVALID[riscv64nf] = "Enable 64-bit RISC-V optimizations no floating point"
+TUNEVALID[riscv32nf] = "Enable 32-bit RISC-V optimizations no floating point"
+
TUNEVALID[bigendian] = "Big endian mode"
-AVAILTUNES += "riscv64 riscv32"
+AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf"
+# Default
TUNE_FEATURES_tune-riscv64 = "riscv64"
TUNE_ARCH_tune-riscv64 = "riscv64"
TUNE_PKGARCH_tune-riscv64 = "riscv64"
@@ -17,3 +21,13 @@ TUNE_ARCH_tune-riscv32 = "riscv32"
TUNE_PKGARCH_tune-riscv32 = "riscv32"
PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
+# No float
+TUNE_FEATURES_tune-riscv64nf = "${TUNE_FEATURES_tune-riscv64} riscv64nf"
+TUNE_ARCH_tune-riscv64nf = "riscv64"
+TUNE_PKGARCH_tune-riscv64nf = "riscv64"
+PACKAGE_EXTRA_ARCHS_tune-riscv64nf = "riscv64nf"
+
+TUNE_FEATURES_tune-riscv32nf = "${TUNE_FEATURES_tune-riscv32} riscv32nf"
+TUNE_ARCH_tune-riscv32nf = "riscv32"
+TUNE_PKGARCH_tune-riscv32nf = "riscv32"
+PACKAGE_EXTRA_ARCHS_tune-riscv32nf = "riscv32nf"
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] mesa: Upgrade to 19.3.0
Upgrade mesa to 19.3 and refresh the patches.
As MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in [1] we are going
to change the do_install and add a patch to libepoxy to use the new
define.
1:
https://gitlab.freedesktop.org/mesa/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
Signed-off-by: Alistair Francis
---
...atch_common.h-define-also-EGL_NO_X11.patch | 26 +++
.../libepoxy/libepoxy_1.5.4.bb| 1 +
...k-for-all-linux-host_os-combinations.patch | 18 ++---
...02-meson.build-make-TLS-ELF-optional.patch | 18 ++---
...Allow-enable-DRI-without-DRI-drivers.patch | 10 +++
...le-asm-unconditionally-now-that-gen_.patch | 10 +++
.../{mesa-gl_19.2.4.bb => mesa-gl_19.3.0.bb} | 0
.../mesa/{mesa_19.2.4.bb => mesa_19.3.0.bb} | 6 ++---
8 files changed, 58 insertions(+), 31 deletions(-)
create mode 100644
meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.0.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.0.bb} (66%)
diff --git
a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
new file mode 100644
index 00..7262945181
--- /dev/null
+++
b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch
@@ -0,0 +1,26 @@
+From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Fri, 25 Oct 2019 11:09:34 +
+Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11
+
+MESA_EGL_NO_X11_HEADERS was renamed to EGL_NO_X11 in:
+https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb
+
+Signed-off-by: Martin Jansa
+Upstream-Status: Pending
+---
+ src/dispatch_common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index dcb3a35..c206253 100644
+--- a/src/dispatch_common.h
b/src/dispatch_common.h
+@@ -52,6 +52,7 @@
+ * should do the same
+ */
+ # define MESA_EGL_NO_X11_HEADERS 1
++# define EGL_NO_X11 1
+ # endif
+ #include "epoxy/egl.h"
+ #endif
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 4caf672369..af9867407e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -10,6 +10,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+ file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \
"
SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 1869e11059..085254323c 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,6 +1,6 @@
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Mon, 11 Nov 2019 09:38:15 -0800
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
Make sure that we are also looking for our host_os combinations like
@@ -13,30 +13,30 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
-Signed-off-by: Alistair Francis
+Signed-off-by: Alistair Francis
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index d584152..a1f098c 100644
+index 898d025..09e3759 100644
--- a/meson.build
+++ b/meson.build
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl
+ with_shared_glapi = with_shared_glapi and with_any_opengl
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
[OE-core] [PATCH v2 1/2] libepoxy: Update to 1.5.4
Signed-off-by: Alistair Francis
---
.../libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/libepoxy/{libepoxy_1.5.3.bb => libepoxy_1.5.4.bb}
(91%)
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
similarity index 91%
rename from meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
rename to meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
index 71a2c91353..4caf672369 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
"
-SRC_URI[md5sum] = "e2845de8d2782b2d31c01ae8d7cd4cbb"
-SRC_URI[sha256sum] =
"002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"
+SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467"
+SRC_URI[sha256sum] =
"0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases;
inherit meson pkgconfig features_check
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: Upgrade to 19.3.0
On Tue, Dec 17, 2019 at 8:53 AM Ross Burton wrote: > > On 17/12/2019 16:26, Martin Jansa wrote: > > Yes, see my reply in https://patches.openembedded.org/patch/165737/ > > That's it! I knew I'd seen it somewhere but couldn't remember where. > Thanks Martin. Thanks so much! I think I have fixed all the issues, I'm just doing some builds to double check. I'll send the patches when ready. Alistair > > Ross > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: Upgrade to 19.3.0
Signed-off-by: Alistair Francis
---
...ck-for-all-linux-host_os-combinations.patch | 18 +-
...002-meson.build-make-TLS-ELF-optional.patch | 18 +-
...-Allow-enable-DRI-without-DRI-drivers.patch | 10 +-
...ble-asm-unconditionally-now-that-gen_.patch | 10 +-
.../{mesa-gl_19.2.4.bb => mesa-gl_19.3.0.bb} | 0
.../mesa/{mesa_19.2.4.bb => mesa_19.3.0.bb}| 4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_19.2.4.bb => mesa-gl_19.3.0.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.2.4.bb => mesa_19.3.0.bb} (86%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 1869e11059..085254323c 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,6 +1,6 @@
-From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Mon, 11 Nov 2019 09:38:15 -0800
+From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
Make sure that we are also looking for our host_os combinations like
@@ -13,30 +13,30 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
-Signed-off-by: Alistair Francis
+Signed-off-by: Alistair Francis
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index d584152..a1f098c 100644
+index 898d025..09e3759 100644
--- a/meson.build
+++ b/meson.build
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl
+ with_shared_glapi = with_shared_glapi and with_any_opengl
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
dri_drivers = get_option('dri-drivers')
if dri_drivers.contains('auto')
-@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
+@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
endif
# TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
+-if ['linux', 'cygwin', 'gnu', 'freebsd',
'gnu/kfreebsd'].contains(host_machine.system())
+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
pre_args += '-D_GNU_SOURCE'
elif host_machine.system() == 'sunos'
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
index 199ed572d5..cd35a1f850 100644
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -1,13 +1,13 @@
-From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Wed, 23 Oct 2019 09:46:28 -0700
+From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Thu, 14 Nov 2019 13:08:31 -0800
Subject: [PATCH] meson.build: make TLS ELF optional
USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
TLS GLX optional again" patch updated to the latest mesa.
Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Alistair Francis
+Signed-off-by: Alistair Francis
---
meson.build | 2 +-
@@ -15,23 +15,23 @@ Signed-off-by: Alistair Francis
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index a1f098c..1e31eb4 100644
+index 09e3759..a954118 100644
--- a/meson.build
+++ b/meson.build
-@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if not with_platform_android or get_option('platform-sdk-version') >= 29
+-if host_machine.system() != 'windows' and (not with_platform_android or
get_option('platform-sdk-version') >= 29)
[OE-core] [PATCH v2] tune-riscv: Add support for no float
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
meta/conf/machine/include/riscv/tune-riscv.inc | 16 +++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index f3edcc39f7..33ad6a28e1 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
-TUNE_CCARGS .= ""
+TUNE_CCARGS_append_riscv64 = "${@bb.utils.contains('TUNE_FEATURES',
'riscv64nf', ' -mabi=lp64', ' ', d)}"
+TUNE_CCARGS_append_riscv32 = "${@bb.utils.contains('TUNE_FEATURES',
'riscv32nf', ' -mabi=ilp32', ' ', d)}"
# QEMU usermode fails with invalid instruction error (For riscv32)
MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
"${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
b/meta/conf/machine/include/riscv/tune-riscv.inc
index 25d0463492..b7dcd244d6 100644
--- a/meta/conf/machine/include/riscv/tune-riscv.inc
+++ b/meta/conf/machine/include/riscv/tune-riscv.inc
@@ -3,10 +3,14 @@ require conf/machine/include/riscv/arch-riscv.inc
TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
+TUNEVALID[riscv64nf] = "Enable 64-bit RISC-V optimizations no floating point"
+TUNEVALID[riscv32nf] = "Enable 32-bit RISC-V optimizations no floating point"
+
TUNEVALID[bigendian] = "Big endian mode"
-AVAILTUNES += "riscv64 riscv32"
+AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf"
+# Default
TUNE_FEATURES_tune-riscv64 = "riscv64"
TUNE_ARCH_tune-riscv64 = "riscv64"
TUNE_PKGARCH_tune-riscv64 = "riscv64"
@@ -17,3 +21,13 @@ TUNE_ARCH_tune-riscv32 = "riscv32"
TUNE_PKGARCH_tune-riscv32 = "riscv32"
PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
+# No float
+TUNE_FEATURES_tune-riscv64nf = "${TUNE_FEATURES_tune-riscv64} riscv64nf"
+TUNE_ARCH_tune-riscv64nf = "riscv64"
+TUNE_PKGARCH_tune-riscv64nf = "riscv64"
+PACKAGE_EXTRA_ARCHS_tune-riscv64nf = "riscv64"
+
+TUNE_FEATURES_tune-riscv32nf = "${TUNE_FEATURES_tune-riscv32} riscv32nf"
+TUNE_ARCH_tune-riscv32nf = "riscv32"
+TUNE_PKGARCH_tune-riscv32nf = "riscv32"
+PACKAGE_EXTRA_ARCHS_tune-riscv32nf = "riscv32"
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Open ISA (RISC-V, OpenPOWER, etc) Miniconf at LCA 2020
Hi All, We’re pleased to announce the first Open ISA miniconf at linux.conf.au Open Instruction Set Architectures like RISC-V, OpenPOWER and others are the next step in the evolution of Open Hardware. The mini-conference will commence with a brief overview of Open ISAs in general. It will then introduce the two most common open ISAs, RISC-V and OpenPOWER. This will include an overview of the ISAs, how they are supported and why people should use them. Finally we will delve straight into a set of curated presentations from across the Open ISA ecosystem. The miniconf organisers, Alistair Francis and Hugh Blemings along with the LCA 2020 team invite proposals for sessions in the Open ISA miniconf of either 15 or 30 minutes duration. Suggested topics include Linux kernel support for open ISAs, RISC-V, Open POWER and any other Open ISA related topics. As befits LCA, sessions should have a strong technical emphasis rather than marketing/sales focus. Places are limited in the miniconf schedule and early submission of your proposal will assist our planning. The Call for Sessions formally closes on December 8th. For attendees - the miniconf promises a great deal of technical depth and breadth across this relatively new aspect of the open technical commons, we look forward to seeing you! As an extra plus it's on the beautiful Gold Coast in the middle of Summer :) Registration and details are available at: https://linux.conf.au/programme/miniconfs/open-isa/ And don't forget there's a bunch of other awesome miniconfs scheduled for LCA 2020 - the complete list is available here - https://linux.conf.au/programme/miniconfs/ We look forward to seeing you! Regards, Hugh Blemings & Alistair Francis -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v7] mesa: Upgrade to 19.2.3
On Wed, Nov 13, 2019 at 11:08 PM Khem Raj wrote:
>
> On Mon, 2019-11-11 at 16:31 -0800, Alistair Francis wrote:
> > From: Alistair Francis
> >
> > Upgrade mesa and mesa-gl to 19.2.3.
> >
> > The license hash change was a trivial new line removal.
> >
> > The glx-tls option was removed as it isn't included in the
> > meson.build
> > file. It has been replaced with 'use-elf-tls' instead. We also added
> > an
> > INSANE_SKIP to fix this error
> > do_package_qa: QA Issue: ELF binary
> > '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations
> > in .text
> > [textrel]
> >
> > The -Dasm=false was removed as it also is no longer included.
> >
>
> ARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgl-mesa: ELF
> binary /usr/lib/libGL.so.1.2.0 has relocations in .text [textrel]
> WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgles1-mesa: ELF
> binary /usr/lib/libGLESv1_CM.so.1.1.0 has relocations in .text
> [textrel]
> WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libgles2-mesa: ELF
> binary /usr/lib/libGLESv2.so.2.0.0 has relocations in .text [textrel]
> WARNING: mesa-2_19.2.3-r0 do_package_qa: QA Issue: libglapi: ELF binary
> /usr/lib/libglapi.so.0.0.0 has relocations in .text [textrel]
>
> with musl is still seen. I think we need to disable asm at least for
> musl case.
Ok, I have added back the asm disable and bumped to 19.2.4.
Alistair
>
> > Signed-off-by: Alistair Francis
> > Signed-off-by: Alistair Francis
> > Acked-by: Otavio Salvador
> > ---
> > v7:
> > - Update to mesa 19.2.3
> > - Add INSANE_SKIP
> > v6:
> > - Rebase on master
> > v4:
> > - Add a patch (first patch in the series) to fix libsdl2 build
> > v3:
> > - Fix missing Upstream-Status
> > v2:
> > - Add back "make TLS ELF optional" patch
> >
> > ...k-for-all-linux-host_os-combinations.patch | 23
> > ...02-meson.build-make-TLS-ELF-optional.patch | 48 +
> > ...on.build-make-TLS-GLX-optional-again.patch | 52 ---
> >
> > .../{mesa-gl_19.1.6.bb => mesa-gl_19.2.3.bb} | 0
> > meta/recipes-graphics/mesa/mesa.inc | 18 +++
> > .../mesa/{mesa_19.1.6.bb => mesa_19.2.3.bb} | 6 +--
> > 6 files changed, 73 insertions(+), 74 deletions(-)
> > create mode 100644 meta/recipes-graphics/mesa/files/0002-
> > meson.build-make-TLS-ELF-optional.patch
> > delete mode 100644 meta/recipes-graphics/mesa/files/0002-
> > meson.build-make-TLS-GLX-optional-again.patch
> > rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-
> > gl_19.2.3.bb} (100%)
> > rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.3.bb}
> > (77%)
> >
> > diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-
> > for-all-linux-host_os-combinations.patch b/meta/recipes-
> > graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-
> > combinations.patch
> > index 9fba5da4b2..1aff727455 100644
> > --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-
> > all-linux-host_os-combinations.patch
> > +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-
> > all-linux-host_os-combinations.patch
> > @@ -1,8 +1,7 @@
> > -From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00
> > 2001
> > -From: Fabio Berton
> > -Date: Wed, 12 Jun 2019 13:40:20 -0300
> > +From 7547bd7340dc318392aee8b3a3ad1f9d902121db Mon Sep 17 00:00:00
> > 2001
> > +From: Alistair Francis
> > +Date: Mon, 11 Nov 2019 09:38:15 -0800
> > Subject: [PATCH] meson.build: check for all linux host_os
> > combinations
> > -Organization: O.S. Systems Software LTDA.
> >
> > Make sure that we are also looking for our host_os combinations like
> > linux-musl etc. when assuming support for DRM/KMS.
> > @@ -14,29 +13,33 @@ Upstream-Status: Pending
> > Signed-off-by: Anuj Mittal
> > Signed-off-by: Fabio Berton
> > Signed-off-by: Otavio Salvador
> > +Signed-off-by: Alistair Francis
> > ---
> > meson.build | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > -index 567a81afd6f..b33b430aed4 100644
> > +index d58415270d0..a1f098c3b19 100644
> > --- a/meson.build
> > +++ b/meson.build
> > -@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or
> > with_gles2
> > +@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or
> > with_gles2
>
[OE-core] [PATCH v8] mesa: Upgrade to 19.2.4
Upgrade mesa and mesa-gl to 19.2.4.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
I have backported the asm removal as an attempt to fix the musl build
issue.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
---
v8:
- Add asm revert patch
- Bump to 19.2.4
- Remove INSANE_SKIP
- Refresh patches
v7:
- Update to mesa 19.2.3
- Add INSANE_SKIP
v6:
- Rebase on master
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...k-for-all-linux-host_os-combinations.patch | 21 +--
...02-meson.build-make-TLS-ELF-optional.patch | 46 ++
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
...Allow-enable-DRI-without-DRI-drivers.patch | 10 +-
...le-asm-unconditionally-now-that-gen_.patch | 147 ++
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.4.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 12 +-
.../mesa/{mesa_19.1.6.bb => mesa_19.2.4.bb} | 7 +-
8 files changed, 219 insertions(+), 76 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
create mode 100644
meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.4.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.4.bb} (72%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 9fba5da4b2..1869e11059 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,8 +1,7 @@
-From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 13:40:20 -0300
+From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Mon, 11 Nov 2019 09:38:15 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
-Organization: O.S. Systems Software LTDA.
Make sure that we are also looking for our host_os combinations like
linux-musl etc. when assuming support for DRM/KMS.
@@ -14,29 +13,31 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
+Signed-off-by: Alistair Francis
+
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 567a81afd6f..b33b430aed4 100644
+index d584152..a1f098c 100644
--- a/meson.build
+++ b/meson.build
-@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = get_option('shared-glapi') and with_any_opengl
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux'].contains(host_machine.system())
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
dri_drivers = get_option('dri-drivers')
if dri_drivers.contains('auto')
-@@ -845,7 +845,7 @@ if cc.compiles('int foo(void)
__attribute__((__noreturn__));',
+@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
endif
# TODO: this is very incomplete
-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
pre_args += '-D_GNU_SOURCE'
- endif
-
+ elif host_machine.system() == 'sunos'
+ pre_args += '-D__EXTENSIONS__'
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..199ed572d5
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,46 @@
+From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "m
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Tue, Nov 12, 2019 at 8:19 AM Khem Raj wrote: > > On Sat, Nov 9, 2019 at 7:36 AM Alexander Kanavin > wrote: > > > > On Sat, 9 Nov 2019 at 00:02, Alistair Francis wrote: > >> > >> > right this means glx-tls is not working anymore, and it will fail on > >> > musl at runtime > >> > see > >> > https://gitlab.freedesktop.org/mesa/mesa/issues/966 > >> > >> So what do we do here? > >> > >> There are some patches in that issue, but they don't cleanly apply and > >> seem hacky anyway. Can we have two versions of mesa? One for musl and > >> one for others until this is fixed upstream? > > > > > > Maybe we can silence the warning for musl only, via > > INSANE_SKIP_..._libc-musl = "textrel"? > > ffmpeg does the same already. > > in this case, texrel will endup causing sigsegv, this is a mesa issue, > primarily we have been working it around so far. I sent a new patch, it probably doesn't fix this issue though. We can't just not update mesa because of this. What about having two versions, or for musl and one for glibc? Alistair > > > > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v7] mesa: Upgrade to 19.2.3
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.3.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead. We also added an
INSANE_SKIP to fix this error
do_package_qa: QA Issue: ELF binary
'[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text
[textrel]
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
Acked-by: Otavio Salvador
---
v7:
- Update to mesa 19.2.3
- Add INSANE_SKIP
v6:
- Rebase on master
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...k-for-all-linux-host_os-combinations.patch | 23
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 18 +++
.../mesa/{mesa_19.1.6.bb => mesa_19.2.3.bb} | 6 +--
6 files changed, 73 insertions(+), 74 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.3.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.3.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 9fba5da4b2..1aff727455 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,8 +1,7 @@
-From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 13:40:20 -0300
+From 7547bd7340dc318392aee8b3a3ad1f9d902121db Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Mon, 11 Nov 2019 09:38:15 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
-Organization: O.S. Systems Software LTDA.
Make sure that we are also looking for our host_os combinations like
linux-musl etc. when assuming support for DRM/KMS.
@@ -14,29 +13,33 @@ Upstream-Status: Pending
Signed-off-by: Anuj Mittal
Signed-off-by: Fabio Berton
Signed-off-by: Otavio Salvador
+Signed-off-by: Alistair Francis
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 567a81afd6f..b33b430aed4 100644
+index d58415270d0..a1f098c3b19 100644
--- a/meson.build
+++ b/meson.build
-@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = get_option('shared-glapi') and with_any_opengl
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux'].contains(host_machine.system())
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
dri_drivers = get_option('dri-drivers')
if dri_drivers.contains('auto')
-@@ -845,7 +845,7 @@ if cc.compiles('int foo(void)
__attribute__((__noreturn__));',
+@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
endif
# TODO: this is very incomplete
-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
pre_args += '-D_GNU_SOURCE'
- endif
-
+ elif host_machine.system() == 'sunos'
+ pre_args += '-D__EXTENSIONS__'
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Fri, Nov 8, 2019 at 3:14 PM Alistair Francis wrote: > > On Fri, Nov 8, 2019 at 3:07 PM Richard Purdie > wrote: > > > > On Fri, 2019-11-08 at 22:24 +0200, Adrian Bunk wrote: > > > Especially when looking at the arm64 situation I am wondering > > > whether the best option might be to throw away the tunes mess and let > > > the user write the compiler options directly. > > > > OE once did that. I think anyone who lived through it would say that > > the current situation *is* an improvement over a free-for-all. > > > > This is mainly as at least we're now consistent whereas before the same > > thing had different names in each BSP. > > > > I don't know what the answer is but I don't want to go back to that! > > Ha ok. I won't argue with that. > > I can just carry the patch locally, so I'm not in a rush to get this > in. I have reached out to Rich (musl maintainer) to see if he has any > ideas. I just realised I got my wires crossed here, ignore this. Alistair > > Alistair > > > > > Cheers, > > > > Richard > > > > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Fri, Nov 8, 2019 at 3:07 PM Richard Purdie wrote: > > On Fri, 2019-11-08 at 22:24 +0200, Adrian Bunk wrote: > > Especially when looking at the arm64 situation I am wondering > > whether the best option might be to throw away the tunes mess and let > > the user write the compiler options directly. > > OE once did that. I think anyone who lived through it would say that > the current situation *is* an improvement over a free-for-all. > > This is mainly as at least we're now consistent whereas before the same > thing had different names in each BSP. > > I don't know what the answer is but I don't want to go back to that! Ha ok. I won't argue with that. I can just carry the patch locally, so I'm not in a rush to get this in. I have reached out to Rich (musl maintainer) to see if he has any ideas. Alistair > > Cheers, > > Richard > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
On Fri, Nov 8, 2019 at 10:13 AM Khem Raj wrote: > > On Fri, Nov 8, 2019 at 2:32 AM Ross Burton wrote: > > > > On 04/11/2019 22:48, Alistair Francis wrote: > > > From: Alistair Francis > > > > > > Upgrade mesa and mesa-gl to 19.2.1. > > > > > > The license hash change was a trivial new line removal. > > > > > > The glx-tls option was removed as it isn't included in the meson.build > > > file. It has been replaced with 'use-elf-tls' instead. > > > > I think this has regressed something, this is a new warning on musl builds: > > > > do_package_qa: QA Issue: ELF binary > > '[...]libgles2-mesa/usr/lib/libGLESv2.so.2.0.0' has relocations in .text > > [textrel] > > > > (ditto for libGLESv1_CM.so.1.1.0 libGL.so.1.2.0 libglapi.so.0.0.0) > > > > right this means glx-tls is not working anymore, and it will fail on > musl at runtime > see > https://gitlab.freedesktop.org/mesa/mesa/issues/966 So what do we do here? There are some patches in that issue, but they don't cleanly apply and seem hacky anyway. Can we have two versions of mesa? One for musl and one for others until this is fixed upstream? Alistair > > > Ross > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Wed, Nov 6, 2019 at 11:33 PM Nathan Rossi wrote:
>
> On Thu, 7 Nov 2019 at 09:34, Adrian Bunk wrote:
> >
> > On Wed, Nov 06, 2019 at 10:18:18AM -0800, Alistair Francis wrote:
> > >...
> > > +TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES',
> > > 'riscv64-f', ' -mabi=lp64d', ' -mabi=lp64', d)}"
> > > +TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES',
> > > 'riscv32-f', ' -mabi=ilp32f', ' -mabi=ilp32', d)}"
> > >...
> >
> > That looks wrong, what would you put in TUNE_FEATURES
> > for -mabi=lp64f when -mabi=lp64d is called riscv64-f?
> >
> > Also note that this is only the floating point calling convention,
> > whether the compiler emits floating point instructions is defined
> > by -march.
> >
> > It would be good if this would start with a plan how to handle
> > all possible combination of RISC-V ISA extensions, ideally better
> > than the arm mess.
>
> I am keen to see this as well, since I am currently directly
> hardcoding -march/-mabi in the machine conf.
>
> It would be nice to see the ISA tunes available in oe-core, even if
> that is just the tune features and not predefined tunes (e.g. like
> microblaze).
I think this idea as well. Some generic way of generating tunes from
ISA stings would be great!
Does anyone have any ideas on the best way to do this?
Alistair
>
> Regards,
> Nathan
>
> >
> > cu
> > Adrian
> >
> > --
> >
> >"Is there not promise of rain?" Ling Tan asked suddenly out
> > of the darkness. There had been need of rain for many days.
> >"Only a promise," Lao Er said.
> >Pearl S. Buck - Dragon Seed
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] tune-riscv: Add support for no float
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
meta/conf/machine/include/riscv/tune-riscv.inc | 16 +++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index f3edcc39f7..7ee497fe20 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
-TUNE_CCARGS .= ""
+TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', '
-mabi=lp64', ' ', d)}"
+TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', '
-mabi=ilp32', ' ', d)}"
# QEMU usermode fails with invalid instruction error (For riscv32)
MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
"${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
b/meta/conf/machine/include/riscv/tune-riscv.inc
index 25d0463492..b7dcd244d6 100644
--- a/meta/conf/machine/include/riscv/tune-riscv.inc
+++ b/meta/conf/machine/include/riscv/tune-riscv.inc
@@ -3,10 +3,14 @@ require conf/machine/include/riscv/arch-riscv.inc
TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
+TUNEVALID[riscv64nf] = "Enable 64-bit RISC-V optimizations no floating point"
+TUNEVALID[riscv32nf] = "Enable 32-bit RISC-V optimizations no floating point"
+
TUNEVALID[bigendian] = "Big endian mode"
-AVAILTUNES += "riscv64 riscv32"
+AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf"
+# Default
TUNE_FEATURES_tune-riscv64 = "riscv64"
TUNE_ARCH_tune-riscv64 = "riscv64"
TUNE_PKGARCH_tune-riscv64 = "riscv64"
@@ -17,3 +21,13 @@ TUNE_ARCH_tune-riscv32 = "riscv32"
TUNE_PKGARCH_tune-riscv32 = "riscv32"
PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
+# No float
+TUNE_FEATURES_tune-riscv64nf = "${TUNE_FEATURES_tune-riscv64} riscv64nf"
+TUNE_ARCH_tune-riscv64nf = "riscv64"
+TUNE_PKGARCH_tune-riscv64nf = "riscv64"
+PACKAGE_EXTRA_ARCHS_tune-riscv64nf = "riscv64"
+
+TUNE_FEATURES_tune-riscv32nf = "${TUNE_FEATURES_tune-riscv32} riscv32nf"
+TUNE_ARCH_tune-riscv32nf = "riscv32"
+TUNE_PKGARCH_tune-riscv32nf = "riscv32"
+PACKAGE_EXTRA_ARCHS_tune-riscv32nf = "riscv32"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Thu, 2019-11-07 at 00:12 +0200, Adrian Bunk wrote:
> On Wed, Nov 06, 2019 at 10:18:18AM -0800, Alistair Francis wrote:
> > ...
> > +TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES',
> > 'riscv64-f', ' -mabi=lp64d', ' -mabi=lp64', d)}"
> > +TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES',
> > 'riscv32-f', ' -mabi=ilp32f', ' -mabi=ilp32', d)}"
> > ...
>
> That looks wrong, what would you put in TUNE_FEATURES
> for -mabi=lp64f when -mabi=lp64d is called riscv64-f?
I am just going to add riscv32nf and riscv64nf. This will specify
-mabi=ilp32 and -mabi=lp64 accordingly. I won't change the default
riscv32 and riscv64. We can then deal with the single and double float
at a later point.
>
> Also note that this is only the floating point calling convention,
> whether the compiler emits floating point instructions is defined
> by -march.
-march is another can of worms that I was trying to avoid. I don't have
a good way of handling the ISA strings at the moment without some crazy
number of tune options.
>
> It would be good if this would start with a plan how to handle
> all possible combination of RISC-V ISA extensions, ideally better
> than the arm mess.
Agreed. I am just going to change this to add a no float option as that
fixes a large number of 32-bit link failures (seen in U-Boot, OpenSBI
and SDKs) and we can re-evaluate a longer term march fix.
Alistair
>
> cu
> Adrian
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Wed, 2019-11-06 at 14:18 -0800, Khem Raj wrote:
> On Wed, Nov 6, 2019 at 1:52 PM Alistair Francis
> wrote:
> > On Wed, 2019-11-06 at 13:49 -0800, Khem Raj wrote:
> > > On Wed, Nov 6, 2019 at 1:34 PM Alistair Francis
> > > wrote:
> > > > On Wed, 2019-11-06 at 12:54 -0800, Khem Raj wrote:
> > > > > On Wed, Nov 6, 2019 at 12:37 PM Alistair Francis
> > > > > wrote:
> > > > > > Signed-off-by: Alistair Francis
> > > > > > ---
> > > > > > meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
> > > > > > meta/conf/machine/include/riscv/tune-riscv.inc | 17
> > > > > > +++--
> > > > > > 2 files changed, 17 insertions(+), 3 deletions(-)
> > > > > >
> > > > > > diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > > > b/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > > > index f3edcc39f7..6737545e00 100644
> > > > > > --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > > > +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > > > @@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
> > > > > >
> > > > > > TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
> > > > > > TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
> > > > > > -TUNE_CCARGS .= ""
> > > > > > +TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURE
> > > > > > S',
> > > > > > 'riscv64-f', ' -mabi=lp64d', ' -mabi=lp64', d)}"
> > > > > > +TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURE
> > > > > > S',
> > > > > > 'riscv32-f', ' -mabi=ilp32f', ' -mabi=ilp32', d)}"
> > > > > >
> > > > > > # QEMU usermode fails with invalid instruction error (For
> > > > > > riscv32)
> > > > > > MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "
> > > > > > ${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-
> > > > > > usermode',
> > > > > > '', d)}"
> > > > > > diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > > > b/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > > > index 25d0463492..631653f2a2 100644
> > > > > > --- a/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > > > +++ b/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > > > @@ -1,12 +1,26 @@
> > > > > > require conf/machine/include/riscv/arch-riscv.inc
> > > > > >
> > > > > > TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
> > > > > > +TUNEVALID[riscv64-f] = "Enable 64-bit RISC-V optimizations
> > > > > > with
> > > > > > hard float"
> > > > > > TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
> > > > > > +TUNEVALID[riscv32-f] = "Enable 32-bit RISC-V optimizations
> > > > > > with
> > > > > > hard float"
> > > > > >
> > > > > > TUNEVALID[bigendian] = "Big endian mode"
> > > > > >
> > > > > > -AVAILTUNES += "riscv64 riscv32"
> > > > > > +AVAILTUNES += "riscv64 riscv64-f riscv32 riscv32-f"
> > > > > >
> > > > > > +# Hard float
> > > > > > +TUNE_FEATURES_tune-riscv64-f = "${TUNE_FEATURES_tune-
> > > > > > riscv64}
> > > > > > riscv64-f"
> > > > > > +TUNE_ARCH_tune-riscv64-f = "riscv64"
> > > > > > +TUNE_PKGARCH_tune-riscv64-f = "riscv64"
> > > > > > +PACKAGE_EXTRA_ARCHS_tune-riscv64-f = "riscv64"
> > > > > > +
> > > > > > +TUNE_FEATURES_tune-riscv32-f = "${TUNE_FEATURES_tune-
> > > > > > riscv32}
> > > > > > riscv32-f"
> > > > > > +TUNE_ARCH_tune-riscv32-f = "riscv32"
> > > > > > +TUNE_PKGARCH_tune-riscv32-f = "riscv32"
> > > > > > +PACKAGE_EXTRA_ARCHS_tune-riscv32-f = "riscv32"
> > > > > > +
> > > > > > +# Soft float
> > > > > > TUNE_FEATURES_tune-riscv64 = "riscv64"
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Wed, 2019-11-06 at 13:49 -0800, Khem Raj wrote:
> On Wed, Nov 6, 2019 at 1:34 PM Alistair Francis
> wrote:
> > On Wed, 2019-11-06 at 12:54 -0800, Khem Raj wrote:
> > > On Wed, Nov 6, 2019 at 12:37 PM Alistair Francis
> > > wrote:
> > > > Signed-off-by: Alistair Francis
> > > > ---
> > > > meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
> > > > meta/conf/machine/include/riscv/tune-riscv.inc | 17
> > > > +++--
> > > > 2 files changed, 17 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > b/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > index f3edcc39f7..6737545e00 100644
> > > > --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> > > > @@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
> > > >
> > > > TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
> > > > TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
> > > > -TUNE_CCARGS .= ""
> > > > +TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES',
> > > > 'riscv64-f', ' -mabi=lp64d', ' -mabi=lp64', d)}"
> > > > +TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES',
> > > > 'riscv32-f', ' -mabi=ilp32f', ' -mabi=ilp32', d)}"
> > > >
> > > > # QEMU usermode fails with invalid instruction error (For
> > > > riscv32)
> > > > MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "
> > > > ${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-
> > > > usermode',
> > > > '', d)}"
> > > > diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > b/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > index 25d0463492..631653f2a2 100644
> > > > --- a/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > +++ b/meta/conf/machine/include/riscv/tune-riscv.inc
> > > > @@ -1,12 +1,26 @@
> > > > require conf/machine/include/riscv/arch-riscv.inc
> > > >
> > > > TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
> > > > +TUNEVALID[riscv64-f] = "Enable 64-bit RISC-V optimizations
> > > > with
> > > > hard float"
> > > > TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
> > > > +TUNEVALID[riscv32-f] = "Enable 32-bit RISC-V optimizations
> > > > with
> > > > hard float"
> > > >
> > > > TUNEVALID[bigendian] = "Big endian mode"
> > > >
> > > > -AVAILTUNES += "riscv64 riscv32"
> > > > +AVAILTUNES += "riscv64 riscv64-f riscv32 riscv32-f"
> > > >
> > > > +# Hard float
> > > > +TUNE_FEATURES_tune-riscv64-f = "${TUNE_FEATURES_tune-riscv64}
> > > > riscv64-f"
> > > > +TUNE_ARCH_tune-riscv64-f = "riscv64"
> > > > +TUNE_PKGARCH_tune-riscv64-f = "riscv64"
> > > > +PACKAGE_EXTRA_ARCHS_tune-riscv64-f = "riscv64"
> > > > +
> > > > +TUNE_FEATURES_tune-riscv32-f = "${TUNE_FEATURES_tune-riscv32}
> > > > riscv32-f"
> > > > +TUNE_ARCH_tune-riscv32-f = "riscv32"
> > > > +TUNE_PKGARCH_tune-riscv32-f = "riscv32"
> > > > +PACKAGE_EXTRA_ARCHS_tune-riscv32-f = "riscv32"
> > > > +
> > > > +# Soft float
> > > > TUNE_FEATURES_tune-riscv64 = "riscv64"
> > > > TUNE_ARCH_tune-riscv64 = "riscv64"
> > > > TUNE_PKGARCH_tune-riscv64 = "riscv64"
> > > > @@ -16,4 +30,3 @@ TUNE_FEATURES_tune-riscv32 = "riscv32"
> > > > TUNE_ARCH_tune-riscv32 = "riscv32"
> > > > TUNE_PKGARCH_tune-riscv32 = "riscv32"
> > > > PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
> > > > -
> > >
> > > its better to add riscv64sf and keep existing tunes as it is.
> > > since
> > > sf is going to be rare
> > > compared to rv64gc
> >
> > Ok, these are the tunes I have now:
> > riscv64 riscv64sf riscv32 riscv32hf
>
> what would riscv32hf be ?
RISC-V 32-bit hard float. It sets: -mabi=ilp32f
It currently isn't used, but it could be in the future.
Alistair
>
> > Alistair
> >
> > > > --
> > > > 2.23.0
> > > >
> > > > --
> > > > ___
> > > > Openembedded-core mailing list
> > > > Openembedded-core@lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
On Wed, 2019-11-06 at 12:54 -0800, Khem Raj wrote:
> On Wed, Nov 6, 2019 at 12:37 PM Alistair Francis
> wrote:
> > Signed-off-by: Alistair Francis
> > ---
> > meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
> > meta/conf/machine/include/riscv/tune-riscv.inc | 17
> > +++--
> > 2 files changed, 17 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> > b/meta/conf/machine/include/riscv/arch-riscv.inc
> > index f3edcc39f7..6737545e00 100644
> > --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> > +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> > @@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
> >
> > TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
> > TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
> > -TUNE_CCARGS .= ""
> > +TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES',
> > 'riscv64-f', ' -mabi=lp64d', ' -mabi=lp64', d)}"
> > +TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES',
> > 'riscv32-f', ' -mabi=ilp32f', ' -mabi=ilp32', d)}"
> >
> > # QEMU usermode fails with invalid instruction error (For riscv32)
> > MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "
> > ${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode',
> > '', d)}"
> > diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
> > b/meta/conf/machine/include/riscv/tune-riscv.inc
> > index 25d0463492..631653f2a2 100644
> > --- a/meta/conf/machine/include/riscv/tune-riscv.inc
> > +++ b/meta/conf/machine/include/riscv/tune-riscv.inc
> > @@ -1,12 +1,26 @@
> > require conf/machine/include/riscv/arch-riscv.inc
> >
> > TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
> > +TUNEVALID[riscv64-f] = "Enable 64-bit RISC-V optimizations with
> > hard float"
> > TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
> > +TUNEVALID[riscv32-f] = "Enable 32-bit RISC-V optimizations with
> > hard float"
> >
> > TUNEVALID[bigendian] = "Big endian mode"
> >
> > -AVAILTUNES += "riscv64 riscv32"
> > +AVAILTUNES += "riscv64 riscv64-f riscv32 riscv32-f"
> >
> > +# Hard float
> > +TUNE_FEATURES_tune-riscv64-f = "${TUNE_FEATURES_tune-riscv64}
> > riscv64-f"
> > +TUNE_ARCH_tune-riscv64-f = "riscv64"
> > +TUNE_PKGARCH_tune-riscv64-f = "riscv64"
> > +PACKAGE_EXTRA_ARCHS_tune-riscv64-f = "riscv64"
> > +
> > +TUNE_FEATURES_tune-riscv32-f = "${TUNE_FEATURES_tune-riscv32}
> > riscv32-f"
> > +TUNE_ARCH_tune-riscv32-f = "riscv32"
> > +TUNE_PKGARCH_tune-riscv32-f = "riscv32"
> > +PACKAGE_EXTRA_ARCHS_tune-riscv32-f = "riscv32"
> > +
> > +# Soft float
> > TUNE_FEATURES_tune-riscv64 = "riscv64"
> > TUNE_ARCH_tune-riscv64 = "riscv64"
> > TUNE_PKGARCH_tune-riscv64 = "riscv64"
> > @@ -16,4 +30,3 @@ TUNE_FEATURES_tune-riscv32 = "riscv32"
> > TUNE_ARCH_tune-riscv32 = "riscv32"
> > TUNE_PKGARCH_tune-riscv32 = "riscv32"
> > PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
> > -
>
> its better to add riscv64sf and keep existing tunes as it is. since
> sf is going to be rare
> compared to rv64gc
Ok, these are the tunes I have now:
riscv64 riscv64sf riscv32 riscv32hf
Alistair
>
> > --
> > 2.23.0
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] arch-riscv: Default to hard float for riscv64
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/arch-riscv.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index 6737545e00..8d72e6d79e 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -1,6 +1,6 @@
# RISCV Architecture definition
-DEFAULTTUNE ?= "riscv64"
+DEFAULTTUNE ?= "riscv64-f"
TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] tune-riscv: Add support for hard and soft float
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/arch-riscv.inc | 3 ++-
meta/conf/machine/include/riscv/tune-riscv.inc | 17 +++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index f3edcc39f7..6737545e00 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -4,7 +4,8 @@ DEFAULTTUNE ?= "riscv64"
TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
-TUNE_CCARGS .= ""
+TUNE_CCARGS_riscv64 .= "${@bb.utils.contains('TUNE_FEATURES', 'riscv64-f', '
-mabi=lp64d', ' -mabi=lp64', d)}"
+TUNE_CCARGS_riscv32 .= "${@bb.utils.contains('TUNE_FEATURES', 'riscv32-f', '
-mabi=ilp32f', ' -mabi=ilp32', d)}"
# QEMU usermode fails with invalid instruction error (For riscv32)
MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
"${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc
b/meta/conf/machine/include/riscv/tune-riscv.inc
index 25d0463492..631653f2a2 100644
--- a/meta/conf/machine/include/riscv/tune-riscv.inc
+++ b/meta/conf/machine/include/riscv/tune-riscv.inc
@@ -1,12 +1,26 @@
require conf/machine/include/riscv/arch-riscv.inc
TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
+TUNEVALID[riscv64-f] = "Enable 64-bit RISC-V optimizations with hard float"
TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
+TUNEVALID[riscv32-f] = "Enable 32-bit RISC-V optimizations with hard float"
TUNEVALID[bigendian] = "Big endian mode"
-AVAILTUNES += "riscv64 riscv32"
+AVAILTUNES += "riscv64 riscv64-f riscv32 riscv32-f"
+# Hard float
+TUNE_FEATURES_tune-riscv64-f = "${TUNE_FEATURES_tune-riscv64} riscv64-f"
+TUNE_ARCH_tune-riscv64-f = "riscv64"
+TUNE_PKGARCH_tune-riscv64-f = "riscv64"
+PACKAGE_EXTRA_ARCHS_tune-riscv64-f = "riscv64"
+
+TUNE_FEATURES_tune-riscv32-f = "${TUNE_FEATURES_tune-riscv32} riscv32-f"
+TUNE_ARCH_tune-riscv32-f = "riscv32"
+TUNE_PKGARCH_tune-riscv32-f = "riscv32"
+PACKAGE_EXTRA_ARCHS_tune-riscv32-f = "riscv32"
+
+# Soft float
TUNE_FEATURES_tune-riscv64 = "riscv64"
TUNE_ARCH_tune-riscv64 = "riscv64"
TUNE_PKGARCH_tune-riscv64 = "riscv64"
@@ -16,4 +30,3 @@ TUNE_FEATURES_tune-riscv32 = "riscv32"
TUNE_ARCH_tune-riscv32 = "riscv32"
TUNE_PKGARCH_tune-riscv32 = "riscv32"
PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
-
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] machine/arch-riscv: Fix newlib and baremetal builds
On Tue, Nov 5, 2019 at 2:42 PM Khem Raj wrote:
>
> On Tue, Nov 5, 2019 at 1:57 PM Alistair Francis
> wrote:
> >
> > Fix the following errors for newlib and baremetal libcs:
> > ld: unrecognized option '--hash-style=sysv'
> > ld: unrecognized option '--hash-style=gnu'
> >
> > Setting LINKER_HASH_STYLE to empty for just newlib and baremetal doesn't
> > work as GCC still ends up being built with --hash-style=gnu which causes
> > failures when using a built newlib SDK.
> >
> > Signed-off-by: Alistair Francis
> > ---
> > meta/conf/machine/include/riscv/arch-riscv.inc | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
> > b/meta/conf/machine/include/riscv/arch-riscv.inc
> > index 19f8f3e211..f3edcc39f7 100644
> > --- a/meta/conf/machine/include/riscv/arch-riscv.inc
> > +++ b/meta/conf/machine/include/riscv/arch-riscv.inc
> > @@ -8,3 +8,6 @@ TUNE_CCARGS .= ""
> >
> > # QEMU usermode fails with invalid instruction error (For riscv32)
> > MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
> > "${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
> > +
> > +# --hash-style is unsupported
> > +LINKER_HASH_STYLE = ""
>
> I think we still need to use newlib and baremetal overrides
That produces a SDK that doesn't work though.
Alistair
>
> > --
> > 2.23.0
> >
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] machine/arch-riscv: Fix newlib and baremetal builds
Fix the following errors for newlib and baremetal libcs:
ld: unrecognized option '--hash-style=sysv'
ld: unrecognized option '--hash-style=gnu'
Setting LINKER_HASH_STYLE to empty for just newlib and baremetal doesn't
work as GCC still ends up being built with --hash-style=gnu which causes
failures when using a built newlib SDK.
Signed-off-by: Alistair Francis
---
meta/conf/machine/include/riscv/arch-riscv.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc
b/meta/conf/machine/include/riscv/arch-riscv.inc
index 19f8f3e211..f3edcc39f7 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -8,3 +8,6 @@ TUNE_CCARGS .= ""
# QEMU usermode fails with invalid instruction error (For riscv32)
MACHINE_FEATURES_BACKFILL_CONSIDERED_append =
"${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"
+
+# --hash-style is unsupported
+LINKER_HASH_STYLE = ""
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
Acked-by: Otavio Salvador
---
v6:
- Rebase on master
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 57 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'En
Re: [OE-core] [PATCH v5 1/2] libsdl2: Fix build failure when using mesa 19.2.1
On Fri, Oct 25, 2019 at 11:51 PM Alistair Francis
wrote:
>
> Signed-off-by: Alistair Francis
Ping!
Alistair
> ---
> v5:
> - Backport upstream fix
>
> ...DL-fails-to-compile-with-Mesa-Master.patch | 41 +++
> .../libsdl2/libsdl2_2.0.10.bb | 1 +
> 2 files changed, 42 insertions(+)
> create mode 100644
> meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
>
> diff --git
> a/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
>
> b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
> new file mode 100644
> index 00..8f5b6a0cef
> --- /dev/null
> +++
> b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
> @@ -0,0 +1,41 @@
> +# HG changeset patch
> +# User Sylvain Becker
> +# Date 1570898876 -7200
> +# Sat Oct 12 18:47:56 2019 +0200
> +# Node ID 369b01006eb2f6fd563f7c315d29ae3fe503c432
> +# Parent 4cbaffd0083b8cd17070dbd9d4ab1ce0fa9fca2d
> +Fixed bug 4797 - SDL fails to compile with Mesa Master (thanks Michael
> Olbrich!)
> +
> +fix building with Mesa 19.2
> +
> +With Mesa 19.2 building fails with:
> +
> +/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr'
> +
> +The same type is defined in include/SDL_opengl.h for OpenGL and the two
> +headers should not be included at the same time.
> +This was just never noticed because the same header guard '__gl_h_' was
> +used. This was changed in Mesa. The result is this error.
> +
> +Fix this the same way GLES2 already handles this: Don't include the GLES
> +header when the OpenGL header was already included.
> +(https://hg.libsdl.org/SDL/rev/a60b3c292f0f)
> +
> +Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/369b01006eb2]
> +Signed-off-by: Alistair Francis
> +
> +diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
> +--- a/src/video/SDL_video.c
> b/src/video/SDL_video.c
> +@@ -37,9 +37,9 @@
> + #include "SDL_opengl.h"
> + #endif /* SDL_VIDEO_OPENGL */
> +
> +-#if SDL_VIDEO_OPENGL_ES
> ++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
> + #include "SDL_opengles.h"
> +-#endif /* SDL_VIDEO_OPENGL_ES */
> ++#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */
> +
> + /* GL and GLES2 headers conflict on Linux 32 bits */
> + #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
> index cdc8650e17..862abe1d54 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
> @@ -15,6 +15,7 @@ PROVIDES = "virtual/libsdl2"
> SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> file://more-gen-depends.patch \
>
> file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \
> +
> file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \
> "
>
> S = "${WORKDIR}/SDL2-${PV}"
> --
> 2.23.0
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 1/2] libsdl2: Fix build failure when using mesa 19.2.1
Signed-off-by: Alistair Francis
---
v5:
- Backport upstream fix
...DL-fails-to-compile-with-Mesa-Master.patch | 41 +++
.../libsdl2/libsdl2_2.0.10.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644
meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
diff --git
a/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
new file mode 100644
index 00..8f5b6a0cef
--- /dev/null
+++
b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User Sylvain Becker
+# Date 1570898876 -7200
+# Sat Oct 12 18:47:56 2019 +0200
+# Node ID 369b01006eb2f6fd563f7c315d29ae3fe503c432
+# Parent 4cbaffd0083b8cd17070dbd9d4ab1ce0fa9fca2d
+Fixed bug 4797 - SDL fails to compile with Mesa Master (thanks Michael
Olbrich!)
+
+fix building with Mesa 19.2
+
+With Mesa 19.2 building fails with:
+
+/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr'
+
+The same type is defined in include/SDL_opengl.h for OpenGL and the two
+headers should not be included at the same time.
+This was just never noticed because the same header guard '__gl_h_' was
+used. This was changed in Mesa. The result is this error.
+
+Fix this the same way GLES2 already handles this: Don't include the GLES
+header when the OpenGL header was already included.
+(https://hg.libsdl.org/SDL/rev/a60b3c292f0f)
+
+Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/369b01006eb2]
+Signed-off-by: Alistair Francis
+
+diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
+--- a/src/video/SDL_video.c
b/src/video/SDL_video.c
+@@ -37,9 +37,9 @@
+ #include "SDL_opengl.h"
+ #endif /* SDL_VIDEO_OPENGL */
+
+-#if SDL_VIDEO_OPENGL_ES
++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
+ #include "SDL_opengles.h"
+-#endif /* SDL_VIDEO_OPENGL_ES */
++#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */
+
+ /* GL and GLES2 headers conflict on Linux 32 bits */
+ #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index cdc8650e17..862abe1d54 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -15,6 +15,7 @@ PROVIDES = "virtual/libsdl2"
SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
file://more-gen-depends.patch \
file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \
+
file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \
"
S = "${WORKDIR}/SDL2-${PV}"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 2/2] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
Acked-by: Otavio Salvador
---
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 57 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX'
[OE-core] [PATCH v4 2/2] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
Acked-by: Otavio Salvador
---
v4:
- Add a patch (first patch in the series) to fix libsdl2 build
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 57 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX'
[OE-core] [PATCH v4 1/2] libsdl2: Fix build failure when using mesa 19.2.1
Signed-off-by: Alistair Francis
---
.../0002-Fixed-build-with-mesa-19.2.1.patch | 53 +++
.../libsdl2/libsdl2_2.0.10.bb | 1 +
2 files changed, 54 insertions(+)
create mode 100644
meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-build-with-mesa-19.2.1.patch
diff --git
a/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-build-with-mesa-19.2.1.patch
b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-build-with-mesa-19.2.1.patch
new file mode 100644
index 00..874ea401f8
--- /dev/null
+++
b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-build-with-mesa-19.2.1.patch
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User Alistair Francis
+# Date 1571948613 25200
+# Thu Oct 24 13:23:33 2019 -0700
+# Node ID 14a94f6e9e77a5c323741aebade5e484a22236cf
+# Parent f530cdaaab6261e9942a3ec254273533ed0df08c
+Fixed build with mesa 19.2.1
+
+Fix the following two build failures when building for x86 with mesa 19.2.1
+
+In file included from /include/SDL_opengles.h:33,
+ from /src/video/SDL_video.c:41:
+/usr/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr'
+ 63 | typedef khronos_ssize_t GLsizeiptr;
+ | ^~
+In file included from /include/SDL_opengl.h:2105,
+from /src/video/SDL_video.c:37:
+/include/SDL_opengl_glext.h:472:19: note: previous declaration of 'GLsizeiptr'
was here
+ 472 | typedef ptrdiff_t GLsizeiptr;
+ | ^~
+
+
+In file included from /include/SDL_opengles.h:33,
+from /src/video/SDL_video.c:41:
+/usr/include/GLES/gl.h:64:26: error: conflicting types for 'GLintptr'
+ 64 | typedef khronos_intptr_t GLintptr;
+ | ^~~~
+In file included from /include/SDL_opengl.h:2105,
+from /src/video/SDL_video.c:37:
+/include/SDL_opengl_glext.h:473:19: note: previous declaration of 'GLintptr'
was here
+ 473 | typedef ptrdiff_t GLintptr;
+ | ^~~~
+
+Upstream-Status: Submitted [https://bugzilla.libsdl.org/show_bug.cgi?id=4846]
+Signed-off-by: Alistair Francis
+
+diff -r f530cdaaab62 -r 14a94f6e9e77 include/SDL_opengl_glext.h
+--- a/include/SDL_opengl_glext.h Thu Oct 24 18:07:30 2019 +0200
b/include/SDL_opengl_glext.h Thu Oct 24 13:23:33 2019 -0700
+@@ -468,13 +468,8 @@
+ #ifndef GL_VERSION_1_5
+ #define GL_VERSION_1_5 1
+ #include
+-#ifdef __MACOSX__
+ typedef long GLsizeiptr;
+ typedef long GLintptr;
+-#else
+-typedef ptrdiff_t GLsizeiptr;
+-typedef ptrdiff_t GLintptr;
+-#endif
+ #define GL_BUFFER_SIZE0x8764
+ #define GL_BUFFER_USAGE 0x8765
+ #define GL_QUERY_COUNTER_BITS 0x8864
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index cdc8650e17..e25f29acb0 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -15,6 +15,7 @@ PROVIDES = "virtual/libsdl2"
SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
file://more-gen-depends.patch \
file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \
+ file://0002-Fixed-build-with-mesa-19.2.1.patch \
"
S = "${WORKDIR}/SDL2-${PV}"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
---
v3:
- Fix missing Upstream-Status
v2:
- Add back "make TLS ELF optional" patch
...02-meson.build-make-TLS-ELF-optional.patch | 48 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 57 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..c3b5e14cd6
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,48 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX',
-+)
-+
- option(
- 'I-love-half-baked-turnips',
- type : 'boolean',
diff --git a/meta/recipe
Re: [OE-core] [PATCH] mesa: Upgrade to 19.2.1
On Wed, Oct 23, 2019 at 12:46 AM Richard Purdie wrote: > > On Tue, 2019-10-22 at 15:07 -0700, Alistair Francis wrote: > > On Sat, Oct 12, 2019 at 9:54 AM Alistair Francis < > > alist...@alistair23.me> wrote: > > > Upgrade mesa and mesa-gl to 19.2.1. > > > > > > The license hash change was a trivial new line removal. > > > > > > The glx-tls option was removed as it isn't included in the > > > meson.build > > > file. > > > > > > The -Dasm=false was removed as it also is no longer included. > > > > > > Signed-off-by: Alistair Francis > > > > Ping! > > It caused multiple failures on the autobuilder: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1160 > (musl-qemux86) > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1162 > (musl-qemux86-64) > https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1141 > (libsdl2 compile fail) > https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/40 > (libsdl2 compile fail) I wasn't about to reproduce these, but I'm guessing the musl failures are from the glx-tls patch being dropped, so I have added the new elf-tls back, hopefully that fixes it. Alistair > > Cheers, > > Richard > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] mesa: Upgrade to 19.2.1
From: Alistair Francis
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file. It has been replaced with 'use-elf-tls' instead.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
Signed-off-by: Alistair Francis
---
...02-meson.build-make-TLS-ELF-optional.patch | 47 +
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 15 +++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 6 +--
5 files changed, 56 insertions(+), 64 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (77%)
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
new file mode 100644
index 00..2d726227c5
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,47 @@
+From edd03b8ea66ccf81b0c1d27868756d06e2d177ab Mon Sep 17 00:00:00 2001
+From: Alistair Francis
+Date: Wed, 23 Oct 2019 09:46:28 -0700
+Subject: [PATCH] meson.build: make TLS ELF optional
+
+USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
+TLS GLX optional again" patch updated to the latest mesa.
+
+Signed-off-by: Alistair Francis
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7992734..06653fe 100644
+--- a/meson.build
b/meson.build
+@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
+ endif
+
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++if (not with_platform_android or get_option('platform-sdk-version') >= 29)
and get_option('elf-tls')
+ pre_args += '-DUSE_ELF_TLS'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 188e132..ddd47b7 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -339,6 +339,12 @@ option(
+ value : true,
+ description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++ 'elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Enable TLS support in ELF',
++)
+ option(
+ 'I-love-half-baked-turnips',
+ type : 'boolean',
+--
+2.23.0
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX',
-+)
-+
- option(
- 'I-love-half-baked-turnips',
- type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
b/meta/recipes-graphics/mesa/mesa-gl_19.2.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/m
Re: [OE-core] [PATCH] mesa: Upgrade to 19.2.1
On Sat, Oct 12, 2019 at 9:54 AM Alistair Francis wrote:
>
> Upgrade mesa and mesa-gl to 19.2.1.
>
> The license hash change was a trivial new line removal.
>
> The glx-tls option was removed as it isn't included in the meson.build
> file.
>
> The -Dasm=false was removed as it also is no longer included.
>
> Signed-off-by: Alistair Francis
Ping!
Alistair
> ---
> ...llow-enable-DRI-without-DRI-drivers.patch} | 0
> ...on.build-make-TLS-GLX-optional-again.patch | 52 ---
> .../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 13 ++---
> .../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 7 ++-
> 5 files changed, 7 insertions(+), 65 deletions(-)
> rename
> meta/recipes-graphics/mesa/files/{0003-Allow-enable-DRI-without-DRI-drivers.patch
> => 0002-Allow-enable-DRI-without-DRI-drivers.patch} (100%)
> delete mode 100644
> meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
> rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
> (100%)
> rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (71%)
>
> diff --git
> a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
>
> b/meta/recipes-graphics/mesa/files/0002-Allow-enable-DRI-without-DRI-drivers.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
> rename to
> meta/recipes-graphics/mesa/files/0002-Allow-enable-DRI-without-DRI-drivers.patch
> diff --git
> a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
>
> b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
> deleted file mode 100644
> index 641bacf1d9..00
> ---
> a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
> -From: Fabio Berton
> -Date: Wed, 12 Jun 2019 14:15:57 -0300
> -Subject: [PATCH] meson.build: make TLS GLX optional again
> -Organization: O.S. Systems Software LTDA.
> -
> -This was optional with autotools, and needs to be disabled
> -when using musl C library, for instance.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Alexander Kanavin
> -Signed-off-by: Fabio Berton
> -Signed-off-by: Otavio Salvador
>
> - meson.build | 4 +++-
> - meson_options.txt | 7 +++
> - 2 files changed, 10 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index b33b430aed4..0e50bb26c0a 100644
> a/meson.build
> -+++ b/meson.build
> -@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
> with_platform_surfaceless or with_plat
> - endif
> - endif
> -
> --pre_args += '-DGLX_USE_TLS'
> -+if get_option('glx-tls')
> -+ pre_args += '-DGLX_USE_TLS'
> -+endif
> - if with_glx != 'disabled'
> - if not (with_platform_x11 and with_any_opengl)
> - error('Cannot build GLX support without X11 platform support and at
> least one OpenGL API')
> -diff --git a/meson_options.txt b/meson_options.txt
> -index 1f72faabee8..fcd49efea27 100644
> a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -339,6 +339,13 @@ option(
> - value : true,
> - description : 'Enable direct rendering in GLX and EGL for DRI',
> - )
> -+option(
> -+ 'glx-tls',
> -+ type : 'boolean',
> -+ value : true,
> -+ description : 'Enable TLS support in GLX',
> -+)
> -+
> - option(
> - 'I-love-half-baked-turnips',
> - type : 'boolean',
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
> b/meta/recipes-graphics/mesa/mesa-gl_19.2.1.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
> rename to meta/recipes-graphics/mesa/mesa-gl_19.2.1.bb
> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> index 9e5808ee27..dbf3f2ca67 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org;
> BUGTRACKER = "https://bugs.freedesktop.org;
> SECTION = "x11"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM =
> "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"
> +LIC_FILES_CHKSUM =
> "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e"
>
> PE = "2"
>
> @@ -57,12 +57,11 @@ PACKAGECONFIG_class-target ??=
> "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v
> ${@bb.utils.contains('DI
Re: [OE-core] [PATCH] mesa: Upgrade to 19.2.1
On Wed, Oct 16, 2019 at 11:21 AM Otavio Salvador wrote: > > On Sat, Oct 12, 2019 at 2:01 PM Alistair Francis > wrote: > > The glx-tls option was removed as it isn't included in the meson.build > > file. > > Why drop it? Update the patch, please. It doesn't exist any more. It has been removed from mesa. It does look like it has been somewhat replaced with USE_ELF_TLS though. So if musl builds break I can re-add USE_ELF_TLS. I'll see if musl works with it enabled. Alistair > > > > -- > Otavio Salvador O.S. Systems > http://www.ossystems.com.brhttp://code.ossystems.com.br > Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] u-boot: Bump from 2019.07 to 2019.10
On Sun, Oct 13, 2019 at 2:06 AM Richard Purdie
wrote:
>
> On Tue, 2019-10-08 at 14:45 -0700, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis
> > ---
> > .../u-boot/files/0001-CVE-2019-13103.patch| 69 ---
> >
> > .../u-boot/files/0002-CVE-2019-13104.patch| 49 -
> > .../u-boot/files/0003-CVE-2019-13105.patch| 37 --
> > .../u-boot/files/0004-CVE-2019-13106.patch| 56 ---
> > .../0005-CVE-2019-14192-14193-14199.patch | 43
> > ...-14197-14200-14201-14202-14203-14204.patch | 44
> > .../files/0007-CVE-2019-14194-14198.patch | 42 ---
> > .../u-boot/files/0008-CVE-2019-14195.patch| 42 ---
> > .../u-boot/files/0009-CVE-2019-14196.patch| 48 -
> > meta/recipes-bsp/u-boot/u-boot-common.inc | 13 +---
> > ..._2019.07.bb => u-boot-fw-utils_2019.10.bb} | 0
> > ...ols_2019.07.bb => u-boot-tools_2019.10.bb} | 0
> > .../{u-boot_2019.07.bb => u-boot_2019.10.bb} | 0
>
> I suspect this breaks on musl:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1135
> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1137
Fixed in v2.
Alistair
>
> Cheers,
>
> Richard
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] opensbi: Bump from 0.4 to 0.5
Signed-off-by: Alistair Francis
---
meta/recipes-bsp/opensbi/{opensbi_0.4.bb => opensbi_0.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-bsp/opensbi/{opensbi_0.4.bb => opensbi_0.5.bb} (97%)
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.4.bb
b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
similarity index 97%
rename from meta/recipes-bsp/opensbi/opensbi_0.4.bb
rename to meta/recipes-bsp/opensbi/opensbi_0.5.bb
index b030436688..759bbbfdaa 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.4.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
@@ -8,7 +8,7 @@ require opensbi-payloads.inc
inherit autotools-brokensep deploy
-SRCREV = "ce228ee0919deb9957192d723eecc8aaae2697c6"
+SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09"
SRC_URI = "git://github.com/riscv/opensbi.git \
file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qemuriscv64: Build smode U-Boot
Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index 99b48b309b..b45fdd556d 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -5,5 +5,5 @@ require conf/machine/include/riscv/qemuriscv.inc EXTRA_IMAGEDEPENDS += "u-boot" -UBOOT_MACHINE = "qemu-riscv64_defconfig" +UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- 2.23.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] u-boot: Bump from 2019.07 to 2019.10
Signed-off-by: Alistair Francis
---
v2:
- Fix musl build failure for u-boot-fw-utils
.../u-boot/files/0001-CVE-2019-13103.patch| 69 ---
...nclude-env.h-Ensure-ulong-is-defined.patch | 31 +
.../u-boot/files/0002-CVE-2019-13104.patch| 49 -
.../u-boot/files/0003-CVE-2019-13105.patch| 37 --
.../u-boot/files/0004-CVE-2019-13106.patch| 56 ---
.../0005-CVE-2019-14192-14193-14199.patch | 43
...-14197-14200-14201-14202-14203-14204.patch | 44
.../files/0007-CVE-2019-14194-14198.patch | 42 ---
.../u-boot/files/0008-CVE-2019-14195.patch| 42 ---
.../u-boot/files/0009-CVE-2019-14196.patch| 48 -
meta/recipes-bsp/u-boot/u-boot-common.inc | 13 +---
..._2019.07.bb => u-boot-fw-utils_2019.10.bb} | 2 +
...ols_2019.07.bb => u-boot-tools_2019.10.bb} | 0
.../{u-boot_2019.07.bb => u-boot_2019.10.bb} | 0
14 files changed, 35 insertions(+), 441 deletions(-)
delete mode 100644 meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
create mode 100644
meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0002-CVE-2019-13104.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0003-CVE-2019-13105.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0004-CVE-2019-13106.patch
delete mode 100644
meta/recipes-bsp/u-boot/files/0005-CVE-2019-14192-14193-14199.patch
delete mode 100644
meta/recipes-bsp/u-boot/files/0006-CVE-2019-14197-14200-14201-14202-14203-14204.patch
delete mode 100644
meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0008-CVE-2019-14195.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2019.07.bb =>
u-boot-fw-utils_2019.10.bb} (93%)
rename meta/recipes-bsp/u-boot/{u-boot-tools_2019.07.bb =>
u-boot-tools_2019.10.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2019.07.bb => u-boot_2019.10.bb} (100%)
diff --git a/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
b/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
deleted file mode 100644
index 1a5d1eb996..00
--- a/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 39a759494f734c4cdc3e2b919671bfb3134b41ae Mon Sep 17 00:00:00 2001
-From: Paul Emge
-Date: Mon, 8 Jul 2019 16:37:03 -0700
-Subject: [PATCH 1/9] CVE-2019-13103: disk: stop infinite recursion in DOS
- Partitions
-
-part_get_info_extended and print_partition_extended can recurse infinitely
-while parsing a self-referential filesystem or one with a silly number of
-extended partitions. This patch adds a limit to the number of recursive
-partitions.
-
-Signed-off-by: Paul Emge
-
-Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit;
- h=232e2f4fd9a24bf08215ddc8c53ccadffc841fb5]
-
-CVE: CVE-2019-13103
-
-Signed-off-by: Meng Li
- disk/part_dos.c | 18 ++
- 1 file changed, 18 insertions(+)
-
-diff --git a/disk/part_dos.c b/disk/part_dos.c
-index 936cee0d36..aae9d95906 100644
a/disk/part_dos.c
-+++ b/disk/part_dos.c
-@@ -23,6 +23,10 @@
-
- #define DOS_PART_DEFAULT_SECTOR 512
-
-+/* should this be configurable? It looks like it's not very common at all
-+ * to use large numbers of partitions */
-+#define MAX_EXT_PARTS 256
-+
- /* Convert char[4] in little endian format to the host format integer
- */
- static inline unsigned int le32_to_int(unsigned char *le32)
-@@ -126,6 +130,13 @@ static void print_partition_extended(struct blk_desc
*dev_desc,
- dos_partition_t *pt;
- int i;
-
-+ /* set a maximum recursion level */
-+ if (part_num > MAX_EXT_PARTS)
-+ {
-+ printf("** Nested DOS partitions detected, stopping **\n");
-+ return;
-+}
-+
- if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
- printf ("** Can't read partition table on %d:" LBAFU " **\n",
- dev_desc->devnum, ext_part_sector);
-@@ -191,6 +202,13 @@ static int part_get_info_extended(struct blk_desc
*dev_desc,
- int i;
- int dos_type;
-
-+ /* set a maximum recursion level */
-+ if (part_num > MAX_EXT_PARTS)
-+ {
-+ printf("** Nested DOS partitions detected, stopping **\n");
-+ return -1;
-+}
-+
- if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
- printf ("** Can't read partition table on %d:" LBAFU " **\n",
- dev_desc->devnum, ext_part_sector);
---
-2.17.1
-
diff --git
a/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is-defined.patch
b/meta/recipes-bsp/u-boot/files/0001-include-env.h-Ensure-ulong-is
[OE-core] [PATCH] mesa: Upgrade to 19.2.1
Upgrade mesa and mesa-gl to 19.2.1.
The license hash change was a trivial new line removal.
The glx-tls option was removed as it isn't included in the meson.build
file.
The -Dasm=false was removed as it also is no longer included.
Signed-off-by: Alistair Francis
---
...llow-enable-DRI-without-DRI-drivers.patch} | 0
...on.build-make-TLS-GLX-optional-again.patch | 52 ---
.../{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 13 ++---
.../mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} | 7 ++-
5 files changed, 7 insertions(+), 65 deletions(-)
rename
meta/recipes-graphics/mesa/files/{0003-Allow-enable-DRI-without-DRI-drivers.patch
=> 0002-Allow-enable-DRI-without-DRI-drivers.patch} (100%)
delete mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
rename meta/recipes-graphics/mesa/{mesa-gl_19.1.6.bb => mesa-gl_19.2.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.1.6.bb => mesa_19.2.1.bb} (71%)
diff --git
a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
b/meta/recipes-graphics/mesa/files/0002-Allow-enable-DRI-without-DRI-drivers.patch
similarity index 100%
rename from
meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
rename to
meta/recipes-graphics/mesa/files/0002-Allow-enable-DRI-without-DRI-drivers.patch
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..00
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
-From: Fabio Berton
-Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH] meson.build: make TLS GLX optional again
-Organization: O.S. Systems Software LTDA.
-
-This was optional with autotools, and needs to be disabled
-when using musl C library, for instance.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
- meson.build | 4 +++-
- meson_options.txt | 7 +++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b33b430aed4..0e50bb26c0a 100644
a/meson.build
-+++ b/meson.build
-@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless or with_plat
- endif
- endif
-
--pre_args += '-DGLX_USE_TLS'
-+if get_option('glx-tls')
-+ pre_args += '-DGLX_USE_TLS'
-+endif
- if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
-diff --git a/meson_options.txt b/meson_options.txt
-index 1f72faabee8..fcd49efea27 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -339,6 +339,13 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'glx-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Enable TLS support in GLX',
-+)
-+
- option(
- 'I-love-half-baked-turnips',
- type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
b/meta/recipes-graphics/mesa/mesa-gl_19.2.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
rename to meta/recipes-graphics/mesa/mesa-gl_19.2.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 9e5808ee27..dbf3f2ca67 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org;
BUGTRACKER = "https://bugs.freedesktop.org;
SECTION = "x11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"
+LIC_FILES_CHKSUM =
"file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e"
PE = "2"
@@ -57,12 +57,11 @@ PACKAGECONFIG_class-target ??=
"${@bb.utils.filter('DISTRO_FEATURES', 'wayland v
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl
egl gles gbm dri gallium', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11
dri3', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan',
'dri3', '', d)} \
- glx-tls \
"
-PACKAGECONFIG_class-native ?= "gbm dri egl opengl glx-tls"
-PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl glx-tls"
+PACKAGECONFIG_class-native ?= "gbm dri egl opengl"
+PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl"
-PACKAGECONFIG_remove_libc-musl = "glx-tls"
+PACKAGECONFIG_remove_libc-musl = "&
