Re: [OE-core] [PATCH] asciidoc: use Python 3 port
On Wed, Mar 27, 2019 at 7:20 AM Ross Burton wrote: > > There's a sort-of-official port of asciidoc to Python 3. Whilst the official > replacement is asciidoctor which is rewritten in Ruby, this is a fairly > trivial > swap and removes Python 2 from core-image-sato builds entirely. > > Moving forward we should evaluate asciidoctor, but that can wait. > > Change the RDEPENDS so that python3 is only a dependency for target and > nativesdk builds, for native this can use the host python3. > > Remove redundant DESTDIR export that isn't needed. > its failing on my archlinux builder, ideas ? https://errors.yoctoproject.org/Errors/Details/234833/ https://errors.yoctoproject.org/Errors/Details/234829/ > Signed-off-by: Ross Burton > --- > meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 - > 1 file changed, 12 insertions(+), 9 deletions(-) > > diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > index 38164d55735..d0d15171ac4 100644 > --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb > @@ -8,17 +8,20 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ > file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" > > -SRC_URI = > "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"; > -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a" > -SRC_URI[sha256sum] = > "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0" > +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https" > +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" > +PV .= "+py3-git${SRCPV}" > > -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"; > +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native" > > +S = "${WORKDIR}/git" > + > +# Not using automake > inherit autotools-brokensep > +CLEANBROKEN = "1" > > -export DESTDIR = "${D}" > -DEPENDS_class-native = "docbook-xml-dtd4-native" > -RDEPENDS_${PN} += "python" > -BBCLASSEXTEND = "native" > +# target and nativesdk needs python3, but for native we can use the host. > +RDEPENDS_${PN} += "python3" > +RDEPENDS_remove_class-native = "python3" > > -CLEANBROKEN = "1" > +BBCLASSEXTEND = "native nativesdk" > -- > 2.11.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston: upgrade 5.0.0 -> 6.0.0
From: Denys Dmytriyenko Note: 6.0.0 is the last one to support autotools (needs explicit configure option), newer versions will only support meson. Signed-off-by: Denys Dmytriyenko --- meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} (96%) diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb b/meta/recipes-graphics/wayland/weston_6.0.0.bb similarity index 96% rename from meta/recipes-graphics/wayland/weston_5.0.0.bb rename to meta/recipes-graphics/wayland/weston_6.0.0.bb index e517109..fa08dac 100644 --- a/meta/recipes-graphics/wayland/weston_5.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_6.0.0.bb @@ -12,8 +12,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb" -SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf" +SRC_URI[md5sum] = "7c634e262f8a464a076c97fd50ad36b3" +SRC_URI[sha256sum] = "546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"; @@ -28,6 +28,7 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OECONF = "--enable-setuid-install \ --disable-rdp-compositor \ +--enable-autotools \ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python: improve ptest
On 3/29/19 3:49 PM, Ross Burton wrote: > Add missing runtime dependencies: the test suite needs proper chmod from > coreutils, and the Europe/Minsk timezone. > > Also change run-ptest to use -W (run verbosely on failure) instead of -v > (always > verbose) to hopefully reduce the noise in the ptest reports. with backport? - armin > Signed-off-by: Ross Burton > --- > meta/recipes-devtools/python/python/run-ptest | 2 +- > meta/recipes-devtools/python/python3/run-ptest | 2 +- > meta/recipes-devtools/python/python3_3.7.2.bb | 2 +- > meta/recipes-devtools/python/python_2.7.15.bb | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-devtools/python/python/run-ptest > b/meta/recipes-devtools/python/python/run-ptest > index 832551a1244..13dfc99efd5 100644 > --- a/meta/recipes-devtools/python/python/run-ptest > +++ b/meta/recipes-devtools/python/python/run-ptest > @@ -1,3 +1,3 @@ > #!/bin/sh > > -python -m test.regrtest -v | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. > [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. > ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. > skipped//g' > +python -mtest -W | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. > [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. > ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. > skipped//g' > diff --git a/meta/recipes-devtools/python/python3/run-ptest > b/meta/recipes-devtools/python/python3/run-ptest > index 3863c6d314f..20c9274dfa7 100644 > --- a/meta/recipes-devtools/python/python3/run-ptest > +++ b/meta/recipes-devtools/python/python3/run-ptest > @@ -1,3 +1,3 @@ > #!/bin/sh > > -python3 -m test -v | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. > [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. > ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. > skipped//g' > +python3 -m test -W | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. > [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. > ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. > skipped//g' > diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb > b/meta/recipes-devtools/python/python3_3.7.2.bb > index 4d10986f3b7..5c64bc8aa2a 100644 > --- a/meta/recipes-devtools/python/python3_3.7.2.bb > +++ b/meta/recipes-devtools/python/python3_3.7.2.bb > @@ -284,7 +284,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} > ${libdir}/python${PYTHON_MA > PACKAGES += "${PN}-man" > FILES_${PN}-man = "${datadir}/man" > > -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc" > +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc > tzdata-europe coreutils" > RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', > '', d)}" > RDEPENDS_${PN}-dev = "" > > diff --git a/meta/recipes-devtools/python/python_2.7.15.bb > b/meta/recipes-devtools/python/python_2.7.15.bb > index 3e1af4baf63..c459af06f10 100644 > --- a/meta/recipes-devtools/python/python_2.7.15.bb > +++ b/meta/recipes-devtools/python/python_2.7.15.bb > @@ -176,7 +176,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" > RDEPENDS_${PN}-modules += "${PN}-misc" > > # ptest > -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip" > +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip tzdata-europe > coreutils" > RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', > '', d)}" > # catch manpage > PACKAGES += "${PN}-man" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python: improve ptest
Add missing runtime dependencies: the test suite needs proper chmod from coreutils, and the Europe/Minsk timezone. Also change run-ptest to use -W (run verbosely on failure) instead of -v (always verbose) to hopefully reduce the noise in the ptest reports. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python/run-ptest | 2 +- meta/recipes-devtools/python/python3/run-ptest | 2 +- meta/recipes-devtools/python/python3_3.7.2.bb | 2 +- meta/recipes-devtools/python/python_2.7.15.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python/run-ptest b/meta/recipes-devtools/python/python/run-ptest index 832551a1244..13dfc99efd5 100644 --- a/meta/recipes-devtools/python/python/run-ptest +++ b/meta/recipes-devtools/python/python/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python -m test.regrtest -v | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' +python -mtest -W | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' diff --git a/meta/recipes-devtools/python/python3/run-ptest b/meta/recipes-devtools/python/python3/run-ptest index 3863c6d314f..20c9274dfa7 100644 --- a/meta/recipes-devtools/python/python3/run-ptest +++ b/meta/recipes-devtools/python/python3/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python3 -m test -v | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' +python3 -m test -W | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.2.bb index 4d10986f3b7..5c64bc8aa2a 100644 --- a/meta/recipes-devtools/python/python3_3.7.2.bb +++ b/meta/recipes-devtools/python/python3_3.7.2.bb @@ -284,7 +284,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MA PACKAGES += "${PN}-man" FILES_${PN}-man = "${datadir}/man" -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc" +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc tzdata-europe coreutils" RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" RDEPENDS_${PN}-dev = "" diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index 3e1af4baf63..c459af06f10 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb @@ -176,7 +176,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" RDEPENDS_${PN}-modules += "${PN}-misc" # ptest -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip" +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip tzdata-europe coreutils" RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" # catch manpage PACKAGES += "${PN}-man" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-devsrc: fix /usr/src/kernel symlink to also work for SDK
If kernel-devsrc is used in a SDK context, the symlink from usr/src/kernel points to an absolute path '/lib/modules/${KERNEL_VERSION}/build', which ends up pointing to the local machine's build directory. To address this issue change the symlink to be realtive to ${D}/lib/modules/${KERNEL_VERSION}/build. Signed-off-by: Henrik Nymann Jensen --- meta/recipes-kernel/linux/kernel-devsrc.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 6daeea4f7a..69a8eaef81 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -48,7 +48,7 @@ do_install() { mkdir -p ${D}/usr/src ( cd ${D}/usr/src - ln -s ${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel + lnr ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel ) # for on target purposes, we unify build and source -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][master][PATCH v3 2/3] devtool/standard.py: Create a copy of kernel source within work-shared if not present
If kernel source is not already downloaded i.e staging kernel dir is empty, place a copy of the source when the user runs devtool modify linux-yocto. This way the kernel source is available for other packages that use it. [YOCTO #10416] Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Alejandro Enedino Hernandez Samaniego --- scripts/lib/devtool/standard.py | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 2338135..dc15c89 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -476,6 +476,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works """Extract sources of a recipe""" import oe.recipeutils import oe.patch +import oe.path pn = d.getVar('PN') @@ -572,7 +573,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works with open(preservestampfile, 'w') as f: f.write(d.getVar('STAMP')) try: -if bb.data.inherits_class('kernel-yocto', d): +if is_kernel_yocto: # We need to generate the kernel config task = 'do_configure' else: @@ -599,6 +600,18 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works raise DevtoolError('Something went wrong with source extraction - the devtool-source class was not active or did not function correctly:\n%s' % str(e)) srcsubdir_rel = os.path.relpath(srcsubdir, os.path.join(tempdir, 'workdir')) +# Check if work-shared is empty, if yes +# find source and copy to work-shared +if is_kernel_yocto: + workshareddir = d.getVar('STAGING_KERNEL_DIR') + staging_kerVer = get_staging_kver(workshareddir) + kernelVersion = d.getVar('LINUX_VERSION') + if (os.path.exists(workshareddir) and (not os.listdir(workshareddir) or kernelVersion!=staging_kerVer)): + shutil.rmtree(workshareddir) + oe.path.copyhardlinktree(srcsubdir,workshareddir) + elif (not os.path.exists(workshareddir)): + oe.path.copyhardlinktree(srcsubdir,workshareddir) + tempdir_localdir = os.path.join(tempdir, 'oe-local-files') srctree_localdir = os.path.join(srctree, 'oe-local-files') -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libcomps: put PV in filename
2019. 03. 26. 0:44 keltezéssel, Ross Burton írta: This isn't a git snapshot recipe but a release that is fetched over it. For clarity, put the PV in the filename. Signed-off-by: Ross Burton --- meta/recipes-devtools/libcomps/{libcomps_git.bb => libcomps_0.1.10.bb} | 1 - 1 file changed, 1 deletion(-) rename meta/recipes-devtools/libcomps/{libcomps_git.bb => libcomps_0.1.10.bb} (98%) diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.10.bb similarity index 98% rename from meta/recipes-devtools/libcomps/libcomps_git.bb rename to meta/recipes-devtools/libcomps/libcomps_0.1.10.bb index ff6820851fe..1c4f3bde65e 100644 --- a/meta/recipes-devtools/libcomps/libcomps_git.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.10.bb @@ -9,7 +9,6 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Add-crc32.c-to-sources-list.patch \ " -PV = "0.1.10" # opkg compare-version git "<=" 0.1.10 ; echo $? 1 # opkg compare-version git "<=" 1:0.1.10 ; echo $? 0 You need to increase PE to be able to upgrade the new recipe in case you publish this package in a repository. Best regards, Zoltán Böszörményi SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243" S = "${WORKDIR}/git" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libcomps: put PV in filename
2019. 03. 29. 19:45 keltezéssel, Böszörményi Zoltán írta: 2019. 03. 26. 0:44 keltezéssel, Ross Burton írta: This isn't a git snapshot recipe but a release that is fetched over it. For clarity, put the PV in the filename. Signed-off-by: Ross Burton --- meta/recipes-devtools/libcomps/{libcomps_git.bb => libcomps_0.1.10.bb} | 1 - 1 file changed, 1 deletion(-) rename meta/recipes-devtools/libcomps/{libcomps_git.bb => libcomps_0.1.10.bb} (98%) diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.10.bb similarity index 98% rename from meta/recipes-devtools/libcomps/libcomps_git.bb rename to meta/recipes-devtools/libcomps/libcomps_0.1.10.bb index ff6820851fe..1c4f3bde65e 100644 --- a/meta/recipes-devtools/libcomps/libcomps_git.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.10.bb @@ -9,7 +9,6 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Add-crc32.c-to-sources-list.patch \ " -PV = "0.1.10" # opkg compare-version git "<=" 0.1.10 ; echo $? 1 # opkg compare-version git "<=" 1:0.1.10 ; echo $? 0 You need to increase PE to be able to upgrade the new recipe in case you publish this package in a repository. Sorry, dumb comment, ignore it. PV was overridden inside the recipe. Best regards, Zoltán Böszörményi SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243" S = "${WORKDIR}/git" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 15:33, Andreas Müller wrote: > Hope adwaita-icon packs remain complete / have librsvg from elsewhere > in my images. The theme itself doesn't mean pulling in librsvg. Whatever is using the icons is responsible for that, so if you're using something GNOMEy then that's gdk-pixbuf + librsvg. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, Mar 29, 2019 at 3:54 PM Burton, Ross wrote: > > On Fri, 29 Mar 2019 at 14:51, Andreas Müller wrote: > > * The patch you just sent: Doesn't adwaita-icon-theme need a rdepend > > on librsvg then? If so it is another allarch rdepending on arch > > recipe... > > RDEPEND? No. The theme just contains PNGs and SVGs. > > Ross Ehm but .. no let's not continue this. Hope adwaita-icon packs remain complete / have librsvg from elsewhere in my images. Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][master][PATCH v3 1/3] devtool/standard.py: Update devtool modify to copy source from work-shared if its already downloaded
In the regular devtool modify flow, the kernel source is fetched by running do_fetch task. This is an overhead in time and space. This patch updates modify command to check if the kernel source is already downloaded. If so, then instead of calling do_fetch, copy the source from work-shared to devtool workspace by creating hard links else run the usual devtool modify flow and call do_fetch task. [YOCTO #10416] Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Alejandro Enedino Hernandez Samaniego --- scripts/lib/devtool/standard.py | 94 + 1 file changed, 94 insertions(+) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index ea09bbf..2338135 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -717,11 +717,31 @@ def _check_preserve(config, recipename): tf.write(line) os.rename(newfile, origfile) +def get_staging_kver(srcdir): + #Kernel version from work-shared + kerver = [] + staging_kerVer="" + if os.path.exists(srcdir) and os.listdir(srcdir): +with open(os.path.join(srcdir,"Makefile")) as f: + version = [next(f) for x in range(5)][1:4] + for word in version: + kerver.append(word.split('= ')[1].split('\n')[0]) + staging_kerVer = ".".join(kerver) + return staging_kerVer + +def get_staging_kbranch(srcdir): + staging_kbranch = "" + if os.path.exists(srcdir) and os.listdir(srcdir): + (branch, _) = bb.process.run('git branch | grep \* | cut -d \' \' -f2', cwd=srcdir) + staging_kbranch = "".join(branch.split('\n')[0]) + return staging_kbranch + def modify(args, config, basepath, workspace): """Entry point for the devtool 'modify' subcommand""" import bb import oe.recipeutils import oe.patch +import oe.path if args.recipename in workspace: raise DevtoolError("recipe %s is already in your workspace" % @@ -763,6 +783,80 @@ def modify(args, config, basepath, workspace): initial_rev = None commits = [] check_commits = False + +if bb.data.inherits_class('kernel-yocto', rd): + #Current set kernel version + kernelVersion = rd.getVar('LINUX_VERSION') + srcdir = rd.getVar('STAGING_KERNEL_DIR') + kbranch = rd.getVar('KBRANCH') + + staging_kerVer = get_staging_kver(srcdir) + staging_kbranch = get_staging_kbranch(srcdir) + if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): + oe.path.copyhardlinktree(srcdir,srctree) + workdir = rd.getVar('WORKDIR') + srcsubdir = rd.getVar('S') + localfilesdir = os.path.join(srctree,'oe-local-files') + # Move local source files into separate subdir + recipe_patches = [os.path.basename(patch) for patch in oe.recipeutils.get_recipe_patches(rd)] + local_files = oe.recipeutils.get_recipe_local_files(rd) + + for key in local_files.copy(): +if key.endswith('scc'): + sccfile = open(local_files[key], 'r') + for l in sccfile: + line = l.split() + if line and line[0] in ('kconf', 'patch'): +cfg = os.path.join(os.path.dirname(local_files[key]), line[-1]) +if not cfg in local_files.values(): +local_files[line[-1]] = cfg +shutil.copy2(cfg, workdir) + sccfile.close() + + # Ignore local files with subdir={BP} + srcabspath = os.path.abspath(srcsubdir) + local_files = [fname for fname in local_files if os.path.exists(os.path.join(workdir, fname)) and (srcabspath == workdir or not os.path.join(workdir, fname).startswith(srcabspath + os.sep))] + if local_files: + for fname in local_files: + _move_file(os.path.join(workdir, fname), os.path.join(srctree, 'oe-local-files', fname)) + with open(os.path.join(srctree, 'oe-local-files', '.gitignore'), 'w') as f: + f.write('# Ignore local files, by default. Remove this file ''if you want to commit the directory to Git\n*\n') + + if os.path.abspath(rd.getVar('S')) == os.path.abspath(rd.getVar('WORKDIR')): + # If recipe extracts to ${WORKDIR}, symlink the files into the srctree + # (otherwise the recipe won't build as expected) +loca
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 15:34, Burton, Ross wrote: > > On Fri, 29 Mar 2019 at 14:29, Andreas Müller wrote: > > Thought same. Are you sure that does not link - or can you explain how > > DEPENDs fixed adwaita: If it does not link: How comes that librsvg > > makes it into adwaita's native sysroot? > > I suspect historical about how the sysroot is populated for native > things, as until very recently RDEPENDS wasn't considered. > > (oe-core c62520b63284927e177831c351fafa4d2768cb1f) There is something I struggle to understand about enabling RDEPENDS for native. RDEPENDS is listing package names, not recipe names. Yet for native recipes, the package list is empty, as set by the native.bbclass. How is this supposed to work then? A reproducer: add RDEPENDS_${PN} = 'libicuio' to libyaml recipe. (libicuio is a package from icu recipe) Then libyaml builds, but libyaml-native fails: ERROR: Nothing RPROVIDES 'libicuio-native' (but virtual:native:/home/alexander/development/poky/meta/recipes-support/libyaml/libyaml_0.2.2.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'libicuio-native' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libicuio-native'] ERROR: Required build target 'libyaml-native' has no buildable providers. Missing or unbuildable dependency chain was: ['libyaml-native', 'libicuio-native'] Should I file a bug? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 14:51, Andreas Müller wrote: > * The patch you just sent: Doesn't adwaita-icon-theme need a rdepend > on librsvg then? If so it is another allarch rdepending on arch > recipe... RDEPEND? No. The theme just contains PNGs and SVGs. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, Mar 29, 2019 at 3:34 PM Burton, Ross wrote: > > On Fri, 29 Mar 2019 at 14:29, Andreas Müller wrote: > > Thought same. Are you sure that does not link - or can you explain how > > DEPENDs fixed adwaita: If it does not link: How comes that librsvg > > makes it into adwaita's native sysroot? > > I suspect historical about how the sysroot is populated for native > things, as until very recently RDEPENDS wasn't considered. > > (oe-core c62520b63284927e177831c351fafa4d2768cb1f) > * Think I had this patch in my builds - whatever * The patch you just sent: Doesn't adwaita-icon-theme need a rdepend on librsvg then? If so it is another allarch rdepending on arch recipe... Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 14:29, Andreas Müller wrote: > Thought same. Are you sure that does not link - or can you explain how > DEPENDs fixed adwaita: If it does not link: How comes that librsvg > makes it into adwaita's native sysroot? I suspect historical about how the sysroot is populated for native things, as until very recently RDEPENDS wasn't considered. (oe-core c62520b63284927e177831c351fafa4d2768cb1f) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] gtk-icon-cache: clean up DEPENDS
Instead of using DEPENDS += use _append to ensure that these additions can't get overwritten. Also use gtk+3-native instead gtk-icon-utils-native as that recipe no longer exists and is provided by gtk+3-native for compatibility. Signed-off-by: Ross Burton --- meta/classes/gtk-icon-cache.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index d87167aec09..3572f62ebb6 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -1,8 +1,8 @@ FILES_${PN} += "${datadir}/icons/hicolor" -DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-icon-utils-native" +DEPENDS_append = " ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native" -PACKAGE_WRITE_DEPS += "gtk-icon-utils-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, Mar 29, 2019 at 2:31 PM Burton, Ross wrote: > > On Fri, 29 Mar 2019 at 12:11, Alexander Kanavin > wrote: > > > > On Fri, 29 Mar 2019 at 13:04, Burton, Ross wrote: > > > > > > But GTK+ doesn't depend on librsvg at all, and this is a failure in > > > adwaita-icon-theme. Why doesn't the dependency belong on > > > adwaita-icon-theme? > > > > I believe adwaita runs some utility that gtk provides? > > Sure, but gtk+ doesn't link to librsvg, so a DEPENDS isn't the correct fix. > > Patch incoming. > Thought same. Are you sure that does not link - or can you explain how DEPENDs fixed adwaita: If it does not link: How comes that librsvg makes it into adwaita's native sysroot? Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] Revert "gtk+3: add librsvg to DEPENDS"
This was added so that adwaita-icon-theme can find the SVG loader for icon generation, but the fix is in the wrong place. GTK+ does not depend on librsvg at all, the tool in GTK+ which loads the icons uses gdk-pixbuf which uses loadable modules. This reverts commit 66828ff04d107b7719c9c8857d7c6c2ebf20a8bb. Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index b58641a4702..77b6c31536b 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"; BUGTRACKER = "https://bugzilla.gnome.org/"; SECTION = "libs" -DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf librsvg \ +DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ gdk-pixbuf-native" LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] adwaita-icon-theme: depend on librsvg
adwaita-icon-theme uses gtk-encode-symbolic-svg to generate icons, so DEPEND on librsvg-native (and gtk+3-native, via gtk-icon-cache.bbclass) so that this tool exists and can load SVG files. Signed-off-by: Ross Burton --- meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb index 451ef39f1ad..8eadbd2eef7 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c" inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even - MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ @@ -18,6 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "db3fd812821d72fdd9a3c7d622a95b35" SRC_URI[sha256sum] = "6d752a2b1bc668483956d4485c39cad1642d9358e133ff689526e43674a4e1ce" +DEPENDS += "librsvg-native" + PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" RREPLACES_${PN} = "gnome-icon-theme" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] glibc broken when linked with gold Was: [oe] State of OE World, 2019-03-16
An image built with gold fails on the hardware. I was able to build core-image-minimal with gold enabled: configuration: Build Configuration: BB_VERSION = "1.40.0" BUILD_SYS= "x86_64-linux" NATIVELSBSTRING = "opensuseleap-15.0" TARGET_SYS = "arm-oe-linux-gnueabi" MACHINE = "imx233-olinuxino-maxi" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES= "arm armv5 thumb dsp" TARGET_FPU = "soft" meta-fsl-arm-extra = "master:b4d2c8462220e7038adffc0a151767ef8da07c5d" meta-freescale = "master:08173f472244817b85fe4af8ab2add7a0090b122" meta = "master:aeaca9bb1b1c8bf44818945dc4b2cbd6d4b5cef2" conf/local.conf addition: DISTRO_FEATURES_append = " ld-is-gold" When run, the kernel is unable to run init, and panics: [4.05] Freeing unused kernel memory: 308K [4.05] This architecture does not have kernel memory protection. [4.06] Run /sbin/init as init process [4.12] hub 1-1:1.0: USB hub found [4.13] hub 1-1:1.0: 3 ports detected [4.14] Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b [4.14] CPU: 0 PID: 1 Comm: init Not tainted 5.0.3-fslc+g20d8efe36350 #1 [4.14] Hardware name: Freescale MXS (Device Tree) [4.14] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [4.14] [] (show_stack) from [] (panic+0xec/0x2d8) [4.14] [] (panic) from [] (do_exit+0xa44/0xaa4) [4.14] [] (do_exit) from [] (do_group_exit+0x38/0xbc) [4.14] [] (do_group_exit) from [] (get_signal+0x110/0x98c) [4.14] [] (get_signal) from [] (do_work_pending+0x120/0x5fc) [4.14] [] (do_work_pending) from [] (slow_work_pending+0xc/0x20) [4.14] Exception stack(0xc343dfb0 to 0xc343dff8) [4.14] dfa0: bebd7f10 484113c4 48431fd0 [4.14] dfc0: 0934 00021504 bebd7f0c [4.14] dfe0: 48431fd0 bebd7ed0 48410a40 484113f4 0010 [4.14] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b ]--- -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 12:11, Alexander Kanavin wrote: > > On Fri, 29 Mar 2019 at 13:04, Burton, Ross wrote: > > > > But GTK+ doesn't depend on librsvg at all, and this is a failure in > > adwaita-icon-theme. Why doesn't the dependency belong on > > adwaita-icon-theme? > > I believe adwaita runs some utility that gtk provides? Sure, but gtk+ doesn't link to librsvg, so a DEPENDS isn't the correct fix. Patch incoming. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
On Fri, 29 Mar 2019 at 13:04, Burton, Ross wrote: > > But GTK+ doesn't depend on librsvg at all, and this is a failure in > adwaita-icon-theme. Why doesn't the dependency belong on > adwaita-icon-theme? I believe adwaita runs some utility that gtk provides? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk+3: add librsvg to DEPENDS
But GTK+ doesn't depend on librsvg at all, and this is a failure in adwaita-icon-theme. Why doesn't the dependency belong on adwaita-icon-theme? Ross On Tue, 26 Mar 2019 at 10:30, Andreas Müller wrote: > > adwaita-icon-themes failes to create symbolic icons. In log.do_install when > calling gtk-encode-symbolic-svg there many complaints > > | Can't load file: Unrecognized image file format > > We fail her now due to: > > commit 7f6c57635ff4e1edf7a46c49af34846ad0a4bf73 > Author: Alexander Kanavin > Date: Wed Jan 30 11:59:25 2019 +0100 > > gtk+3: remove the gtk-icon-utils-native recipe > > gtk-icon-utils-native had librsvg in its DEPENDS. We do not add librsvg-native > because same issue would occure for gtk-encode-symbolic-svg on target. > > Signed-off-by: Andreas Müller > --- > meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc > b/meta/recipes-gnome/gtk+/gtk+3.inc > index 77b6c31536..b58641a470 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3.inc > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc > @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"; > BUGTRACKER = "https://bugzilla.gnome.org/"; > SECTION = "libs" > > -DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ > +DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf librsvg \ > gdk-pixbuf-native" > > LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" > -- > 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] gdk-pixbuf: fix run query-loaders fail
On Fri, 29 Mar 2019 at 08:18, Changqing Li wrote: > Upstream replied that: should be xfconf upsteam bug. So this is a > workaround, Yes, that's definitely a xfconf bug. Let's fix it there. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] glibc broken when linked with gold Was: [oe] State of OE World, 2019-03-16
On Thu 2019-03-28 @ 03:40:33 PM, Martin Jansa wrote: > Send for oe-core: > https://patchwork.openembedded.org/patch/159874/ > but more information might be needed before it gets applied to oe-core > as discussed with RP. I'll try to get serial cable working on my Nexus 5 > to test it there in runtime, but maybe someone could beat me to it with > some more easily hackable 32bit arm board. > > > > Can someone confirm that glibc built with gold works for him on arm > > > (I haven't seen this on x86, aarch64)? Or should we just force bfd in > > > oe-core recipe? I have an Olimex imx233-olinuxino-maxi that I build for and test regularly (arm926ej-s, ARMv5). Yesterday I performed two builds from master with the following configuration: Build Configuration: BB_VERSION = "1.40.0" BUILD_SYS= "x86_64-linux" NATIVELSBSTRING = "opensuseleap-15.0" TARGET_SYS = "arm-oe-linux-gnueabi" MACHINE = "imx233-olinuxino-maxi" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES= "arm armv5 thumb dsp" TARGET_FPU = "soft" meta-freescale = "master:08173f472244817b85fe4af8ab2add7a0090b122" meta-fsl-arm-extra = "master:b4d2c8462220e7038adffc0a151767ef8da07c5d" meta = "master:aeaca9bb1b1c8bf44818945dc4b2cbd6d4b5cef2" meta-oe meta-python meta-networking = "master:24dd9328f7ec964bbad25b7061366f9f2ff6194d" Both builds explicitly included gobject-introspection. The first build was done as-is (i.e. using the bfd linker). The second build had the following in conf/local.conf: DISTRO_FEATURES_append = " ld-is-gold" The default build succeeded. The gold build failed as expected while running qemu trying to build gobject-introspection. The good build boots on the hardware and runs fine (as far as I can tell): OpenEmbedded nodistro.0 imx233-olinuxino-maxi ttyAMA0 imx233-olinuxino-maxi login: root root@imx233-olinuxino-maxi:~# uname -a Linux imx233-olinuxino-maxi 5.0.3-fslc+g20d8efe36350 #1 Thu Mar 28 17:09:20 UTC 2019 armv5tejl armv5tejl armv5tejl GNU/Linux root@imx233-olinuxino-maxi:~# g-ir-compiler --help Usage: g-ir-compiler [OPTION?] Help Options: -h, --helpShow help options Application Options: --includedir include directories in GIR search path -o, --output=FILE output file -m, --module=NAME module to compile -l, --shared-library=FILE shared library --debug show debug messages --verbose show verbose messages -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [sumo][PATCH] coreutils: 8.29: fix native build
Hi Armin, On 19.03.19 16:13, akuster808 wrote: On 3/14/19 8:43 AM, Stefan Müller-Klieser wrote: This fixes the native build on glibc 2.28 hosts, by backporting two gnulib patches from master. This will need to be done for Thud too. - armin coreutils 8.30 in thud already carries those patches. Stefan Signed-off-by: Stefan Müller-Klieser --- ...adjust-to-glibc-2.28-libio.h-removal.patch | 193 ++ ...e-more-paranoid-about-libio.h-change.patch | 187 + meta/recipes-core/coreutils/coreutils_8.29.bb | 2 + 3 files changed, 382 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch create mode 100644 meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch diff --git a/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch new file mode 100644 index ..110b34372db1 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -0,0 +1,193 @@ +From 269a8987224ec62b7a9aa6202772b07d5be424d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= +Date: Mon, 11 Mar 2019 16:00:33 +0100 +Subject: [PATCH 1/2] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of patch: +4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Paul Eggert +fflush: adjust to glibc 2.28 libio.h removal + +Upstream-Status: Backport [master] + +Signed-off-by: Stefan Müller-Klieser +--- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c| 2 +- + lib/stdio-impl.h | 6 ++ + 10 files changed, 18 insertions(+), 12 deletions(-) + +diff --git a/lib/fflush.c b/lib/fflush.c +index 4e65692644b1..c16da5fdcf23 100644 +--- a/lib/fflush.c b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/lib/fpending.c +index 5811a4a74750..9e21a165e220 100644 +--- a/lib/fpending.c b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index 408b8fcbb3b8..3a160004d49d 100644 +--- a/lib/fpurge.c b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/lib/freadahead.c +index f335f041ee5e..e7cb77b6722b 100644 +--- a/lib/freadahead.c b/lib/freadahead.c +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile ||
Re: [OE-core] [PATCH] gdk-pixbuf: fix run query-loaders fail
On 3/29/19 2:41 PM, changqing...@windriver.com wrote: From: Changqing Li Reproduce steps: 1. add below config into local.conf IMAGE_INSTALL_append = " packagegroup-xfce-base" DISTRO_FEATURES_append = " polkit" 2. bitbake core-image-minimal do_rootfs failed with below error: qemu-i386 -r 3.2.0 -E LD_LIBRARY_PATH=/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/usr/lib:/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/lib -L /tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs /tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders ** (process:162531): CRITICAL **: 02:10:12.174: Failed to get connection to xfconfd: Cannot autolaunch D-Bus without X11 $DISPLAY Signey-off-by: Changqing Li --- ...001-gdk-pixbuf-fix-run-query-loaders-fail.patch | 59 ++ meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-gdk-pixbuf-fix-run-query-loaders-fail.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-gdk-pixbuf-fix-run-query-loaders-fail.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-gdk-pixbuf-fix-run-query-loaders-fail.patch new file mode 100644 index 000..836dcae --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-gdk-pixbuf-fix-run-query-loaders-fail.patch @@ -0,0 +1,59 @@ +From fa0d2ba51f1ccc848da9ff708c23a76b22c6e764 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 28 Mar 2019 17:27:45 +0800 +Subject: [PATCH] gdk-pixbuf: fix run query-loaders fail + +run query-loaders fail with error: + +** (process:417595): CRITICAL **: 09:21:35.330: Failed to +get connection to xfconfd: Cannot autolaunch D-Bus without X11 $DISPLAY + +Commit https://github.com/GNOME/gdk-pixbuf/commit/49d4becc33ca6bc99199dc845f3413e16eeb7f53 +change method of getting pixbuf_libdir, but call of function g_file_new_for_path +make this error happen, fix by only use g_file_new_for_path for WIN32, +for other platform, still use g_strdup. + +Maybe this fix just like a workaround, and have send upstream for review. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/44] Upstream replied that: should be xfconf upsteam bug. So this is a workaround, and we need to follow the upsteam bug and backport after it is fixed. + +Signed-off-by: Changqing Li +--- + gdk-pixbuf/queryloaders.c | 7 +-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c +index b813d99..59d62f7 100644 +--- a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c +@@ -316,15 +316,14 @@ int main (int argc, char **argv) + GString *contents; + gchar *cache_file = NULL; + gint first_file = 1; +-GFile *pixbuf_libdir_file; + gchar *pixbuf_libdir; + gboolean success = TRUE; + + #ifdef G_OS_WIN32 ++GFile *pixbuf_libdir_file; + gchar *libdir; + GFile *pixbuf_prefix_file; + gchar *pixbuf_prefix; +-#endif + + /* An intermediate GFile here will convert all the path separators + * to the right one used by the platform +@@ -332,6 +331,10 @@ int main (int argc, char **argv) + pixbuf_libdir_file = g_file_new_for_path (PIXBUF_LIBDIR); + pixbuf_libdir = g_file_get_path (pixbuf_libdir_file); + g_object_unref (pixbuf_libdir_file); ++#else ++pixbuf_libdir = g_strdup (PIXBUF_LIBDIR); ++#endif ++ + + #ifdef G_OS_WIN32 + pixbuf_prefix_file = g_file_new_for_path (GDK_PIXBUF_PREFIX); +-- +2.7.4 + diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb index c5de7a9..6435473 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb @@ -20,6 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ file://0001-loaders.cache-depend-on-loaders-being-fully-build.patch \ file://0004-Do-not-run-tests-when-building.patch \ + file://0001-gdk-pixbuf-fix-run-query-loaders-fail.patch \ " SRC_URI_append_class-target = " \ -- BRs Sandy(Li Changqing) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][master][PATCH v3 0/3] Devtool: provide easy means of
This patch series provides support for the user to run menuconfig command in the devtool flow. This would allow the user to modify the current configurations and generate a config fragment to update the recipe using devtool finish. Devtool menuconfig command will work on all packages that contain menuconfig as a task. 1. The implementation checks if devtool menuconfig command is called for a valid package. 2. It checks for oe-local-files dir within source and creates one if needed, this directory is needed to store the final generated config fragment so that devtool finish can update the recipe. 3. Menuconfig command is called for users to make necessary changes. After saving the changes, diffconfig command is run to generate the fragment. Currently, when the user runs devtool modify command, it checks out the entire source tree which is a bit of an over head in time and space. This patch series also provides a way to create a copy(hard links) of the kernel source, if present, from work-shared to workspace to be more efficient . Also, if the kernel source is not present in the staging kernel dir and the user fetches the source tree in workspace using devtool modify, then this patch series creates a copy of source from workspace to work-shared. This is necessary for packages that may use the kernel source. [YOCTO #10416] --- changelog v2 1. Add a check to verify the set kernel version by user and kernel version present in work-shared before creating hard links to workspace. 2. Add a check to verify the set kernel version by user and kernel version present in workspace do not match, when placing a copy of kernel-source from workspace to work-shared. Sai Hari Chandana Kalluri (3): devtool modify: Update devtool modify to copy source from work-shared if its already downloaded. devtool modify: Create a copy of kernel source within work-shared if not present devtool: provide support for devtool menuconfig command. changelog v3 1. Use oe.path.copyhardlinktree() to create copy of source from work-shared to devtool workspace. 2. Split all the changes into appropriate patches. Move all menuconfig command specific changes under devtool menuconfig command patch (3/3). Sai Hari Chandana Kalluri (3): devtool/standard.py: Update devtool modify to copy source from work-shared if its already downloaded devtool/standard.py: Create a copy of kernel source within work-shared if not present devtool: provide support for devtool menuconfig command scripts/lib/devtool/menuconfig.py | 80 ++ scripts/lib/devtool/standard.py | 114 +- 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 scripts/lib/devtool/menuconfig.py -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] nasm: add CVE_PRODUCT
Signed-off-by: Chen Qi --- meta/recipes-devtools/nasm/nasm_2.14.02.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/nasm/nasm_2.14.02.bb b/meta/recipes-devtools/nasm/nasm_2.14.02.bb index 96536cc..ecec78d 100644 --- a/meta/recipes-devtools/nasm/nasm_2.14.02.bb +++ b/meta/recipes-devtools/nasm/nasm_2.14.02.bb @@ -16,3 +16,5 @@ EXTRA_AUTORECONF += "--exclude=aclocal" BBCLASSEXTEND = "native" DEPENDS = "groff-native" + +CVE_PRODUCT = "netwide_assembler" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] nasm: add CVE_PRODUCT
*** BLURB HERE *** The following changes since commit 35742c10f531ba451c06a4e360fecfb55f358b35: ref-manual: Removed DISK_DESCRIPTION variable from glossary (2019-03-26 15:38:56 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/nasm-cve http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/nasm-cve Chen Qi (1): nasm: add CVE_PRODUCT meta/recipes-devtools/nasm/nasm_2.14.02.bb | 2 ++ 1 file changed, 2 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core