[OE-core] [meta-oe] [PATCH 1/2] tk_8.6.9: Add tkConfig.sh in crossscript
Signed-off-by: Hoang Anh Tuan --- meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb | 25 + 1 file changed, 25 insertions(+) diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb index 9eec4bb..459ae82 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb @@ -50,6 +50,11 @@ do_install_append() { ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 oe_libinstall -so libtk${VER} ${D}${libdir} ln -sf wish${VER} ${D}${bindir}/wish + + sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh + sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh + install -d ${D}${bindir_crossscripts} + install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} } PACKAGECONFIG ??= "xft" @@ -69,3 +74,23 @@ BBCLASSEXTEND = "native nativesdk" # Fix the path in sstate SSTATE_SCAN_FILES += "*Config.sh" + +inherit binconfig + +SYSROOT_DIRS += "${bindir_crossscripts}" + +# Fix some paths that might be used by Tcl extensions +BINCONFIG_GLOB = "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tkConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh +} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe] [PATCH 2/2] gtkwave: add version 3.3.98
Signed-off-by: Hoang Anh Tuan --- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb new file mode 100644 index 000..6fd9392 --- /dev/null +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb @@ -0,0 +1,19 @@ +SUMMARY = "VCD (Value Change Dump) file waveform viewer" +DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) " +HOMEPAGE = "http://gtkwave.sourceforge.net/"; + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +SRC_URI = "http://gtkwave.sourceforge.net/${PN}-${PV}.tar.gz"; + +SRC_URI[md5sum] = "eac3073ef381e0c09da33590296ca37f" +SRC_URI[sha256sum] = "efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6" + +inherit pkgconfig autotools gettext texinfo +DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" +RDEPENDS_${PN} = "tk-lib" + +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" + +FILES_${PN} = "${bindir} ${datadir}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][thud] mdadm: add init and service scripts
Add init script and service file for sysvinit and systemd. Signed-off-by: Zheng Ruoqin Signed-off-by: Hong Liu --- meta/recipes-extended/mdadm/files/mdadm.init | 72 ++ .../recipes-extended/mdadm/files/mdmonitor.service | 19 ++ meta/recipes-extended/mdadm/mdadm_4.0.bb | 17 - 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service diff --git a/meta/recipes-extended/mdadm/files/mdadm.init b/meta/recipes-extended/mdadm/files/mdadm.init new file mode 100644 index 000..cab91b9 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm.init @@ -0,0 +1,72 @@ +#!/bin/sh +# +# Start the MD monitor daemon for all active MD arrays if desired. +# +### BEGIN INIT INFO +# Provides: mdadm +# Required-Start:$local_fs $syslog mdadm-raid +# Required-Stop: $local_fs $syslog mdadm-raid +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: MD monitoring daemon +# Description: mdadm provides a monitor mode, in which it will scan for +#problems with the MD devices. If a problem is found, the +#administrator is alerted via email, or a custom script is +#run. +### END INIT INFO +# + +MDADM=/sbin/mdadm +RUNDIR=/var/run/mdadm +PIDFILE=$RUNDIR/monitor.pid +DEBIANCONFIG=/etc/default/mdadm + +test -x "$MDADM" || exit 0 + +test -f /proc/mdstat || exit 0 + +START_DAEMON=true +test -f $DEBIANCONFIG && . $DEBIANCONFIG + +. /lib/lsb/init-functions + +# Include functions +. /etc/init.d/functions + +case "${1:-}" in + start) +if is_true $START_DAEMON; then + log_daemon_msg "Starting MD monitoring service" "mdadm --monitor" + mkdir -p $RUNDIR + start-stop-daemon -S -p $PIDFILE -x $MDADM -- \ +--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-} + RETVAL=$? + log_end_msg $RETVAL + exit $RETVAL +fi +;; + stop) +if [ -f $PIDFILE ] ; then + log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor" + start-stop-daemon -K -p $PIDFILE -x $MDADM + RETVAL=$? + rm -f $PIDFILE + log_end_msg $RETVAL + exit $RETVAL +fi +;; + status) +status -p $PIDFILE "$MDADM" && exit 0 || exit $? +;; + restart|reload|force-reload) +${0:-} stop +${0:-} start +;; + *) +echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2 +exit 1 +;; +esac + +exit 0 + diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service b/meta/recipes-extended/mdadm/files/mdmonitor.service new file mode 100644 index 000..bd243b4 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdmonitor.service @@ -0,0 +1,19 @@ +# This file is part of mdadm. +# +# mdadm is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Software RAID monitoring and management +ConditionPathExists=/etc/mdadm.conf + +[Service] +Type=forking +PIDFile=/var/run/mdadm/mdadm.pid +EnvironmentFile=-/etc/sysconfig/mdmonitor +ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/var/run/mdadm/mdadm.pid + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb index 2c4d88a..8155ae4 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.0.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb @@ -24,12 +24,14 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ file://0001-use-memmove-instead-of-memcpy-on-overlapping-region.patch \ file://0001-Disable-gcc8-warnings.patch \ + file://mdadm.init \ + file://mdmonitor.service \ " SRC_URI[md5sum] = "2cb4feffea9167ba71b5f346a0c0a40d" SRC_URI[sha256sum] = "1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9" CFLAGS += "-fno-strict-aliasing" -inherit autotools-brokensep +inherit autotools-brokensep systemd EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"' # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's asm/types.h @@ -51,7 +53,17 @@ do_install() { autotools_do_install } -inherit ptest +do_install_append() { +install -d ${D}/${sysconfdir}/ +install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf +install -d ${D}/${systemd_unitdir}/system +install -m 644 ${S}/systemd/mdmonitor.service ${D}/${systemd_unitdir}/system +install -d ${D}/${sysconfdir}/init.d +install -m 755 ${WORKDIR}/mdadm.init${D}${sysconfdir}/init.d/mdmonitor +} + +SYSTEMD_SERVICE_${PN} = "mdmonitor.service" +SYSTEMD_AUTO
[OE-core] [PATCH v2] mdadm: add init and service scripts
Add init script and service file for sysvinit and systemd. Signed-off-by: Zheng Ruoqin Signed-off-by: Hong Liu --- meta/recipes-extended/mdadm/files/mdadm.init | 72 ++ .../recipes-extended/mdadm/files/mdmonitor.service | 19 ++ meta/recipes-extended/mdadm/mdadm_4.1.bb | 16 - 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service diff --git a/meta/recipes-extended/mdadm/files/mdadm.init b/meta/recipes-extended/mdadm/files/mdadm.init new file mode 100644 index 000..cab91b9 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm.init @@ -0,0 +1,72 @@ +#!/bin/sh +# +# Start the MD monitor daemon for all active MD arrays if desired. +# +### BEGIN INIT INFO +# Provides: mdadm +# Required-Start:$local_fs $syslog mdadm-raid +# Required-Stop: $local_fs $syslog mdadm-raid +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: MD monitoring daemon +# Description: mdadm provides a monitor mode, in which it will scan for +#problems with the MD devices. If a problem is found, the +#administrator is alerted via email, or a custom script is +#run. +### END INIT INFO +# + +MDADM=/sbin/mdadm +RUNDIR=/var/run/mdadm +PIDFILE=$RUNDIR/monitor.pid +DEBIANCONFIG=/etc/default/mdadm + +test -x "$MDADM" || exit 0 + +test -f /proc/mdstat || exit 0 + +START_DAEMON=true +test -f $DEBIANCONFIG && . $DEBIANCONFIG + +. /lib/lsb/init-functions + +# Include functions +. /etc/init.d/functions + +case "${1:-}" in + start) +if is_true $START_DAEMON; then + log_daemon_msg "Starting MD monitoring service" "mdadm --monitor" + mkdir -p $RUNDIR + start-stop-daemon -S -p $PIDFILE -x $MDADM -- \ +--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-} + RETVAL=$? + log_end_msg $RETVAL + exit $RETVAL +fi +;; + stop) +if [ -f $PIDFILE ] ; then + log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor" + start-stop-daemon -K -p $PIDFILE -x $MDADM + RETVAL=$? + rm -f $PIDFILE + log_end_msg $RETVAL + exit $RETVAL +fi +;; + status) +status -p $PIDFILE "$MDADM" && exit 0 || exit $? +;; + restart|reload|force-reload) +${0:-} stop +${0:-} start +;; + *) +echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2 +exit 1 +;; +esac + +exit 0 + diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service b/meta/recipes-extended/mdadm/files/mdmonitor.service new file mode 100644 index 000..bd243b4 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdmonitor.service @@ -0,0 +1,19 @@ +# This file is part of mdadm. +# +# mdadm is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Software RAID monitoring and management +ConditionPathExists=/etc/mdadm.conf + +[Service] +Type=forking +PIDFile=/var/run/mdadm/mdadm.pid +EnvironmentFile=-/etc/sysconfig/mdmonitor +ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/var/run/mdadm/mdadm.pid + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb index 7663a6b..2d7ade6 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -17,11 +17,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \ file://0001-fix-gcc-8-format-truncation-warning.patch \ + file://mdadm.init \ + file://mdmonitor.service \ " SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" -inherit autotools-brokensep ptest +inherit autotools-brokensep ptest systemd + +SYSTEMD_SERVICE_${PN} = "mdmonitor.service" +SYSTEMD_AUTO_ENABLE = "disable" CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member" @@ -46,6 +51,15 @@ do_install() { autotools_do_install } +do_install_append() { +install -d ${D}/${sysconfdir}/ +install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf +install -d ${D}/${systemd_unitdir}/system +install -m 644 ${WORKDIR}/mdmonitor.service ${D}/${systemd_unitdir}/system +install -d ${D}/${sysconfdir}/init.d +install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor +} + do_compile_ptest() { oe_runmake test } -- 2.7.4
[OE-core] [PATCH v2 1/2] devicetree.bbclass: Add virtual provider for dtb
Add virtual provider for dtb. This class can be used to generate dtb from static devicetree, for reference see meta-xilinx layer meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb By providing a virtual provider we can use it to differentiate between in-kernel dtb or an external one. This can be set in local.conf as PREFERRED_PROVIDER_virtual/dtb = "devicetree" Signed-off-by: Manjukumar Matha --- Changelog v2: Update commit message to indicate PREFERRED_PROVIDER_virtual/dtb = "devicetree" to set external devicetree recipe meta/classes/devicetree.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index 8fe5a5e..e1f3779 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -27,6 +27,8 @@ inherit deploy kernel-arch COMPATIBLE_MACHINE ?= "^$" +PROVIDES = "virtual/dtb" + PACKAGE_ARCH = "${MACHINE_ARCH}" SYSROOT_DIRS += "/boot/devicetree" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH v3] mesa: Convert recipe to use meson build system
still seeing errors when building for rpi3-64 | checking for xrandr... no | configure: error: Package requirements (xrandr) were not met: | | No package 'xrandr' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. On Wed, Feb 20, 2019 at 4:41 PM Mittal, Anuj wrote: > > On Wed, 2019-02-20 at 18:10 -0300, Fabio Berton wrote: > > +PACKAGECONFIG[xvmc] = "-gallium-xvmc=true,-Dgallium- > > xvmc=false,libxvmc" > > This is missing a '-D' ... Was a problem with my original patch as > well. > -- > ___ > 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 0/2 v7] test-case-mgmt
Hi RP, Noted, thank you once again for your great help and inputs! Really glad to hear that resulttool was ready! We shall plan forward for future improvement in html reports and graphs. Also we shall look into future test case development if needed. Cheers, Yeoh Ee Peng -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Thursday, February 21, 2019 5:44 AM To: Yeoh, Ee Peng ; openembedded-core@lists.openembedded.org Cc: Burton, Ross ; Eggleton, Paul Subject: Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt Hi Ee Peng, On Wed, 2019-02-20 at 06:27 +, Yeoh, Ee Peng wrote: > Thank you very much for all your help and inputs! > Would you like us to take all the improvements from your branch to > merge or squash with the base patchset and move forward with the one > remaining improvement below? I've done some further work on this today and the good news is I was able to sort out the git repo handling pieces and fix the test cases. With two of the test cases I ended up removing them as I've changed the functionality enough that they'd need to be rewritten. I've sent out a patch on top of your original work as well as a second patch to move some functionality into library functions to allow us to use it from the new code. I think this combination of patches should now be ready to merge. There will be fixes and improvements on top of this, e.g. I'd love to get some html reports and graphs but those are things that come later. The next step once this is merged is to start storing autobuilder test result data, generating reports and regression reports automatically from each test run. Its great to see this all coming together! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi RP, Noted, thank you once again for your help and inputs! Really glad to hear that resulttool was ready! We shall plan forward for future improvement in html reports and graphs. Also we shall look into future test case development if needed. Cheers, Yeoh Ee Peng -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Thursday, February 21, 2019 5:44 AM To: Yeoh, Ee Peng ; openembedded-core@lists.openembedded.org Cc: Burton, Ross ; Eggleton, Paul Subject: Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt Hi Ee Peng, On Wed, 2019-02-20 at 06:27 +, Yeoh, Ee Peng wrote: > Thank you very much for all your help and inputs! > Would you like us to take all the improvements from your branch to > merge or squash with the base patchset and move forward with the one > remaining improvement below? I've done some further work on this today and the good news is I was able to sort out the git repo handling pieces and fix the test cases. With two of the test cases I ended up removing them as I've changed the functionality enough that they'd need to be rewritten. I've sent out a patch on top of your original work as well as a second patch to move some functionality into library functions to allow us to use it from the new code. I think this combination of patches should now be ready to merge. There will be fixes and improvements on top of this, e.g. I'd love to get some html reports and graphs but those are things that come later. The next step once this is merged is to start storing autobuilder test result data, generating reports and regression reports automatically from each test run. Its great to see this all coming together! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH v3] mesa: Convert recipe to use meson build system
On Wed, 2019-02-20 at 18:10 -0300, Fabio Berton wrote: > +PACKAGECONFIG[xvmc] = "-gallium-xvmc=true,-Dgallium- > xvmc=false,libxvmc" This is missing a '-D' ... Was a problem with my original patch as well. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] kernel-fitimage.bbclass: Introduce a way to provide external dtb
On Tue, 2019-02-19 at 19:34 +, Manjukumar Harthikote Matha wrote: > Hi Philip, > > > -Original Message- > > From: Philip Balister [mailto:phi...@balister.org] > > Sent: Sunday, February 17, 2019 3:47 PM > > To: Manjukumar Harthikote Matha > > Cc: openembedded-core > > Subject: Re: [OE-core][PATCH 2/2] kernel-fitimage.bbclass: > > Introduce a way to > > provide external dtb > > > > With these patches, I made a fitImage that booted on the mini-zed. > > It would be nice > > to include a note on how to enable this. I took at few stabs at it > > and ended up with > > Thanks for testing it out on mini-zed > > > PREFERRED_PROVIDER_virtual/dtb = "devicetree" > > > > Yes, I should have added this in the commit message. I will update it > and re-send V2 What may also help a lot here would be some tests. This is currently a blackhole in the tests :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi Ee Peng, On Wed, 2019-02-20 at 06:27 +, Yeoh, Ee Peng wrote: > Thank you very much for all your help and inputs! > Would you like us to take all the improvements from your branch to > merge or squash with the base patchset and move forward with the one > remaining improvement below? I've done some further work on this today and the good news is I was able to sort out the git repo handling pieces and fix the test cases. With two of the test cases I ended up removing them as I've changed the functionality enough that they'd need to be rewritten. I've sent out a patch on top of your original work as well as a second patch to move some functionality into library functions to allow us to use it from the new code. I think this combination of patches should now be ready to merge. There will be fixes and improvements on top of this, e.g. I'd love to get some html reports and graphs but those are things that come later. The next step once this is merged is to start storing autobuilder test result data, generating reports and regression reports automatically from each test run. Its great to see this all coming together! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] resulttool: Improvements to allow integration to the autobuilder
This is a combined patch of the various tweaks and improvements I made to resulttool: * Avoid subprocess.run() as its a python 3.6 feature and we have autobuilder workers with 3.5. * Avoid python keywords as variable names * Simplify dict accesses using .get() * Rename resultsutils -> resultutils to match the resultstool -> resulttool rename * Formalised the handling of "file_name" to "TESTSERIES" which the code will now add into the json configuration data if its not present, based on the directory name. * When we don't have failed test cases, print something saying so instead of an empty table * Tweak the table headers in the report to be more readable (reference "Test Series" instead if file_id and ID instead of results_id) * Improve/simplify the max string length handling * Merge the counts and percentage data into one table in the report since printing two reports of the same data confuses the user * Removed the confusing header in the regression report * Show matches, then regressions, then unmatched runs in the regression report, also remove chatting unneeded output * Try harder to "pair" up matching configurations to reduce noise in the regressions report * Abstracted the "mapping" table concept used to pairing in the regression code to general code in resultutils * Created multiple mappings for results analysis, results storage and 'flattening' results data in a merge * Simplify the merge command to take a source and a destination, letting the destination be a directory or a file, removing the need for an output directory parameter * Add the 'IMAGE_PKGTYPE' and 'DISTRO' config options to the regression mappings * Have the store command place the testresults files in a layout from the mapping, making commits into the git repo for results storage more useful for simple comparison purposes * Set the oe-git-archive tag format appropriately for oeqa results storage (and simplify the commit messages closer to their defaults) * Fix oe-git-archive to use the commit/branch data from the results file * Cleaned up the command option help to match other changes * Follow the model of git branch/tag processing used by oe-build-perf-report and use that to read the data using git show to avoid branch change * Add ptest summary to the report command * Update the tests to match the above changes Signed-off-by: Richard Purdie --- .../oeqa/selftest/cases/resulttooltests.py| 106 +++--- scripts/lib/resulttool/manualexecution.py | 8 +- scripts/lib/resulttool/merge.py | 69 ++-- scripts/lib/resulttool/regression.py | 328 +- scripts/lib/resulttool/report.py | 157 + scripts/lib/resulttool/resultsutils.py| 67 scripts/lib/resulttool/resultutils.py | 127 +++ scripts/lib/resulttool/store.py | 136 .../template/test_report_full_text.txt| 33 +- scripts/resulttool| 7 +- 10 files changed, 530 insertions(+), 508 deletions(-) delete mode 100644 scripts/lib/resulttool/resultsutils.py create mode 100644 scripts/lib/resulttool/resultutils.py diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py b/meta/lib/oeqa/selftest/cases/resulttooltests.py index 7bf1ec60c12..0a089c0b7f0 100644 --- a/meta/lib/oeqa/selftest/cases/resulttooltests.py +++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py @@ -4,13 +4,46 @@ basepath = os.path.abspath(os.path.dirname(__file__) + '/../../../../../') lib_path = basepath + '/scripts/lib' sys.path = sys.path + [lib_path] from resulttool.report import ResultsTextReport -from resulttool.regression import ResultsRegressionSelector, ResultsRegression -from resulttool.merge import ResultsMerge -from resulttool.store import ResultsGitStore -from resulttool.resultsutils import checkout_git_dir +from resulttool import regression as regression +from resulttool import resultutils as resultutils from oeqa.selftest.case import OESelftestTestCase class ResultToolTests(OESelftestTestCase): +base_results_data = {'base_result1': {'configuration': {"TEST_TYPE": "runtime", +"TESTSERIES": "series1", +"IMAGE_BASENAME": "image", +"IMAGE_PKGTYPE": "ipk", +"DISTRO": "mydistro", +"MACHINE": "qemux86"}, + 'result': {}}, + 'base_result2': {'configuration': {"TEST_TYPE": "runtime", +"TESTSERIES": "series1", +"IMAGE_BASENAME": "image", +"IMAGE_PKG
[OE-core] [PATCH 2/2] oe-build-perf-report/gitarchive: Move common useful functions to library
These functions can be reused by the resulttool code so move to the common function library for this purpose. Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/gitarchive.py | 71 scripts/oe-build-perf-report | 90 --- 2 files changed, 81 insertions(+), 80 deletions(-) diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index fddd608593a..ff614d06bbf 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -17,6 +17,8 @@ import os import re import sys +from operator import attrgetter +from collections import namedtuple from oeqa.utils.git import GitRepo, GitError class ArchiveError(Exception): @@ -171,3 +173,72 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms log.info("Pushing data to remote") data_repo.run_cmd(cmd) +# Container class for tester revisions +TestedRev = namedtuple('TestedRev', 'commit commit_number tags') + +def get_test_runs(log, repo, tag_name, **kwargs): +"""Get a sorted list of test runs, matching given pattern""" +# First, get field names from the tag name pattern +field_names = [m.group(1) for m in re.finditer(r'{(\w+)}', tag_name)] +undef_fields = [f for f in field_names if f not in kwargs.keys()] + +# Fields for formatting tag name pattern +str_fields = dict([(f, '*') for f in field_names]) +str_fields.update(kwargs) + +# Get a list of all matching tags +tag_pattern = tag_name.format(**str_fields) +tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines() +log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) + +# Parse undefined fields from tag names +str_fields = dict([(f, r'(?P<{}>[\w\-.()]+)'.format(f)) for f in field_names]) +str_fields['branch'] = r'(?P[\w\-.()/]+)' +str_fields['commit'] = '(?P[0-9a-f]{7,40})' +str_fields['commit_number'] = '(?P[0-9]{1,7})' +str_fields['tag_number'] = '(?P[0-9]{1,5})' +# escape parenthesis in fields in order to not messa up the regexp +fixed_fields = dict([(k, v.replace('(', r'\(').replace(')', r'\)')) for k, v in kwargs.items()]) +str_fields.update(fixed_fields) +tag_re = re.compile(tag_name.format(**str_fields)) + +# Parse fields from tags +revs = [] +for tag in tags: +m = tag_re.match(tag) +groups = m.groupdict() +revs.append([groups[f] for f in undef_fields] + [tag]) + +# Return field names and a sorted list of revs +return undef_fields, sorted(revs) + +def get_test_revs(log, repo, tag_name, **kwargs): +"""Get list of all tested revisions""" +fields, runs = get_test_runs(log, repo, tag_name, **kwargs) + +revs = {} +commit_i = fields.index('commit') +commit_num_i = fields.index('commit_number') +for run in runs: +commit = run[commit_i] +commit_num = run[commit_num_i] +tag = run[-1] +if not commit in revs: +revs[commit] = TestedRev(commit, commit_num, [tag]) +else: +assert commit_num == revs[commit].commit_number, "Commit numbers do not match" +revs[commit].tags.append(tag) + +# Return in sorted table +revs = sorted(revs.values(), key=attrgetter('commit_number')) +log.debug("Found %d tested revisions:\n%s", len(revs), + "\n".join(['{} ({})'.format(rev.commit_number, rev.commit) for rev in revs])) +return revs + +def rev_find(revs, attr, val): +"""Search from a list of TestedRev""" +for i, rev in enumerate(revs): +if getattr(rev, attr) == val: +return i +raise ValueError("Unable to find '{}' value '{}'".format(attr, val)) + diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index af4f0469f6b..f6fb458c2eb 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -37,58 +37,18 @@ from buildstats import BuildStats, diff_buildstats, BSVerDiff scriptpath.add_oe_lib_path() from oeqa.utils.git import GitRepo, GitError +import oeqa.utils.gitarchive as gitarchive # Setup logging logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s") log = logging.getLogger('oe-build-perf-report') - -# Container class for tester revisions -TestedRev = namedtuple('TestedRev', 'commit commit_number tags') - - -def get_test_runs(repo, tag_name, **kwargs): -"""Get a sorted list of test runs, matching given pattern""" -# First, get field names from the tag name pattern -field_names = [m.group(1) for m in re.finditer(r'{(\w+)}', tag_name)] -undef_fields = [f for f in field_names if f not in kwargs.keys()] - -# Fields for formatting tag name pattern -str_fields = dict([(f, '*') for f in field_names]) -str_fields.update(kwargs) - -# Get a list of all matching tags -tag_pattern = tag_name.format(**str_fields) -tags = repo.run_cmd(['tag', '-l', tag_patter
Re: [OE-core] [PATCH 1/4] pango: convert from autotools to meson
On Wed, 20 Feb 2019 at 22:19, Richard Purdie wrote: > > wrote: > > > and I think we have a race: > > > > > > http://errors.yoctoproject.org/Errors/Details/229403/ > > > > Somehow this link won't open here, but I think the race is this one? > > https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b > > Yes, accessing the files whilst they're still being written? Yes, there should be a fix for this in the latest patchset: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/tree/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch?h=akanavin/package-version-updates Upstream has fixed this too, but hasn't made a release yet with the fix. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pango: convert from autotools to meson
On Wed, 2019-02-20 at 19:15 +0100, Alexander Kanavin wrote: > On Wed, 20 Feb 2019 at 17:43, Richard Purdie > wrote: > > and I think we have a race: > > > > http://errors.yoctoproject.org/Errors/Details/229403/ > > Somehow this link won't open here, but I think the race is this one? > https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b Yes, accessing the files whilst they're still being written? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] gtk+3: upgrade 3.24.1 -> 3.24.5
On Wed, 2019-02-20 at 10:57 -0800, Khem Raj wrote: > On Wed, Feb 20, 2019 at 10:56 AM Khem Raj wrote: > > This has been applied to master but here is another failure on > > musl/x86 > > I suspect this happens with gold linker and not really musl specific. Sorry, there were a number of gtk+ failures from the meson patches and I'd assumed this was one of them. I'd seen green builds for gtk+ on the autobuilder so I'd assumed we were good to merge. We may want to consider a build using gold on the autobuilder to help catch problems like this... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH v3] mesa: Convert recipe to use meson build system
- Remove all non related meson patches - Change radeon driver to r100 Based on https://patchwork.openembedded.org/patch/158748/ Signed-off-by: Fabio Berton --- ...0001-Simplify-wayland-scanner-lookup.patch | 42 -- ...ing-include-stddef.h-in-egldevice.h.patch} | 4 +- ...k-for-all-linux-host_os-combinations.patch | 50 ...-winsys-svga-drm-Include-sys-types.h.patch | 34 --- ...M-version-when-using-LLVM-Git-releas.patch | 44 -- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 35 --- meta/recipes-graphics/mesa/mesa.inc | 58 +-- meta/recipes-graphics/mesa/mesa_18.3.4.bb | 7 +-- 8 files changed, 81 insertions(+), 193 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch rename meta/recipes-graphics/mesa/files/{0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch => 0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch} (91%) create mode 100644 meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch delete mode 100644 meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch delete mode 100644 meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch delete mode 100644 meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch deleted file mode 100644 index 1c2ded0e60..00 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Wed, 20 Feb 2019 16:17:00 -0300 -Subject: [PATCH 1/5] Simplify wayland-scanner lookup -Organization: O.S. Systems Software LTDA. - -Don't use pkg-config to lookup the path of a binary that's in the path. - -Alternatively we'd have to prefix the path returned by pkg-config with -PKG_CONFIG_SYSROOT_DIR. - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen -Signed-off-by: Otavio Salvador - configure.ac | 7 +-- - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cd9ff259fad..402b4a91946 100644 a/configure.ac -+++ b/configure.ac -@@ -1841,16 +1841,11 @@ for plat in $platforms; do - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - --if test "x$WAYLAND_SCANNER" = x; then --AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) --fi -+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) --- -2.20.1 diff --git a/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch similarity index 91% rename from meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch rename to meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch index 1782576db2..08d128e919 100644 --- a/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch +++ b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch @@ -1,7 +1,7 @@ -From f452e30ab664fe608acc107cc03d2efa8731d938 Mon Sep 17 00:00:00 2001 +From d2d5acdcb10465c024c8b0931d49e49660210d2c Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Wed, 28 Nov 2018 08:39:34 -0800 -Subject: [PATCH 5/5] egl: add missing #include in egldevice.h +Subject: [PATCH 1/2] egl: add missing #include in egldevice.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch new file mode 100644 index 00..f4650adf0f --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch @@ -0,0 +1,50 @@ +From a4f6630f4563c2f3f619003706f541c380b49027 Mon Sep 17 00:00:00 2001 +From: Anuj M
[OE-core] [PATCH v4 1/3] mesa: Update 18.1.9 -> 18.3.4
- Refresh all patches. - Remove "Use Python 3 to execute the scripts" patch Commit 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a add support for both python 2 and 3. - Remove "dri: i965: Add missing time.h include" patch Commit 3c288da5eec81ee58b85927df18d9194ead8f5c2 add time.h header file. - Remove --enable-texture-float. Commit 66673bef941af344314fe9c91cad8cd330b245eb remove option to unconditionally enable floating-point textures. - Commit 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd moved ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf - Add patch to fix mesa-native build - Add xrandr to X11_DEPS Signed-off-by: Fabio Berton --- ...0001-Simplify-wayland-scanner-lookup.patch | 27 +- ...-winsys-svga-drm-Include-sys-types.h.patch | 8 +-- ...M-version-when-using-LLVM-Git-releas.patch | 12 ++--- ...-Use-Python-3-to-execute-the-scripts.patch | 32 ...-for-defining-WAYLAND_PROTOCOLS_DAT.patch} | 28 +-- ...-dri-i965-Add-missing-time.h-include.patch | 36 -- ...sing-include-stddef.h-in-egldevice.h.patch | 49 +++ .../{mesa-gl_18.1.9.bb => mesa-gl_18.3.4.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 6 +-- .../mesa/{mesa_18.1.9.bb => mesa_18.3.4.bb} | 9 ++-- 10 files changed, 94 insertions(+), 113 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch rename meta/recipes-graphics/mesa/files/{0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch => 0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch} (55%) delete mode 100644 meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch create mode 100644 meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch rename meta/recipes-graphics/mesa/{mesa-gl_18.1.9.bb => mesa-gl_18.3.4.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_18.1.9.bb => mesa_18.3.4.bb} (69%) diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch index a50d2a2ba2..1c2ded0e60 100644 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch @@ -1,7 +1,7 @@ -From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 15 Nov 2016 15:20:49 +0200 -Subject: [PATCH 1/6] Simplify wayland-scanner lookup +From 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Wed, 20 Feb 2019 16:17:00 -0300 +Subject: [PATCH 1/5] Simplify wayland-scanner lookup Organization: O.S. Systems Software LTDA. Don't use pkg-config to lookup the path of a binary that's in the path. @@ -17,23 +17,26 @@ Signed-off-by: Otavio Salvador 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 14f1af2b2f..916d0bd207 100644 +index cd9ff259fad..402b4a91946 100644 --- a/configure.ac +++ b/configure.ac -@@ -1825,12 +1825,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) +@@ -1841,16 +1841,11 @@ for plat in $platforms; do + fi WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - + -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') + PKG_CHECK_EXISTS([wayland-scanner >= 1.15], + AC_SUBST(SCANNER_ARG, 'private-code'), + AC_SUBST(SCANNER_ARG, 'code')) + -if test "x$WAYLAND_SCANNER" = x; then -AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -fi +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - + if test "x$WAYLAND_SCANNER" = "x:"; then AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) --- -2.18.0 - +-- +2.20.1 diff --git a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch index ffb3bf7a63..12dca61e19 100644 --- a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch +++ b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch @@ -1,7 +1,7 @@ -From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001 +From 34c3d07b67e6c08f555473a86ff158951abb6000 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 16 Aug 2017 18:58:20 -0700 -Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h +Subject: [PATCH 2/5] winsys/svga/drm: Include sys/types.h Organization: O.S.
[OE-core] [PATCH v4 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
Instead of using a native specific packageconfig option, we now set the swrast as the supported driver. Currently the native version does not build any dri drivers at all. This is intentional: mesa-native is used only by virgl, so was made the most minimal possible configuration for mesa-native so that a) virgl works; and b) build time is as short as possible. There are two swrast drivers, one dri-based, another gallium-based. Autotools lets you build both, meson forces you to choose. Thus DRIDRIVERS = "swrast" is only set for _native, as for _target we get the gallium driver instead. See discussion here [1] Based on https://patchwork.openembedded.org/patch/158748/ [1] https://patchwork.openembedded.org/patch/158806/ Signed-off-by: Fabio Berton --- meta/recipes-graphics/mesa/mesa.inc | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index b9870eb6ad..c5f3e332fa 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " -PACKAGECONFIG_class-native ?= "gbm dri-native egl" -PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl" +PACKAGECONFIG_class-native ?= "gbm dri egl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" @@ -61,13 +61,12 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS = "swrast" +DRIDRIVERS_class-native = "swrast" +DRIDRIVERS_class-nativesdk = "swrast" DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm" -# On the native builds we use host's dri drivers -PACKAGECONFIG[dri-native] = "--enable-dri, , xorgproto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 3/3] mesa: Add opengl to native and nativesdk PACKAGECONFIG
Allow the use of opengl for native and nativesdk packages. Based on https://patchwork.openembedded.org/patch/158748/ Signed-off-by: Fabio Berton --- meta/recipes-graphics/mesa/mesa.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c5f3e332fa..c4a827fa5c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " -PACKAGECONFIG_class-native ?= "gbm dri egl" -PACKAGECONFIG_class-nativesdk ?= "gbm dri egl" +PACKAGECONFIG_class-native ?= "gbm dri egl opengl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] kernel-fitimage.bbclass: Introduce a way to provide external dtb
Hi Philip, > -Original Message- > From: Philip Balister [mailto:phi...@balister.org] > Sent: Sunday, February 17, 2019 3:47 PM > To: Manjukumar Harthikote Matha > Cc: openembedded-core > Subject: Re: [OE-core][PATCH 2/2] kernel-fitimage.bbclass: Introduce a way to > provide external dtb > > With these patches, I made a fitImage that booted on the mini-zed. It would > be nice > to include a note on how to enable this. I took at few stabs at it and ended > up with Thanks for testing it out on mini-zed > > PREFERRED_PROVIDER_virtual/dtb = "devicetree" > Yes, I should have added this in the commit message. I will update it and re-send V2 Thanks, Manju > in he machine file to get the code to trigger. > > Philip > > On 02/14/2019 07:56 PM, Manjukumar Matha wrote: > > Currently kernel-fitimage gets the dtb from KERNEL_DEVICETREE, however > > there are instances when the DTB file can be generated using other > > recipes, provide a way to include the DTB instead of inkernel device > > tree. > > <...> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw). Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and 0001-Install-gio-querymodules-as-libexec_PROGRAM.patch Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch to allow 'mingw32' as target machine in addition to 'windows'. Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to correct ARM build errors. Drop configure-libtool.patch (autotools-specific). Signed-off-by: Alexander Kanavin --- ...t-write-bindir-into-pkg-config-files.patch | 50 + ...-gio-querymodules-as-libexec_PROGRAM.patch | 17 ++- ...-correctly-when-building-with-mingw3.patch | 104 ++ ...ot-hardcode-linux-as-the-host-system.patch | 27 + ...dcode-python-path-into-various-tools.patch | 2 +- ...ble-more-tests-while-cross-compiling.patch | 91 ++- .../glib-2.0/glib-2.0/configure-libtool.patch | 44 .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +- meta/recipes-core/glib-2.0/glib.inc | 35 +++--- 10 files changed, 310 insertions(+), 66 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch new file mode 100644 index 000..ede29c90bab --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -0,0 +1,50 @@ +From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 15 Feb 2019 11:17:27 +0100 +Subject: [PATCH] Do not write $bindir into pkg-config files + +This would otherwise break when using the files to build other target +components (we need to rely on PATH containing the paths to utilities, +rather than use target paths). + +Upstream-Status: Inappropriate [upstream wants the paths in .pc files] +Signed-off-by: Alexander Kanavin +--- + gio/meson.build | 6 +++--- + glib/meson.build | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gio/meson.build b/gio/meson.build +index 85d8b14..657720a 100644 +--- a/gio/meson.build b/gio/meson.build +@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, +'schemasdir=' + join_paths('${datadir}', schemas_subdir), +'bindir=' + join_paths('${prefix}', get_option('bindir')), +'giomoduledir=' + giomodulesdir, +- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], ++ 'glib_compile_schemas=glib-compile-schemas', ++ 'glib_compile_resources=glib-compile-resources', ++ 'gdbus_codegen=gdbus-codegen'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'gio-2.0', +diff --git a/glib/meson.build b/glib/meson.build +index c05c694..434e8b1 100644 +--- a/glib/meson.build b/glib/meson.build +@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], ++ 'glib_genmarshal=glib-genmarshal', ++ 'gobject_query=gobject-query', ++ 'glib_mkenums=glib-mkenums'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'glib-2.0', diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 97d0aff5d6c..f246254942e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 +From 17fc9230fb932432d8fbf8c56fdc4845495e Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 1
[OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches. Rework jku's thumbnailer patch into meson configuration. Signed-off-by: Alexander Kanavin --- .../0001-Disable-tests-in-native-builds.patch | 31 + ...f-decisions-around-cross-compilation.patch | 38 + ...without-libtiff-not-having-an-effect.patch | 27 ...nd-thumbnailer-cross-compile-failure.patch | 53 +++ ...-depend-on-loaders-being-fully-build.patch | 51 +++ ...nd-thumbnailer-cross-compile-failure.patch | 131 ++ .../extending-libinstall-dependencies.patch | 42 -- .../gdk-pixbuf/hardcoded_libtool.patch| 33 - .../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 47 +-- 9 files changed, 306 insertions(+), 147 deletions(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch new file mode 100644 index 000..1e45b716b93 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch @@ -0,0 +1,31 @@ +From b287cb313dbfac3257f1ab451b19ba59580f78e1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 18 Feb 2019 16:00:12 +0100 +Subject: [PATCH] Disable tests in native builds. + +They have found to be problematic at least on Centos 7: +https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b + +With autotools this was not a problem because it had a configuration +switch for disabling test, which was used. Meson has no such facility :( + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 92c4049..0871c84 100644 +--- a/meson.build b/meson.build +@@ -397,7 +397,7 @@ endif + # i18n + subdir('po') + +-subdir('tests') ++#subdir('tests') + subdir('thumbnailer') + + # Documentation diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch new file mode 100644 index 000..90d4830df50 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch @@ -0,0 +1,38 @@ +From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 14 Feb 2019 18:06:25 +0100 +Subject: [PATCH] Fix a couple of decisions around cross-compilation + +1. gobject-introspection can be build when cross compiling +2. generating loaders.cache requires running a target binary which +we do elsewhere (in postinsts) + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + gdk-pixbuf/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index 77c162b..fc3eb33 100644 +--- a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin + set_variable(bin_name.underscorify(), bin) + endforeach + ++if not meson.is_cross_build() + # The 'loaders.cache' used for testing, so we don't accidentally + # load the installed cache; we always build it by default + loaders_cache = custom_target('loaders.cache', +@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache', + ], + build_by_default: true) + loaders_dep = declare_dependency(sources: [ loaders_cache ]) ++endif + +-build_gir = get_option('with_gir') and not meson.is_cross_build() ++build_gir = get_option('with_gir') + if build_gir + gir_args = [ + '--quiet', diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch deleted file mode 100644 index 2a54d8ed763..000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 460befc992adb32434b0408b453be39a6866ccf8 Mon Se
[OE-core] [PATCH 2/4] llvm: switch to the official git repository
Until now an unoffcial mirror was used, which may or may not be maintained in the longer run, as the need for it has gone. Also, the official mirror has version tags which allows us to track upstream development in an automated manner. ${S} has changed as upstream decided to use a monorepo for all of the llvm-related projects. Further info: https://www.phoronix.com/scan.php?page=news_item&px=LLVM-GitHub-Mono-Repo https://llvm.org/docs/GettingStarted.html#checkout-llvm-from-git Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/llvm/llvm_git.bb | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index eca78af09e4..c68512cc63f 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,20 +19,24 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "e5cc6808dc0d5b773479bf36c51d59d0d3174733" -BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}" +# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release +# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN +# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged +UPSTREAM_VERSION_UNKNOWN = "1" +SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f" + +BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" PATCH_VERSION = "0" SOLIBVER = "1" PV = "${MAJOR_VERSION}.${MINOR_VERSION}" -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \ +SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ file://0002-llvm-allow-env-override-of-exe-path.patch \ " -UPSTREAM_CHECK_COMMITS = "1" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git/llvm" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] pango: convert from autotools to meson
Drop the autotools-specific patch. Signed-off-by: Alexander Kanavin --- ...on-of-docs-pango.types-it-is-build-c.patch | 147 -- meta/recipes-graphics/pango/pango_1.42.4.bb | 33 ++-- 2 files changed, 24 insertions(+), 156 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch diff --git a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105a55..000 --- a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 2 Sep 2016 14:00:24 +0300 -Subject: [PATCH] Enforce recreation of docs/pango.types; it is build - configuration-specific. - -In particular, it needs to exclude references to PangoXft if Xft is not available. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - docs/Makefile.am | 17 - docs/pango.types | 80 - 2 files changed, 5 insertions(+), 92 deletions(-) - delete mode 100644 docs/pango.types - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index f5f1317..8947a99 100644 a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -49,6 +49,10 @@ IGNORE_HFILES= \ - pangocoretext-private.h \ - pangoatsui-private.h - -+if !HAVE_XFT -+IGNORE_HFILES += pangoxft pangoxft-render.h -+endif -+ - # CFLAGS and LDFLAGS for compiling scan program. Only needed - # if $(DOC_MODULE).types is non-empty. - INCLUDES =\ -@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make - # This line really belongs in gtk-doc.mk - $(REPORT_FILES): sgml-build.stamp - --pango.types: -- @echo "Rebuilding $@" -- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ -- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ -- echo >> $@.tmp && \ -- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ -- mv $@.tmp $@ -- --BUILT_SOURCES = pango.types -- - - - MAINTAINERCLEANFILES = $(BUILT_SOURCES) -@@ -120,8 +114,7 @@ EXTRA_DIST += \ - layout.fig \ - layout.eps \ - version.xml.in \ -- check.docs \ -- pango.types -+ check.docs - - # force doc rebulid after configure - dist-hook-local: dist-local-check-no-cross-references all-local -diff --git a/docs/pango.types b/docs/pango.types -deleted file mode 100644 -index 7d93cda..000 a/docs/pango.types -+++ /dev/null -@@ -1,80 +0,0 @@ --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --pango_alignment_get_type --pango_attr_list_get_type --pango_attr_type_get_type --pango_bidi_type_get_type --pango_cairo_fc_font_map_get_type --pango_cairo_font_get_type --pango_cairo_font_map_get_type --pango_color_get_type --pango_context_get_type --pango_coverage_level_get_type --pango_direction_get_type --pango_ellipsize_mode_get_type --pango_engine_get_type --pango_engine_lang_get_type --pango_engine_shape_get_type --pango_fc_decoder_get_type --pango_fc_font_get_type --pango_fc_font_map_get_type --pango_font_description_get_type --pango_font_face_get_type --pango_font_family_get_type --pango_font_get_type --pango_font_map_get_type --pango_font_mask_get_type --pango_font_metrics_get_type --pango_fontset_get_type --pango_fontset_simple_get_type --pango_ft2_font_map_get_type --pango_glyph_item_get_type --pango_glyph_item_iter_get_type --pango_glyph_string_get_type --pango_gravity_get_type --pango_gravity_hint_get_type --pango_item_get_type --pango_language_get_type --pango_layout_get_type --pango_layout_iter_get_type --pango_layout_line_get_type --pango_matrix_get_type --pango_ot_info_get_type --pango_ot_ruleset_get_type --pango_render_part_get_type --pango_renderer_get_type --pango_script_get_type --pango_stretch_get_type --pango_style_get_type --pango_tab_align_get_type --pango_tab_array_get_type --pango_underline_get_type --pango_variant_get_type --pango_weight_get_type --pango_wrap_mode_get_type --pango_xft_font_get_type --pango_xft_font_map_get_type --pango_xft_renderer_get_type --- -2.9.3 - diff --git a/meta/recipes-graphics/pango/pango_1.42.4.
Re: [OE-core] [PATCH 3/5] gtk+3: upgrade 3.24.1 -> 3.24.5
On Wed, Feb 20, 2019 at 10:56 AM Khem Raj wrote: > > This has been applied to master but here is another failure on musl/x86 I suspect this happens with gold linker and not really musl specific. > > https://errors.yoctoproject.org/Errors/Details/229302/ > > > On Mon, Feb 18, 2019 at 11:07 PM Khem Raj wrote: > > > > on ubuntu 14.04 https://errors.yoctoproject.org/Errors/Details/228774/ > > > > On Mon, Feb 18, 2019 at 4:10 PM Richard Purdie > > wrote: > > > > > > Signed-off-by: Richard Purdie > > > --- > > > meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > rename meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} (83%) > > > > > > diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > > b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > > similarity index 83% > > > rename from meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > > rename to meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > > index 6de3e73f2f0..799cbd4707e 100644 > > > --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > > +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > > @@ -7,8 +7,8 @@ SRC_URI = > > > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar > > > file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ > > > file://0003-Add-disable-opengl-configure-option.patch \ > > >" > > > -SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7" > > > -SRC_URI[sha256sum] = > > > "68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f" > > > +SRC_URI[md5sum] = "32862355c08f6af3e7848c695cd4081b" > > > +SRC_URI[sha256sum] = > > > "0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f" > > > > > > S = "${WORKDIR}/gtk+-${PV}" > > > > > > -- > > > 2.20.1 > > > > > > -- > > > ___ > > > 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 3/5] gtk+3: upgrade 3.24.1 -> 3.24.5
This has been applied to master but here is another failure on musl/x86 https://errors.yoctoproject.org/Errors/Details/229302/ On Mon, Feb 18, 2019 at 11:07 PM Khem Raj wrote: > > on ubuntu 14.04 https://errors.yoctoproject.org/Errors/Details/228774/ > > On Mon, Feb 18, 2019 at 4:10 PM Richard Purdie > wrote: > > > > Signed-off-by: Richard Purdie > > --- > > meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > rename meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} (83%) > > > > diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > similarity index 83% > > rename from meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > rename to meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > index 6de3e73f2f0..799cbd4707e 100644 > > --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb > > +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb > > @@ -7,8 +7,8 @@ SRC_URI = > > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar > > file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ > > file://0003-Add-disable-opengl-configure-option.patch \ > >" > > -SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7" > > -SRC_URI[sha256sum] = > > "68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f" > > +SRC_URI[md5sum] = "32862355c08f6af3e7848c695cd4081b" > > +SRC_URI[sha256sum] = > > "0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f" > > > > S = "${WORKDIR}/gtk+-${PV}" > > > > -- > > 2.20.1 > > > > -- > > ___ > > 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/4] pango: convert from autotools to meson
On Wed, 20 Feb 2019 at 17:43, Richard Purdie wrote: > and I think we have a race: > > http://errors.yoctoproject.org/Errors/Details/229403/ Somehow this link won't open here, but I think the race is this one? https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Wed, 20 Feb 2019 at 18:35, Otavio Salvador wrote: > > On Wed, 2019-02-20 at 15:47 +0100, Alexander Kanavin wrote: > > > On Wed, 20 Feb 2019 at 13:16, Fabio Berton > > > wrote: > > > > -DRIDRIVERS = "swrast" > > > > -DRIDRIVERS_append_x86_class-target = > > > > ",radeon,r200,nouveau,i965,i915" > > > > -DRIDRIVERS_append_x86-64_class-target = > > > > ",radeon,r200,nouveau,i965,i915" > > > > +DRIDRIVERS_class-native = "swrast" > > > > +DRIDRIVERS_class-nativesdk = "swrast" > > > > +DRIDRIVERS_append_x86_class-target = > > > > ",r100,r200,nouveau,i965,i915" > > > > +DRIDRIVERS_append_x86-64_class-target = > > > > ",r100,r200,nouveau,i965,i915" > > > > > > This produces: > > > > configure: error: classic DRI driver 'r100' does not exist > > > > > > radeon has been renamed to r100 in meson builds, until then it should > > > be still 'radeon'. > > > > Its getting a bit frustrating/tedious to kill all the builds and drop > > the mesa patches again :( > > We are doing our best. It is unfortunate it ended being a > "one-big-do-everything-together" patch. This should have been done in > steps since the beginning. > > Fabio prepared the new version. We hope it finishes this patchset. Before you submit any new version, here's another issue, not sure what's causing it: https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/312/steps/7/logs/step1b (line 14055 onwards). 'Steps' approach works when each step can be tested quickly. Running tests on the autobuilder is an expensive, time-consuming operation (both for the machines, and for RP dealing with the outcome), so those rounds should be minimized. It is for this reason I did recent perl and python major version upgrades and recipe rewrites both as single mega-patches, and not as series - this ensured the minimum possible amount of testing rounds. Fortunately I also didn't have to convince anyone about it. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Wed, Feb 20, 2019 at 12:22 PM Richard Purdie wrote: > > On Wed, 2019-02-20 at 15:47 +0100, Alexander Kanavin wrote: > > On Wed, 20 Feb 2019 at 13:16, Fabio Berton > > wrote: > > > -DRIDRIVERS = "swrast" > > > -DRIDRIVERS_append_x86_class-target = > > > ",radeon,r200,nouveau,i965,i915" > > > -DRIDRIVERS_append_x86-64_class-target = > > > ",radeon,r200,nouveau,i965,i915" > > > +DRIDRIVERS_class-native = "swrast" > > > +DRIDRIVERS_class-nativesdk = "swrast" > > > +DRIDRIVERS_append_x86_class-target = > > > ",r100,r200,nouveau,i965,i915" > > > +DRIDRIVERS_append_x86-64_class-target = > > > ",r100,r200,nouveau,i965,i915" > > > > This produces: > > > configure: error: classic DRI driver 'r100' does not exist > > > > radeon has been renamed to r100 in meson builds, until then it should > > be still 'radeon'. > > Its getting a bit frustrating/tedious to kill all the builds and drop > the mesa patches again :( We are doing our best. It is unfortunate it ended being a "one-big-do-everything-together" patch. This should have been done in steps since the beginning. Fabio prepared the new version. We hope it finishes this patchset. -- 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
Re: [OE-core] [PATCHv2] glibc: Separate out AArch64 multilib loader symlink creation
On Wednesday 23 January 2019 at 16:27:59 +, Mike Crowe wrote: > On Friday 11 January 2019 at 16:59:44 +, Mike Crowe wrote: > > On Friday 11 January 2019 at 16:53:47 +, Richard Purdie wrote: > > > On Fri, 2019-01-11 at 16:49 +, Mike Crowe wrote: > > > > Until now, glibc was responsible for creating an AArch64 dynamic > > > > loader symlink if required for ABI compatibility. > > > > > > > > Unfortunately, using multilib with AArch64 caused the rmdir in > > > > glibc-package.inc:do_poststash_install_cleanup to fail because that > > > > task did not expect to find the dynamic loader symlink in /lib. > > > > > > > > Also, although glibc-package.inc:do_install_append_aarch64 made use > > > > of ${nonarch_base_libdir} to create the dynamic loader symlink in a > > > > way that was compatible with usrmerge, it unfortunately explicitly > > > > added only /lib to libc_baselibs, so the symlink was not packaged > > > > correctly when using usrmerge. > > > > > > > > Attempting to fix both of these problems within glibc-package.inc in > > > > various ways created a bit of a mess. It seemed much simpler to > > > > invent a new package for the symlink and have glibc RDEPEND on that > > > > package if required. > > > > > > > > Richard Purdie suggested[1] that ${nonarch_base_libdir} should not be > > > > used in this way. I've switched to using ${root_prefix}/lib which > > > > continues to work both with and without usrmerge. > > > > > > > > Unfortunately, it appears not to be possible to specify the name of > > > > the loader via a variable with an override, since the _aarch64 > > > > override is applied even for _aarch64-be. > > > > > > I wish there was a simpler way to do this. How ugly is the patch to fix > > > this without adding the new recipe? Adding new recipes which are arch > > > specific like this is a pain for world builds and I think this patch > > > will have problems with those :(. > > > > This is how far I got before deciding that it was too ugly. This patch > > needs some cleaning up, and similar hackery to the separate-recipe patch > > because the aarch64-be override doesn't work. :( > > > > I tried to make both patches at least slightly generic in case some other > > architecture needs something similar in the future. That's why the code has > > moved into a plain do_install_append. This isn't required though, and > > perhaps it would be clearer if the variable were actually > > AARCH64_DYNAMIC_LOADER anyway. > > > > Thanks. > > > > Mike. > > > > diff --git a/meta/recipes-core/glibc/glibc-package.inc > > b/meta/recipes-core/glibc/glibc-package.inc > > index a98ae1a29c..0181aa7b32 100644 > > --- a/meta/recipes-core/glibc/glibc-package.inc > > +++ b/meta/recipes-core/glibc/glibc-package.inc > > @@ -15,7 +15,13 @@ RPROVIDES_glibc-thread-db = "eglibc-thread-db" > > RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" > > RPROVIDES_${PN}-dbg = "eglibc-dbg" > > libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so > > ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so > > ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so > > ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so > > ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so > > ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so > > ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so > > ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so > > ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so > > ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so > > ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so > > ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so > > ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so > > ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" > > -libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" > > +ARCH_DYNAMIC_LOADER = "" > > +# The aarch64 ABI says the dynamic linker -must- be > > +# /lib/ld-linux-aarch64[_be].so.1. With usrmerge, that may mean that > > +# we need to install it in /usr/lib. > > +ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-aarch64.so.1" > > +ARCH_DYNAMIC_LOADER_aarch64_be = "ld-linux-aarch64_be.so.1" > > +libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', > > '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" > > INSANE_SKIP_${PN}_append_aarch64 = " libdir" > > > > FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig > > ${sysconfdir}/ld.so.conf" > > @@ -112,20 +118,20 @@ do_install_append () { > > echo "d root root 0755 /var/run/nscd none" \ > > > ${D}${sysconfdir}/default/volatiles/98_nscd > > fi > > + > > + # The dynamic loader will have been installed into > > + # ${base_libdir}. However, if that isn't going to end up being > > + # available in the ABI-mandated location, then a symlink must > > +# be created. > > + > > + if
Re: [OE-core] [PATCH 1/4] pango: convert from autotools to meson
On Wed, 2019-02-20 at 14:50 +0100, Alexander Kanavin wrote: > libxft is a hard dependency now, accordingly drop the patch that > was made for it being optional. That breaks the no-x11 builds: https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/311 I'm also wondering about the warnings in: https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/309/steps/7/logs/warnings and I think we have a race: http://errors.yoctoproject.org/Errors/Details/229403/ So making progress but not quite there yet! :) Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glibc: support powerpc e5500 and e6500
Hello all, I have submitted patch to glibc git . https://patchwork.sourceware.org/patch/31531/ Thanks Chunrong -Original Message- From: Khem Raj [mailto:raj.k...@gmail.com] Sent: 2019年2月20日 0:54 To: Richard Purdie Cc: C.r. Guo ; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] glibc: support powerpc e5500 and e6500 On Tue, Feb 19, 2019 at 8:35 AM Richard Purdie wrote: > > On Tue, 2019-02-19 at 05:50 +, C.r. Guo wrote: > > From: Chunrong Guo > > > > Signed-off-by: Chunrong Guo > > --- > > .../glibc/0031-glibc-support-e5500-and-e6500.patch | 564 > > + > > meta/recipes-core/glibc/glibc_2.29.bb | 1 + > > 2 files changed, 565 insertions(+) > > create mode 100644 > > meta/recipes-core/glibc/glibc/0031-glibc-support- > > e5500-and-e6500.patch > > I'd like to understand whether this is likely to make it upstream and > who is using the powerpc support in the Yocto Project. Do you have any > information on that? They are fairly upstreamable patches > > Cheers, > > Richard > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flist > s.openembedded.org%2Fmailman%2Flistinfo%2Fopenembedded-core&data=0 > 2%7C01%7Cchunrong.guo%40nxp.com%7C3acb175f08bc41831baf08d6968af7f0%7C6 > 86ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C636861920935890674&sdata > =XHBadKm2wBH5sciYqaAqqmiapGWAo6S4bO5eGO%2B1YC8%3D&reserved=0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH] icecc-env: don't raise error when icecc not installed
When icecc is not installed, the `which icecc` command in icecc-env.sh returns nonzero. This happens when environment is being sourced. When the terminal has `set -e`, the whole script fails and terminal is closed. Fix this by ignoring errors from the which command. Signed-off-by: Adam Trhon Signed-off-by: Richard Purdie --- .../icecc-toolchain/icecc-toolchain/icecc-env.sh| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh index 81b3018bb6..0dccc41c8a 100644 --- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh +++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh @@ -21,7 +21,7 @@ # if [ -z "$ICECC_PATH" ]; then -ICECC_PATH=$(which icecc 2> /dev/null) +ICECC_PATH=$(which icecc 2> /dev/null || true) fi if [ -n "$ICECC_PATH" ]; then -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] wic creates ext4 images that read really slow in u-boot
Hello Mike, all, On Wed, Feb 20, 2019 at 11:42 AM Mike Looijmans wrote: > > On 19-02-19 21:45, Leon Woestenberg wrote: > > Hello all, > > > > On Tue, Feb 19, 2019 at 8:28 PM Andre McCurdy wrote: > >> On Tue, Feb 19, 2019 at 9:13 AM Leon Woestenberg > >> wrote: > >>> > >>> Hello Mike, > >>> > >>> sounds familiar. > >>> > >>> On Tue, 19 Feb 2019 at 17:55, Mike Looijmans > >>> wrote: > > Took me a while to figure out why my board took 90 seconds to boot > suddenly. > The issue turned out to be the ext4 partition created by wic. > >>> > >>> I suspect it's not WIC's fault. > > >>> I am aware of two fixes for U-Boot. I will look them up, and reply again > >>> to this thread. > > > > Google for these two commits. I cherry-picked the first one for my > > project and can confirm it brings back the desired performance. (Still > > assuming this is the identical cause as for TO/Mike.) > > > > commit 855b8e4f9f255415a7753819e392e4b5d984f35c > > Author: Matt Madison > > Date: Sat Aug 19 08:46:46 2017 -0700 > > > > ext4: cache extent blocks during file reads > > > > A simpler and less-efficient approach to solving > > the problem with extent index blocks than what > > was in fc0fc50f38a4d7d0554558076a79dfe8b0d78cd5, > > but one that does not break write operations. > > > > Signed-off-by: Matt Madison > > I'll give it a try... > > You mentioned "two" commits? Yes the commit above, and *another* approach referred to and mentioned in the commit message (also with hash). The block cache feature may solve the problem in a more generic way (also caching things like directory lookups), whereas the ext4 extent patches are more specific to ext4 only. I found the ext4 fixes starting from here: https://github.com/madisongh/meta-tegra/issues/42 Regards, Leon. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Wed, 2019-02-20 at 15:47 +0100, Alexander Kanavin wrote: > On Wed, 20 Feb 2019 at 13:16, Fabio Berton > wrote: > > -DRIDRIVERS = "swrast" > > -DRIDRIVERS_append_x86_class-target = > > ",radeon,r200,nouveau,i965,i915" > > -DRIDRIVERS_append_x86-64_class-target = > > ",radeon,r200,nouveau,i965,i915" > > +DRIDRIVERS_class-native = "swrast" > > +DRIDRIVERS_class-nativesdk = "swrast" > > +DRIDRIVERS_append_x86_class-target = > > ",r100,r200,nouveau,i965,i915" > > +DRIDRIVERS_append_x86-64_class-target = > > ",r100,r200,nouveau,i965,i915" > > This produces: > > configure: error: classic DRI driver 'r100' does not exist > > radeon has been renamed to r100 in meson builds, until then it should > be still 'radeon'. Its getting a bit frustrating/tedious to kill all the builds and drop the mesa patches again :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Wed, 20 Feb 2019 at 13:16, Fabio Berton wrote: > -DRIDRIVERS = "swrast" > -DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" > -DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" > +DRIDRIVERS_class-native = "swrast" > +DRIDRIVERS_class-nativesdk = "swrast" > +DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" > +DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" This produces: | configure: error: classic DRI driver 'r100' does not exist radeon has been renamed to r100 in meson builds, until then it should be still 'radeon'. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw). Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and 0001-Install-gio-querymodules-as-libexec_PROGRAM.patch Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch to allow 'mingw32' as target machine in addition to 'windows'. Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to correct ARM build errors. Drop configure-libtool.patch (autotools-specific). Signed-off-by: Alexander Kanavin --- ...t-write-bindir-into-pkg-config-files.patch | 50 + ...-gio-querymodules-as-libexec_PROGRAM.patch | 17 ++- ...-correctly-when-building-with-mingw3.patch | 104 ++ ...ot-hardcode-linux-as-the-host-system.patch | 27 + ...dcode-python-path-into-various-tools.patch | 2 +- ...ble-more-tests-while-cross-compiling.patch | 91 ++- .../glib-2.0/glib-2.0/configure-libtool.patch | 44 .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +- meta/recipes-core/glib-2.0/glib.inc | 35 +++--- 10 files changed, 310 insertions(+), 66 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch new file mode 100644 index 000..ede29c90bab --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -0,0 +1,50 @@ +From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 15 Feb 2019 11:17:27 +0100 +Subject: [PATCH] Do not write $bindir into pkg-config files + +This would otherwise break when using the files to build other target +components (we need to rely on PATH containing the paths to utilities, +rather than use target paths). + +Upstream-Status: Inappropriate [upstream wants the paths in .pc files] +Signed-off-by: Alexander Kanavin +--- + gio/meson.build | 6 +++--- + glib/meson.build | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gio/meson.build b/gio/meson.build +index 85d8b14..657720a 100644 +--- a/gio/meson.build b/gio/meson.build +@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, +'schemasdir=' + join_paths('${datadir}', schemas_subdir), +'bindir=' + join_paths('${prefix}', get_option('bindir')), +'giomoduledir=' + giomodulesdir, +- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], ++ 'glib_compile_schemas=glib-compile-schemas', ++ 'glib_compile_resources=glib-compile-resources', ++ 'gdbus_codegen=gdbus-codegen'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'gio-2.0', +diff --git a/glib/meson.build b/glib/meson.build +index c05c694..434e8b1 100644 +--- a/glib/meson.build b/glib/meson.build +@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], ++ 'glib_genmarshal=glib-genmarshal', ++ 'gobject_query=gobject-query', ++ 'glib_mkenums=glib-mkenums'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'glib-2.0', diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 97d0aff5d6c..f246254942e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 +From 17fc9230fb932432d8fbf8c56fdc4845495e Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 1
[OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches. Rework jku's thumbnailer patch into meson configuration. Add a patch to disable tests in native builds. Signed-off-by: Alexander Kanavin --- .../0001-Disable-tests-in-native-builds.patch | 30 ...f-decisions-around-cross-compilation.patch | 38 + ...without-libtiff-not-having-an-effect.patch | 27 ...nd-thumbnailer-cross-compile-failure.patch | 53 +++ ...nd-thumbnailer-cross-compile-failure.patch | 131 ++ .../extending-libinstall-dependencies.patch | 42 -- .../gdk-pixbuf/hardcoded_libtool.patch| 33 - .../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 41 -- 8 files changed, 248 insertions(+), 147 deletions(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch new file mode 100644 index 000..c991635bb95 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch @@ -0,0 +1,30 @@ +From d44aad1858c9c0da74f389d3de4dabade28b56c3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 18 Feb 2019 16:00:12 +0100 +Subject: [PATCH] Disable tests in native builds. + +They have found to be problematic at least on Centos 7: +https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b + +With autotools this was not a problem because it had a configuration +switch for disabling test, which was used. Meson has no such facility :( + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 92c4049..0871c84 100644 +--- a/meson.build b/meson.build +@@ -397,7 +397,7 @@ endif + # i18n + subdir('po') + +-subdir('tests') ++#subdir('tests') + subdir('thumbnailer') + + # Documentation diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch new file mode 100644 index 000..90d4830df50 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch @@ -0,0 +1,38 @@ +From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 14 Feb 2019 18:06:25 +0100 +Subject: [PATCH] Fix a couple of decisions around cross-compilation + +1. gobject-introspection can be build when cross compiling +2. generating loaders.cache requires running a target binary which +we do elsewhere (in postinsts) + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + gdk-pixbuf/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index 77c162b..fc3eb33 100644 +--- a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin + set_variable(bin_name.underscorify(), bin) + endforeach + ++if not meson.is_cross_build() + # The 'loaders.cache' used for testing, so we don't accidentally + # load the installed cache; we always build it by default + loaders_cache = custom_target('loaders.cache', +@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache', + ], + build_by_default: true) + loaders_dep = declare_dependency(sources: [ loaders_cache ]) ++endif + +-build_gir = get_option('with_gir') and not meson.is_cross_build() ++build_gir = get_option('with_gir') + if build_gir + gir_args = [ + '--quiet', diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch deleted file mode 100644 index 2a54d8ed763..000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 10 Oct 2017 14:33:18 +0300 -Subject: [PATCH] Fix --without-libtiff not having an ef
[OE-core] [PATCH 1/4] pango: convert from autotools to meson
libxft is a hard dependency now, accordingly drop the patch that was made for it being optional. Signed-off-by: Alexander Kanavin --- ...on-of-docs-pango.types-it-is-build-c.patch | 147 -- meta/recipes-graphics/pango/pango_1.42.4.bb | 32 ++-- 2 files changed, 21 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch diff --git a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105a55..000 --- a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 2 Sep 2016 14:00:24 +0300 -Subject: [PATCH] Enforce recreation of docs/pango.types; it is build - configuration-specific. - -In particular, it needs to exclude references to PangoXft if Xft is not available. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - docs/Makefile.am | 17 - docs/pango.types | 80 - 2 files changed, 5 insertions(+), 92 deletions(-) - delete mode 100644 docs/pango.types - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index f5f1317..8947a99 100644 a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -49,6 +49,10 @@ IGNORE_HFILES= \ - pangocoretext-private.h \ - pangoatsui-private.h - -+if !HAVE_XFT -+IGNORE_HFILES += pangoxft pangoxft-render.h -+endif -+ - # CFLAGS and LDFLAGS for compiling scan program. Only needed - # if $(DOC_MODULE).types is non-empty. - INCLUDES =\ -@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make - # This line really belongs in gtk-doc.mk - $(REPORT_FILES): sgml-build.stamp - --pango.types: -- @echo "Rebuilding $@" -- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ -- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ -- echo >> $@.tmp && \ -- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ -- mv $@.tmp $@ -- --BUILT_SOURCES = pango.types -- - - - MAINTAINERCLEANFILES = $(BUILT_SOURCES) -@@ -120,8 +114,7 @@ EXTRA_DIST += \ - layout.fig \ - layout.eps \ - version.xml.in \ -- check.docs \ -- pango.types -+ check.docs - - # force doc rebulid after configure - dist-hook-local: dist-local-check-no-cross-references all-local -diff --git a/docs/pango.types b/docs/pango.types -deleted file mode 100644 -index 7d93cda..000 a/docs/pango.types -+++ /dev/null -@@ -1,80 +0,0 @@ --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --pango_alignment_get_type --pango_attr_list_get_type --pango_attr_type_get_type --pango_bidi_type_get_type --pango_cairo_fc_font_map_get_type --pango_cairo_font_get_type --pango_cairo_font_map_get_type --pango_color_get_type --pango_context_get_type --pango_coverage_level_get_type --pango_direction_get_type --pango_ellipsize_mode_get_type --pango_engine_get_type --pango_engine_lang_get_type --pango_engine_shape_get_type --pango_fc_decoder_get_type --pango_fc_font_get_type --pango_fc_font_map_get_type --pango_font_description_get_type --pango_font_face_get_type --pango_font_family_get_type --pango_font_get_type --pango_font_map_get_type --pango_font_mask_get_type --pango_font_metrics_get_type --pango_fontset_get_type --pango_fontset_simple_get_type --pango_ft2_font_map_get_type --pango_glyph_item_get_type --pango_glyph_item_iter_get_type --pango_glyph_string_get_type --pango_gravity_get_type --pango_gravity_hint_get_type --pango_item_get_type --pango_language_get_type --pango_layout_get_type --pango_layout_iter_get_type --pango_layout_line_get_type --pango_matrix_get_type --pango_ot_info_get_type --pango_ot_ruleset_get_type --pango_render_part_get_type --pango_renderer_get_type --pango_script_get_type --pango_stretch_get_type --pango_style_get_type --pango_tab_align_get_type --pango_tab_array_get_type --pango_underline_get_type --pango_variant_get_type --pango_weight_get_type --pango_wrap_mode_get_type --pango_xft_font_get_type --pango_xft_font_map_get_type --pango_xft_renderer_get_type --- -
[OE-core] [PATCH 2/4] llvm: switch to the official git repository
Until now an unoffcial mirror was used, which may or may not be maintained in the longer run, as the need for it has gone. Also, the official mirror has version tags which allows us to track upstream development in an automated manner. ${S} has changed as upstream decided to use a monorepo for all of the llvm-related projects. Further info: https://www.phoronix.com/scan.php?page=news_item&px=LLVM-GitHub-Mono-Repo https://llvm.org/docs/GettingStarted.html#checkout-llvm-from-git Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/llvm/llvm_git.bb | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index eca78af09e4..c68512cc63f 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,20 +19,24 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "e5cc6808dc0d5b773479bf36c51d59d0d3174733" -BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}" +# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release +# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN +# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged +UPSTREAM_VERSION_UNKNOWN = "1" +SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f" + +BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" PATCH_VERSION = "0" SOLIBVER = "1" PV = "${MAJOR_VERSION}.${MINOR_VERSION}" -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \ +SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ file://0002-llvm-allow-env-override-of-exe-path.patch \ " -UPSTREAM_CHECK_COMMITS = "1" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git/llvm" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libdrm: Upgrade 2.4.96 -> 2.4.97
Signed-off-by: Fabio Berton --- .../drm/{libdrm_2.4.96.bb => libdrm_2.4.97.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/drm/{libdrm_2.4.96.bb => libdrm_2.4.97.bb} (95%) diff --git a/meta/recipes-graphics/drm/libdrm_2.4.96.bb b/meta/recipes-graphics/drm/libdrm_2.4.97.bb similarity index 95% rename from meta/recipes-graphics/drm/libdrm_2.4.96.bb rename to meta/recipes-graphics/drm/libdrm_2.4.97.bb index 1c9e0e9f95..bbe9a33ba9 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.96.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.97.bb @@ -12,8 +12,8 @@ DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://musl-ioctl.patch" -SRC_URI[md5sum] = "f296d87272b1befeada3bb135751ab3d" -SRC_URI[sha256sum] = "0d561acf7bb4cc59dc82415100e6c1a44860e8c380e00f9592923e3cd08db393" +SRC_URI[md5sum] = "acef22d0c62c89692348c2dd5591393e" +SRC_URI[sha256sum] = "77d0ccda3e10d6593398edb70b1566bfe1a23a39bd3da98ace2147692eadd123" inherit meson pkgconfig manpages -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, Feb 20, 2019 at 9:32 AM Alexander Kanavin wrote: > > On Wed, 20 Feb 2019 at 12:57, Otavio Salvador > wrote: > > > On Wed, 20 Feb 2019 at 08:58, Richard Purdie > > > wrote: > > > > > I guess xrandr needs to be in X11_DEPS, this was added in the > > > > > original > > > > > mega-patch, but overlooked in the split version. > > > > > > > > There were failures all over the autobuilder from this as well :( > > > > > > That's why I still think it would've been better just to test and > > > merge the original all-in-one patch, with follow up patches if > > > necessary. Doing this split and delaying meson into 19.0 is just more > > > overhead and work for everyone. > > > > Patches should be logical units and a "do all once" is wrong. We are > > doing the fixes so it is not adding overhead. > > By the way, can you send in the libdrm upgrade as well please? You > should have the patch from AUH. Sure; will cook it now. -- 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
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, 20 Feb 2019 at 12:57, Otavio Salvador wrote: > > On Wed, 20 Feb 2019 at 08:58, Richard Purdie > > wrote: > > > > I guess xrandr needs to be in X11_DEPS, this was added in the > > > > original > > > > mega-patch, but overlooked in the split version. > > > > > > There were failures all over the autobuilder from this as well :( > > > > That's why I still think it would've been better just to test and > > merge the original all-in-one patch, with follow up patches if > > necessary. Doing this split and delaying meson into 19.0 is just more > > overhead and work for everyone. > > Patches should be logical units and a "do all once" is wrong. We are > doing the fixes so it is not adding overhead. By the way, can you send in the libdrm upgrade as well please? You should have the patch from AUH. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, 20 Feb 2019 at 12:56, Otavio Salvador wrote: > > On Wed, 2019-02-20 at 08:52 +0100, Alexander Kanavin wrote: > > > I guess xrandr needs to be in X11_DEPS, this was added in the > > > original > > > mega-patch, but overlooked in the split version. > > > > There were failures all over the autobuilder from this as well :( > > Please provider the links so we fix them. There is just one issue, Khem's message contains the necessary info: configure: error: Package requirements (xrandr) were not met: | | No package 'xrandr' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you And my/Anuj's patch already had this fixed. Add 'xrandr' to X11_DEPS please. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/3] mesa: Add opengl to native and nativesdk PACKAGECONFIG
Allow the use of opengl for native and nativesdk packages. Based on https://patchwork.openembedded.org/patch/158748/ Signed-off-by: Fabio Berton --- meta/recipes-graphics/mesa/mesa.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 4c902b8156..58009d77ab 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " -PACKAGECONFIG_class-native ?= "gbm dri egl" -PACKAGECONFIG_class-nativesdk ?= "gbm dri egl" +PACKAGECONFIG_class-native ?= "gbm dri egl opengl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/3] mesa: Update 18.1.9 -> 18.3.4
- Refresh all patches. - Remove "Use Python 3 to execute the scripts" patch Commit 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a add support for both python 2 and 3. - Remove "dri: i965: Add missing time.h include" patch Commit 3c288da5eec81ee58b85927df18d9194ead8f5c2 add time.h header file. - Remove --enable-texture-float. Commit 66673bef941af344314fe9c91cad8cd330b245eb remove option to unconditionally enable floating-point textures. - Commit 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd moved ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf - Add patch to fix mesa-native build - Add xrandr to X11_DEPS Signed-off-by: Fabio Berton --- ...0001-Simplify-wayland-scanner-lookup.patch | 20 +--- ...-winsys-svga-drm-Include-sys-types.h.patch | 8 +-- ...M-version-when-using-LLVM-Git-releas.patch | 12 ++--- ...-Use-Python-3-to-execute-the-scripts.patch | 32 ...-for-defining-WAYLAND_PROTOCOLS_DAT.patch} | 23 - ...-dri-i965-Add-missing-time.h-include.patch | 36 -- ...sing-include-stddef.h-in-egldevice.h.patch | 49 +++ .../{mesa-gl_18.1.9.bb => mesa-gl_18.3.4.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 6 +-- .../mesa/{mesa_18.1.9.bb => mesa_18.3.4.bb} | 9 ++-- 10 files changed, 90 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch rename meta/recipes-graphics/mesa/files/{0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch => 0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch} (60%) delete mode 100644 meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch create mode 100644 meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch rename meta/recipes-graphics/mesa/{mesa-gl_18.1.9.bb => mesa-gl_18.3.4.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_18.1.9.bb => mesa_18.3.4.bb} (69%) diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch index a50d2a2ba2..e765356fe1 100644 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch @@ -1,7 +1,7 @@ -From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 +From 7338667148cb7fcefee76b27359bc1e11656c132 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 15 Nov 2016 15:20:49 +0200 -Subject: [PATCH 1/6] Simplify wayland-scanner lookup +Subject: [PATCH 1/5] Simplify wayland-scanner lookup Organization: O.S. Systems Software LTDA. Don't use pkg-config to lookup the path of a binary that's in the path. @@ -13,20 +13,24 @@ Upstream-Status: Pending Signed-off-by: Jussi Kukkonen Signed-off-by: Otavio Salvador --- - configure.ac | 7 +-- - 1 file changed, 1 insertion(+), 6 deletions(-) + configure.ac | 11 +-- + 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac -index 14f1af2b2f..916d0bd207 100644 +index cd9ff259fad..cbc455e130f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1825,12 +1825,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) +@@ -1841,16 +1841,7 @@ for plat in $platforms; do + fi WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') +-PKG_CHECK_EXISTS([wayland-scanner >= 1.15], +- AC_SUBST(SCANNER_ARG, 'private-code'), +- AC_SUBST(SCANNER_ARG, 'code')) +- -if test "x$WAYLAND_SCANNER" = x; then -AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -fi @@ -35,5 +39,5 @@ index 14f1af2b2f..916d0bd207 100644 if test "x$WAYLAND_SCANNER" = "x:"; then AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) -- -2.18.0 +2.20.1 diff --git a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch index ffb3bf7a63..12dca61e19 100644 --- a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch +++ b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch @@ -1,7 +1,7 @@ -From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001 +From 34c3d07b67e6c08f555473a86ff158951abb6000 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 16 Aug 2017 18:58:20 -0700 -Subject: [PATCH 2/6] winsys/svga/drm: Include sys/t
[OE-core] [PATCH v3 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
Instead of using a native specific packageconfig option, we now set the swrast as the supported driver. Currently the native version does not build any dri drivers at all. This is intentional: mesa-native is used only by virgl, so was made the most minimal possible configuration for mesa-native so that a) virgl works; and b) build time is as short as possible. There are two swrast drivers, one dri-based, another gallium-based. Autotools lets you build both, meson forces you to choose. Thus DRIDRIVERS = "swrast" is only set for _native, as for _target we get the gallium driver instead. See discussion here [1] Based on https://patchwork.openembedded.org/patch/158748/ [1] https://patchwork.openembedded.org/patch/158806/ Signed-off-by: Fabio Berton --- meta/recipes-graphics/mesa/mesa.inc | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index b9870eb6ad..4c902b8156 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " -PACKAGECONFIG_class-native ?= "gbm dri-native egl" -PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl" +PACKAGECONFIG_class-native ?= "gbm dri egl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" @@ -61,13 +61,12 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS = "swrast" -DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" +DRIDRIVERS_class-native = "swrast" +DRIDRIVERS_class-nativesdk = "swrast" +DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" +DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm" -# On the native builds we use host's dri drivers -PACKAGECONFIG[dri-native] = "--enable-dri, , xorgproto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, Feb 20, 2019 at 5:22 AM Alexander Kanavin wrote: > > On Wed, 20 Feb 2019 at 08:58, Richard Purdie > wrote: > > > I guess xrandr needs to be in X11_DEPS, this was added in the > > > original > > > mega-patch, but overlooked in the split version. > > > > There were failures all over the autobuilder from this as well :( > > That's why I still think it would've been better just to test and > merge the original all-in-one patch, with follow up patches if > necessary. Doing this split and delaying meson into 19.0 is just more > overhead and work for everyone. Patches should be logical units and a "do all once" is wrong. We are doing the fixes so it is not adding overhead. -- 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
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, Feb 20, 2019 at 4:58 AM Richard Purdie wrote: > > On Wed, 2019-02-20 at 08:52 +0100, Alexander Kanavin wrote: > > I guess xrandr needs to be in X11_DEPS, this was added in the > > original > > mega-patch, but overlooked in the split version. > > There were failures all over the autobuilder from this as well :( Please provider the links so we fix them. -- 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
Re: [OE-core] [PATCH 1/3] kmod: upgrade to 26
On Wed, 2019-02-20 at 11:14 +0200, Adrian Bunk wrote: > On Wed, Feb 20, 2019 at 09:40:35AM +0800, Chen Qi wrote: > > ... > > --- a/meta/recipes-kernel/kmod/kmod.inc > > +++ b/meta/recipes-kernel/kmod/kmod.inc > > @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = " > > file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ > > " > > inherit autotools gtk-doc pkgconfig manpages > > > > -SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb" > > +SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f" > > # Lookout for PV bump too when SRCREV is changed > > -PV = "25+git${SRCPV}" > > +PV = "26+git${SRCPV}" > > ... > > Shouldn't this be PV = "26" when the commit is exactly the release? Well spotted. I was going to ask for a v2 but messed up the patch merging by confusing two patches. End result was I merged a fix for it, thanks. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] python3-six: upgrade 1.11.0 -> 1.12.0
The license checksum changed due to a change in copyright years only. Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-six.inc | 6 +++--- .../python/{python3-six_1.11.0.bb => python3-six_1.12.0.bb} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-six_1.11.0.bb => python3-six_1.12.0.bb} (100%) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index c77498457d5..c706dcaf25d 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -2,10 +2,10 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "https://pypi.python.org/pypi/six/"; SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35cec5bf04dd0820d0a18533ea7c774a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83e0f622bd5ac7d575dbd83d094d69b5" -SRC_URI[md5sum] = "d12789f9baf7e9fb2524c0c64f1773f8" -SRC_URI[sha256sum] = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9" +SRC_URI[md5sum] = "9ae5d1feed8c0215f4ae4adcd9207fcb" +SRC_URI[sha256sum] = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" inherit pypi diff --git a/meta/recipes-devtools/python/python3-six_1.11.0.bb b/meta/recipes-devtools/python/python3-six_1.12.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-six_1.11.0.bb rename to meta/recipes-devtools/python/python3-six_1.12.0.bb -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] python3-pip: upgrade 18.0 -> 19.0.2
The license checksum changed due to copyright year changes. Signed-off-by: Richard Purdie --- .../python/{python3-pip_18.0.bb => python3-pip_19.0.2.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-pip_18.0.bb => python3-pip_19.0.2.bb} (71%) diff --git a/meta/recipes-devtools/python/python3-pip_18.0.bb b/meta/recipes-devtools/python/python3-pip_19.0.2.bb similarity index 71% rename from meta/recipes-devtools/python/python3-pip_18.0.bb rename to meta/recipes-devtools/python/python3-pip_19.0.2.bb index 3fcdb8014ac..d81a60caa2b 100644 --- a/meta/recipes-devtools/python/python3-pip_18.0.bb +++ b/meta/recipes-devtools/python/python3-pip_19.0.2.bb @@ -2,12 +2,12 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" HOMEPAGE = "https://pypi.python.org/pypi/pip"; SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=593c6cd9d639307226978cbcae61ad4b" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "52f75ceb21e96c258f289859a2996b60" -SRC_URI[sha256sum] = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76" +SRC_URI[md5sum] = "526fd9ec1e6ea956b3571ebfb42cf83c" +SRC_URI[sha256sum] = "f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5" inherit pypi distutils3 -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] python3-setuptools: upgrade 40.0.0 -> 40.8.0
Signed-off-by: Richard Purdie --- ...nditionally-do-not-fetch-code-by-easy_install.patch | 10 -- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- ...etuptools_40.0.0.bb => python-setuptools_40.8.0.bb} | 0 ...tuptools_40.0.0.bb => python3-setuptools_40.8.0.bb} | 0 4 files changed, 6 insertions(+), 8 deletions(-) rename meta/recipes-devtools/python/{python-setuptools_40.0.0.bb => python-setuptools_40.8.0.bb} (100%) rename meta/recipes-devtools/python/{python3-setuptools_40.0.0.bb => python3-setuptools_40.8.0.bb} (100%) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 4b179218804..169d1b155bd 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001 +From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -9,15 +9,16 @@ internet by easy_install. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + --- setuptools/command/easy_install.py | 5 + 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 85ee40f..7eb9d2a 100755 +index 05508ce..945e118 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -637,6 +637,11 @@ class easy_install(Command): +@@ -640,6 +640,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False): @@ -29,6 +30,3 @@ index 85ee40f..7eb9d2a 100755 if not self.editable: self.install_site_py() --- -2.7.4 - diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 315ba313965..9092d7ad03a 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829" -SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" +SRC_URI[md5sum] = "712697a5bc975cf479d487cd68206c20" +SRC_URI[sha256sum] = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python-setuptools_40.0.0.bb b/meta/recipes-devtools/python/python-setuptools_40.8.0.bb similarity index 100% rename from meta/recipes-devtools/python/python-setuptools_40.0.0.bb rename to meta/recipes-devtools/python/python-setuptools_40.8.0.bb diff --git a/meta/recipes-devtools/python/python3-setuptools_40.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_40.8.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_40.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_40.8.0.bb -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] python3-pbr: upgrade 5.1.1 -> 5.1.2
Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3-pbr_5.1.1.bb | 5 - meta/recipes-devtools/python/python3-pbr_5.1.2.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pbr_5.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-pbr_5.1.2.bb diff --git a/meta/recipes-devtools/python/python3-pbr_5.1.1.bb b/meta/recipes-devtools/python/python3-pbr_5.1.1.bb deleted file mode 100644 index 95d3d2bd4f3..000 --- a/meta/recipes-devtools/python/python3-pbr_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-pbr.inc -SRC_URI[md5sum] = "dbc94417a8ff0432d6244501a7f1bd49" -SRC_URI[sha256sum] = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68" - diff --git a/meta/recipes-devtools/python/python3-pbr_5.1.2.bb b/meta/recipes-devtools/python/python3-pbr_5.1.2.bb new file mode 100644 index 000..7ba1d035352 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pbr_5.1.2.bb @@ -0,0 +1,5 @@ +inherit setuptools3 +require python-pbr.inc +SRC_URI[md5sum] = "bea55678345bd77b4ff5b2ebb729fd6d" +SRC_URI[sha256sum] = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b" + -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] python3-gitdb: upgrade 2.0.4 -> 2.0.5
Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-gitdb.inc | 4 ++-- .../python/{python3-gitdb_2.0.4.bb => python3-gitdb_2.0.5.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-gitdb_2.0.4.bb => python3-gitdb_2.0.5.bb} (100%) diff --git a/meta/recipes-devtools/python/python-gitdb.inc b/meta/recipes-devtools/python/python-gitdb.inc index aeaf55e610b..633752fd1b0 100644 --- a/meta/recipes-devtools/python/python-gitdb.inc +++ b/meta/recipes-devtools/python/python-gitdb.inc @@ -8,8 +8,8 @@ inherit pypi PYPI_PACKAGE = "gitdb2" -SRC_URI[md5sum] = "6e21f5795a204f7afecb0a72fff66932" -SRC_URI[sha256sum] = "bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044" +SRC_URI[md5sum] = "94e59e5fb00960541f6e137b1456ab0a" +SRC_URI[sha256sum] = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2" DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap" diff --git a/meta/recipes-devtools/python/python3-gitdb_2.0.4.bb b/meta/recipes-devtools/python/python3-gitdb_2.0.5.bb similarity index 100% rename from meta/recipes-devtools/python/python3-gitdb_2.0.4.bb rename to meta/recipes-devtools/python/python3-gitdb_2.0.5.bb -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] wic creates ext4 images that read really slow in u-boot
On 19/02/2019 20:45, Leon Woestenberg wrote: > Hello all, > > On Tue, Feb 19, 2019 at 8:28 PM Andre McCurdy wrote: >> On Tue, Feb 19, 2019 at 9:13 AM Leon Woestenberg wrote: >>> >>> Hello Mike, >>> >>> sounds familiar. >>> >>> On Tue, 19 Feb 2019 at 17:55, Mike Looijmans >>> wrote: Took me a while to figure out why my board took 90 seconds to boot suddenly. The issue turned out to be the ext4 partition created by wic. >>> >>> I suspect it's not WIC's fault. ZynqMP> load mmc 0:2 0x10 /lib/firmware/fpga.bin 19311092 bytes read in 85529 ms (219.7 KiB/s) Now if I boot the board rename and copy that file onto itself, then it's suddenly normal again when I reboot the board: ZynqMP> load mmc 0:2 0x1 I'm not knowledgeable on ext4, so any ideas what's being passed onto the image creation tool that causes this? >>> >>> I suspect your version of U-Boot does not handle files spread across >>> multiple filesystems (allocation) extends efficiently. >>> >>> Copying the file makes the copy being layed out in one extend probably. >> >> >> If WIC is generating filesystem images from scratch there's no excuse for >> files to be unnecessarily fragmented. >> >> Even if some of all of the boot time can be recovered by a patch to u-boot >> that won't help systems which have already been deployed and don't have a >> way to update the bootloader. >> > I am not sure if "fragmented" is the right term in terms of filesystem > details. Filesystem allocation extents (not "extends" as I mistyped > earlier) are different from heavy file fragmentation. However, I agree > things can be made more optimal. > > So, with adding the above, there are *two* issues at play here: > 1) Most/older versions of U-Boot not able to efficiently load files > from ext4 filesystems, that cross multiple extents. I am aware of two > fixes, see below. > 2) WIC uses mkext4fs in such a way that files can cross multiple > (allocation) extents. This is sub-optimal and know to cause issues > with many U-Boot versions (deployed on existing systems in the field). > The problems shows "randomly" with large files being deployed to the > ext4 filesystem. We (OE/Yocto) may want to fix this. > >>> I am aware of two fixes for U-Boot. I will look them up, and reply again to >>> this thread. > > Google for these two commits. I cherry-picked the first one for my > project and can confirm it brings back the desired performance. (Still > assuming this is the identical cause as for TO/Mike.) > > commit 855b8e4f9f255415a7753819e392e4b5d984f35c > Author: Matt Madison > Date: Sat Aug 19 08:46:46 2017 -0700 > > ext4: cache extent blocks during file reads > > A simpler and less-efficient approach to solving > the problem with extent index blocks than what > was in fc0fc50f38a4d7d0554558076a79dfe8b0d78cd5, > but one that does not break write operations. > > Signed-off-by: Matt Madison > > Regards, > > Leon. > > p.s. excuse the earlier HTML mail with signature > I can concur that I have also used this patch to fix speed issues with ext4 reads. The problem becomes particularly prominent when you have large files on a small partition which get over-written. I'm sure I have seen a patch go into uboot mainline recently which improved performance but I can't find it or it never actually made it into the tree. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] kmod: upgrade to 26
On Wed, Feb 20, 2019 at 09:40:35AM +0800, Chen Qi wrote: >... > --- a/meta/recipes-kernel/kmod/kmod.inc > +++ b/meta/recipes-kernel/kmod/kmod.inc > @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ > " > inherit autotools gtk-doc pkgconfig manpages > > -SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb" > +SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f" > # Lookout for PV bump too when SRCREV is changed > -PV = "25+git${SRCPV}" > +PV = "26+git${SRCPV}" >... Shouldn't this be PV = "26" when the commit is exactly the release? 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
[OE-core] [PATCH] libsndfile1: Security fix CVE-2018-19432
From: Changqing Li Signed-off-by: Changqing Li --- .../libsndfile/libsndfile1/CVE-2018-19432.patch| 115 + .../libsndfile/libsndfile1_1.0.28.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19432.patch diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19432.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19432.patch new file mode 100644 index 000..8ded2c0 --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19432.patch @@ -0,0 +1,115 @@ +From 6f3266277bed16525f0ac2f0f03ff4626f1923e5 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Thu, 8 Mar 2018 18:00:21 +1100 +Subject: [PATCH] Fix max channel count bug + +The code was allowing files to be written with a channel count of exactly +`SF_MAX_CHANNELS` but was failing to read some file formats with the same +channel count. + +Upstream-Status: Backport [https://github.com/erikd/libsndfile/ +commit/6f3266277bed16525f0ac2f0f03ff4626f1923e5] + +CVE: CVE-2018-19432 + +Signed-off-by: Changqing Li + +--- + src/aiff.c |6 +++--- + src/rf64.c |4 ++-- + src/w64.c |4 ++-- + src/wav.c |4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/aiff.c b/src/aiff.c +index fbd43cb..6386bce 100644 +--- a/src/aiff.c b/src/aiff.c +@@ -1,5 +1,5 @@ + /* +-** Copyright (C) 1999-2016 Erik de Castro Lopo ++** Copyright (C) 1999-2018 Erik de Castro Lopo + ** Copyright (C) 2005 David Viens + ** + ** This program is free software; you can redistribute it and/or modify +@@ -950,7 +950,7 @@ aiff_read_header (SF_PRIVATE *psf, COMM_ + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + +- if (psf->sf.channels >= SF_MAX_CHANNELS) ++ if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + + if (! (found_chunk & HAVE_FORM)) +@@ -1030,7 +1030,7 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, C + psf_log_printf (psf, " Sample Rate : %d\n", samplerate) ; + psf_log_printf (psf, " Frames : %u%s\n", comm_fmt->numSampleFrames, (comm_fmt->numSampleFrames == 0 && psf->filelength > 104) ? " (Should not be 0)" : "") ; + +- if (comm_fmt->numChannels < 1 || comm_fmt->numChannels >= SF_MAX_CHANNELS) ++ if (comm_fmt->numChannels < 1 || comm_fmt->numChannels > SF_MAX_CHANNELS) + { psf_log_printf (psf, " Channels: %d (should be >= 1 and < %d)\n", comm_fmt->numChannels, SF_MAX_CHANNELS) ; + return SFE_CHANNEL_COUNT_BAD ; + } ; +diff --git a/src/rf64.c b/src/rf64.c +index d57f0f3..876cd45 100644 +--- a/src/rf64.c b/src/rf64.c +@@ -1,5 +1,5 @@ + /* +-** Copyright (C) 2008-2017 Erik de Castro Lopo ++** Copyright (C) 2008-2018 Erik de Castro Lopo + ** Copyright (C) 2009 Uli Franke + ** + ** This program is free software; you can redistribute it and/or modify +@@ -382,7 +382,7 @@ rf64_read_header (SF_PRIVATE *psf, int * + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + +- if (psf->sf.channels >= SF_MAX_CHANNELS) ++ if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + + /* WAVs can be little or big endian */ +diff --git a/src/w64.c b/src/w64.c +index 939b716..a37d2c5 100644 +--- a/src/w64.c b/src/w64.c +@@ -1,5 +1,5 @@ + /* +-** Copyright (C) 1999-2016 Erik de Castro Lopo ++** Copyright (C) 1999-2018 Erik de Castro Lopo + ** + ** This program is free software; you can redistribute it and/or modify + ** it under the terms of the GNU Lesser General Public License as published by +@@ -383,7 +383,7 @@ w64_read_header(SF_PRIVATE *psf, int *b + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + +- if (psf->sf.channels >= SF_MAX_CHANNELS) ++ if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + + psf->endian = SF_ENDIAN_LITTLE ;/* All W64 files are little endian. */ +diff --git a/src/wav.c b/src/wav.c +index 7bd97bc..dc97545 100644 +--- a/src/wav.c b/src/wav.c +@@ -1,5 +1,5 @@ + /* +-** Copyright (C) 1999-2016 Erik de Castro Lopo ++** Copyright (C) 1999-2018 Erik de Castro Lopo + ** Copyright (C) 2004-2005 David Viens + ** + ** This program is free software; you can redistribute it and/or modify +@@ -627,7 +627,7 @@ wav_read_header(SF_PRIVATE *psf, int *b + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + +- if (psf->sf.channels >= SF_MAX_CHANNELS) ++ if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + + if (format != WAVE_FORMAT_PCM && (parsestage & HAVE_fact) == 0) +-- +1.7.9.5 + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 13248f5..9700f4a 100644 --- a/
Re: [OE-core] How to include fitImage-initramfs in rootfs image
On 24/01/2019 09:15, Robert Yang wrote: On 1/24/19 3:56 PM, Richard Leitner wrote: On 24/01/2019 08:52, Robert Yang wrote: On 1/24/19 3:31 PM, Robert Yang wrote: On 1/24/19 3:09 PM, Richard Leitner wrote: Hi, I'm currently facing issues on how to include a fitImage with devicetrees and a INITRAMFS_IMAGE in my rootfs image. I think that set both INITRAMFS_IMAGE and INITRAMFS_IMAGE_BUNDLE should work, you have set INITRAMFS_IMAGE, so also set: INITRAMFS_IMAGE_BUNDLE = "1" That was also my first thought, but unfortunately this doesn't work. There's still one fitImage and one fitImage-initramfs-mine in the deploy dir and the one included in the rootfs image has the same checksum and size as the fitImage without the initramfs. Try: $ bitbake virtual/kernel -e >kernel.py And check INITRAMFS_IMAGE_NAME in kernel.py, make sure it contains initramfs-mine, and try: The INITRAMFS_IMAGE_NAME is set correctly. $ bitbake virtual/kernel -ccleansstate $ bitbake Nonetheless unfortunately the image still includes the fitImage without initramfs... Any further ideas? Thank you! // Robert regards;Richard.L -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/3] mesa: Update 18.1.9 -> 18.3.4
On Wed, 20 Feb 2019 at 08:58, Richard Purdie wrote: > > I guess xrandr needs to be in X11_DEPS, this was added in the > > original > > mega-patch, but overlooked in the split version. > > There were failures all over the autobuilder from this as well :( That's why I still think it would've been better just to test and merge the original all-in-one patch, with follow up patches if necessary. Doing this split and delaying meson into 19.0 is just more overhead and work for everyone. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core