[OE-core] [PATCH] watchdog: remove interdependencies of watchdog and wd_keepalive
Since watchdog and watchdog-keepalive packages can't be installed together, move wd_keepalive.service to watchdog-keepalive package. Remove the inter-dependencies of watchdog and wd_keepalive services as well. [YOCTO #12565] Signed-off-by: Maxin B. John --- ...move-interdependencies-of-watchdog-and-wd.patch | 68 ++ meta/recipes-extended/watchdog/watchdog_5.15.bb| 6 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch diff --git a/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch new file mode 100644 index 000..338e0cd --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch @@ -0,0 +1,68 @@ +From c1fe14fa5bd168292cc4670034bc48b954e9dac7 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Tue, 13 Mar 2018 14:49:55 +0200 +Subject: [PATCH] watchdog: remove interdependencies of watchdog and + wd_keepalive services + +Since watchdog and watchdog-keepalive packages can't be installed +together, remove the inter-dependencies of watchdog and wd_keepalive +services + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Maxin B. John +--- + debian/watchdog.service | 9 +++-- + debian/wd_keepalive.service | 10 +- + 2 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/debian/watchdog.service b/debian/watchdog.service +index 7a2fc36..f31d1fe 100644 +--- a/debian/watchdog.service b/debian/watchdog.service +@@ -1,16 +1,13 @@ + [Unit] + Description=watchdog daemon +-Conflicts=wd_keepalive.service + After=multi-user.target +-OnFailure=wd_keepalive.service + + [Service] + Type=forking + EnvironmentFile=/etc/default/watchdog + ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' +-ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' +-ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' ++ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' ++PIDFile=/var/run/watchdog.pid + + [Install] +-WantedBy=default.target +- ++WantedBy=multi-user.target +diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service +index 45b018e..7f8b1dc 100644 +--- a/debian/wd_keepalive.service b/debian/wd_keepalive.service +@@ -1,13 +1,13 @@ + [Unit] + Description=watchdog keepalive daemon +-Before=watchdog.service shutdown.target +-Conflicts=watchdog.service shutdown.target ++After=multi-user.target + + [Service] + Type=forking + EnvironmentFile=/etc/default/watchdog + ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' +-ExecStartPre=-/bin/systemctl reset-failed watchdog.service + ExecStart=/usr/sbin/wd_keepalive $watchdog_options +-ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid' +-ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid' ++PIDFile=/var/run/wd_keepalive.pid ++ ++[Install] ++WantedBy=multi-user.target +-- +2.4.0 + diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index 3d0b72e..37b37ae 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ + file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ file://watchdog-init.patch \ file://watchdog-conf.patch \ file://wd_keepalive.init \ @@ -36,7 +37,9 @@ INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ." INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ." -SYSTEMD_SERVICE_${PN} = "watchdog.service wd_keepalive.service" +SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive" +SYSTEMD_SERVICE_${PN} = "watchdog.service" +SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service" do_install_append() { install -d ${D}${systemd_system_unitdir} @@ -54,6 +57,7 @@ PACKAGES =+ "${PN}-keepalive" FILES_${PN}-keepalive = " \ ${sysconfdir}/init.d/wd_keepalive \ +${systemd_system_unitdir}/wd_keepalive.service \ ${sbindir}/wd_keepalive \ " -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: set HOSTLDFLAGS in KCONFIG_CONFIG_COMMAND
Actually it's an artifact of how mailman works, it excludes CC on the mail to the list - I'm not sure whether were it to include it that the message would end up being CC'd both from the act of you sending the message and the mailing list also sending its copy, but as far as I have observed it has always behaved this way. It's possible that the "avoid duplicate messages" user preference setting has an effect, not sure. Cheers, Paul On Friday, 16 March 2018 4:47:14 AM +08 Cal Sullivan wrote: > Yeah I'm confused. My outbox says Ross is CC'd, my inbox does not. My > mail client is borked somehow. > > --- > Cal > > On 03/15/2018 01:30 PM, Randy MacLeod wrote: > > On 2018-03-15 03:53 PM, Cal Sullivan wrote: > >> Woops, +Ross to CC. > > Maybe you used BCC? Anyway +Ross to CC for reals now. :) > > ../Randy -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [pyro][PATCH] package_manager.py: Explicit complementary fail
When running bitbake -c populate_sdk , it is expected that packages matching SDKIMAGE_INSTALL_COMPLEMENTARY name mask (unless declared in PACKAGE_EXCLUDE_COMPLEMENTARY) are installed to resulting SDK. Underlying mechanism issues a package manager install call for set of complementary packages. However the mechanism doesn't seem to inform the user all too obviously in case the package manager command behind install_complementary() method fails -- and since it is combined with attempt_only=True option, user might end up wondering why several *-dev, *-dbg packages are missing from resulting SDK. Improve associated install() method behaviour in affected OpkgPM and DpkgPM classes so that a problematic state of affairs becomes directly obvious for bitbake user, resulting in shell output like: WARNING: someimage-1.0-r0 do_populate_sdk: Unable to install packages. Command '...' returned 1: Collected errors: * Solver encountered 1 problem(s): * Problem 1/1: * - package somepkg-dev-1.0-r0.x86 requires somepkg = 1.0-r0, but none of the providers can be installed * * Solution 1: * - allow deinstallation of someotherpkg-1.1-r1.x86 * - do not ask to install a package providing somepkg-dev * Solution 2: * - do not ask to install a package providing somepkg-dev (From OE-Core rev: 2502bd591c37bf532d02dc6b37fc1e8b5224fb0a) Signed-off-by: Niko Mauno Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 0d4459e7086fced5e9e0b4ad10378c9eddec56a8) --- meta/lib/oe/package_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index a907d6c7b9..1a2914fedc 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1078,7 +1078,7 @@ class OpkgPM(OpkgDpkgPM): output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT).decode("utf-8") bb.note(output) except subprocess.CalledProcessError as e: -(bb.fatal, bb.note)[attempt_only]("Unable to install packages. " +(bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " "Command '%s' returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) @@ -1377,7 +1377,7 @@ class DpkgPM(OpkgDpkgPM): bb.note("Installing the following packages: %s" % ' '.join(pkgs)) subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: -(bb.fatal, bb.note)[attempt_only]("Unable to install packages. " +(bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " "Command '%s' returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) -- 2.16.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [rocko][PATCH] package_manager.py: Explicit complementary fail
When running bitbake -c populate_sdk , it is expected that packages matching SDKIMAGE_INSTALL_COMPLEMENTARY name mask (unless declared in PACKAGE_EXCLUDE_COMPLEMENTARY) are installed to resulting SDK. Underlying mechanism issues a package manager install call for set of complementary packages. However the mechanism doesn't seem to inform the user all too obviously in case the package manager command behind install_complementary() method fails -- and since it is combined with attempt_only=True option, user might end up wondering why several *-dev, *-dbg packages are missing from resulting SDK. Improve associated install() method behaviour in affected OpkgPM and DpkgPM classes so that a problematic state of affairs becomes directly obvious for bitbake user, resulting in shell output like: WARNING: someimage-1.0-r0 do_populate_sdk: Unable to install packages. Command '...' returned 1: Collected errors: * Solver encountered 1 problem(s): * Problem 1/1: * - package somepkg-dev-1.0-r0.x86 requires somepkg = 1.0-r0, but none of the providers can be installed * * Solution 1: * - allow deinstallation of someotherpkg-1.1-r1.x86 * - do not ask to install a package providing somepkg-dev * Solution 2: * - do not ask to install a package providing somepkg-dev (From OE-Core rev: 2502bd591c37bf532d02dc6b37fc1e8b5224fb0a) Signed-off-by: Niko Mauno Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 0d4459e7086fced5e9e0b4ad10378c9eddec56a8) --- meta/lib/oe/package_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index db8bf2f39c..ed8fec8509 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1089,7 +1089,7 @@ class OpkgPM(OpkgDpkgPM): output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT).decode("utf-8") bb.note(output) except subprocess.CalledProcessError as e: -(bb.fatal, bb.note)[attempt_only]("Unable to install packages. " +(bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " "Command '%s' returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) @@ -1388,7 +1388,7 @@ class DpkgPM(OpkgDpkgPM): bb.note("Installing the following packages: %s" % ' '.join(pkgs)) subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: -(bb.fatal, bb.note)[attempt_only]("Unable to install packages. " +(bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " "Command '%s' returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) -- 2.16.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: set HOSTLDFLAGS in KCONFIG_CONFIG_COMMAND
Picked to mut, thanks Cal Ross On 15 March 2018 at 19:42, Cal Sullivan wrote: > Ping. This is still an issue and it looks like this patch fell through the > cracks! > > Thanks, > Cal > > > On 01/24/2018 07:12 PM, California Sullivan wrote: > >> Kernel v4.14 and newer contain the following in their Makefile: >> >> HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS) >> HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) >> >> This breaks our menuconfig, because it can no longer find ncurses if its >> not on the host machine. This can be seen in linux-yocto-dev, for >> example: >> >> [clsulliv@clsulliv build]$ bitbake virtual/kernel -c menuconfig >> >>GEN ./Makefile >>HOSTLD scripts/kconfig/mconf >> /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -lncurses >> /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -ltinfo >> collect2: error: ld returned 1 exit status >> make[3]: *** [scripts/Makefile.host:99: scripts/kconfig/mconf] Error 1 >> make[2]: *** [/home/clsulliv/yocto/poky/build/tmp/work-shared/intel-corei >> 7-64/kernel-source/Makefile:504: menuconfig] Error 2 >> make[1]: *** [Makefile:146: sub-make] Error 2 >> make: *** [Makefile:24: __sub-make] Error 2 >> Command failed. >> Press any key to continue... >> >> Fix this by setting HOSTLDFLAGS to ${BUILD_LDFLAGS} in our >> 'make menuconfig' command. >> >> Signed-off-by: California Sullivan >> --- >> meta/classes/kernel.bbclass | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >> index 2f6eca382e9..e4df1531c19 100644 >> --- a/meta/classes/kernel.bbclass >> +++ b/meta/classes/kernel.bbclass >> @@ -531,6 +531,8 @@ addtask savedefconfig after do_configure >> inherit cml1 >> +KCONFIG_CONFIG_COMMAND_append = " HOSTLDFLAGS='${BUILD_LDFLAGS}'" >> + >> EXPORT_FUNCTIONS do_compile do_install do_configure >> # kernel-base becomes kernel-${KERNEL_VERSION} >> > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] patch.py: Use git format-patch with --no-signature --no-numbered params
On 03/16/2018 12:50 AM, Martin Jansa wrote: * --no-signature saves unnecessary .patch modifications when executed on host with different git version * --no-numbered saves unnecessary .patch modifications when number of the applied patches is changed (the number is still in the filename so the order how they should be applied is still preserved) * both options exist for very long time, I've tested them with git 1.9.1 from Ubuntu 14.04 and I'm quite sure they were available even in much older releases, so there shouldn't be any issue on relatively new sanity tested distros Thanks, this should reduce the churn. By the way, when reviewing a change to a patch, it is *far* easier to look at it with a side by side diff tool than the usual +- format. I use vscode with gitlens extension (can't believe I am recommending a Microsoft product, but here we are). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] python3: update to version 3.5.5 to fix security issues
On 03/16/2018 07:06 AM, Tim Orling wrote: I looked into 3.6 as well, but the sheer number of patches we apply is a pain point to rebase. I am inclined to vote for 3.6 first and pick up 3.7 when it matures a bit and is more widely supported. I have fears of rather massive failures in our python ecosystem (especially in meta-python). Perhaps backward compatibility will be there, but I need to be convinced. If 3.7 is widely the _default_ in traditional distros we support, then I will sing a different tune. Also, I hope to have a ptest strategy for python by the end of 2.6, which would dramatically increase my comfort level. Perhaps we can provide both and default to 3.6? Eventually we will have to transition to 3.7, and I think it might be easier if it's widely available in oe-core, even if it has known (or unknown) issues and is off by default. We can then periodically test 3.7 on the AB etc, to assess where things are. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RESEND PATCH] glide.bbclass: Add class to easy Glide use
To use 'glide' this class does the integration and reduces code duplication. Signed-off-by: Otavio Salvador --- meta/classes/glide.bbclass | 9 + 1 file changed, 9 insertions(+) create mode 100644 meta/classes/glide.bbclass diff --git a/meta/classes/glide.bbclass b/meta/classes/glide.bbclass new file mode 100644 index 000..52291bab8cf --- /dev/null +++ b/meta/classes/glide.bbclass @@ -0,0 +1,9 @@ +# Handle Glide Vendor Package Management use +# +# Copyright 2018 (C) O.S. Systems Software LTDA. + +DEPENDS_append = " glide-native" + +do_compile_prepend() { +( cd ${WORKDIR}/build/src/${GO_IMPORT} && glide install ) +} -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RESEND PATCH] glide.bbclass: Add class to easy Glide use
On Fri, Mar 16, 2018 at 5:57 AM, Otavio Salvador wrote: > To use 'glide' this class does the integration and reduces code > duplication. > > Signed-off-by: Otavio Salvador > --- > > meta/classes/glide.bbclass | 9 + > 1 file changed, 9 insertions(+) > create mode 100644 meta/classes/glide.bbclass > > diff --git a/meta/classes/glide.bbclass b/meta/classes/glide.bbclass > new file mode 100644 > index 000..52291bab8cf > --- /dev/null > +++ b/meta/classes/glide.bbclass > @@ -0,0 +1,9 @@ > +# Handle Glide Vendor Package Management use > +# > +# Copyright 2018 (C) O.S. Systems Software LTDA. > + > +DEPENDS_append = " glide-native" > + > +do_compile_prepend() { > +( cd ${WORKDIR}/build/src/${GO_IMPORT} && glide install ) ^ Any reason why you aren't just using ${B} here instead? -Matt > +} > -- > 2.16.2 > > -- > ___ > 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] [oe-core][PATCH 6/7] xtrans: fix file conflict when multilib enabled
Is this because they use libdir? Surely a better solution would be to move the .pc into $libdir/pkgconfig instead of $datadir/pkgconfig? Ross On 12 March 2018 at 09:13, Zhang Xiao wrote: > Script file xtrans.pc conflicts between 32 and 64 bit packages. > Use update-alternatives to add base_libdir as suffix to avoid it. > > Signed-off-by: Zhang Xiao > --- > meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb | 15 ++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb > b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb > index d5b7f1a2c6..ef64f1fcfc 100644 > --- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb > +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb > @@ -16,7 +16,20 @@ PE = "1" > > RDEPENDS_${PN}-dev = "" > > -inherit gettext > +inherit gettext update-alternatives > + > +MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" > + > +FILES_${PN}-dev += "${datadir}/pkgconfig/xtrans.pc-${MULTILIB_SUFFIX}" > +ALTERNATIVE_${PN}-dev = "xtrans.pc" > +ALTERNATIVE_LINK_NAME[xtrans.pc] = "${datadir}/pkgconfig/xtrans.pc" > +ALTERNATIVE_TARGET[xtrans.pc] = "${datadir}/pkgconfig/xtrans. > pc-${MULTILIB_SUFFIX}" > + > +PACKAGE_PREPROCESS_FUNCS += "xtrans_alternative_rename" > + > +xtrans_alternative_rename() { > +mv ${PKGD}${datadir}/pkgconfig/xtrans.pc > ${PKGD}${datadir}/pkgconfig/xtrans.pc-${MULTILIB_SUFFIX} > +} > > 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
Re: [OE-core] [oe-core][PATCH 5/7] cairo: fix file conflict when multilib enabled
Or, don't install a *binary* package in two multilib architectures at once. Ross On 12 March 2018 at 09:13, Zhang Xiao wrote: > Script file cairo-trace conflict between 32 and 64 bit packages. > Use update-alternatives to add base_libdir as suffix to avoid it. > > Signed-off-by: Zhang Xiao > --- > meta/recipes-graphics/cairo/cairo_1.14.12.bb | 16 +++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb > b/meta/recipes-graphics/cairo/cairo_1.14.12.bb > index 075ca1ed34..1f2d68c0de 100644 > --- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb > +++ b/meta/recipes-graphics/cairo/cairo_1.14.12.bb > @@ -10,6 +10,20 @@ SRC_URI = "http://cairographics.org/ > releases/cairo-${PV}.tar.xz \ > SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" > SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead > 2a00353752b2092ead558139bd67f7bf16" > > +inherit update-alternatives > + > +MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" > + > +ALTERNATIVE_${PN}-perf-utils="cairo-trace" > +ALTERNATIVE_LINK_NAME[cairo-trace] = "${bindir}/cairo-trace" > +ALTERNATIVE_TARGET[cairo-trace] = "${bindir}/cairo-trace-${ > MULTILIB_SUFFIX}" > + > +PACKAGE_PREPROCESS_FUNCS += "alternatives_rename" > + > +alternatives_rename() { > + mv ${PKGD}${bindir}/cairo-trace ${PKGD}${bindir}/cairo-trace-$ > {MULTILIB_SUFFIX} > +} > + > PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" > > SUMMARY_${PN} = "The Cairo 2D vector graphics library" > @@ -35,7 +49,7 @@ FILES_${PN} = "${libdir}/libcairo.so.*" > FILES_${PN}-dev += "${libdir}/cairo/*.so" > FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" > FILES_${PN}-script-interpreter = "${libdir}/libcairo-script- > interpreter.so.*" > -FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la > ${libdir}/cairo/libcairo-trace.so.*" > +FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la > ${libdir}/cairo/libcairo-trace.so.*" > > do_install_append () { > rm -rf ${D}${bindir}/cairo-sphinx > -- > 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] [AUH] Upgrade status: 2018-03-16
Recipe upgrade statistics: * Failed (devtool error): 22 busybox, 1.28.1, Armin Kuster dropbear, 2018.76, Yi Zhao linux-yocto, 4.15.7, Bruce Ashfield libical, 3.0.3, Maxin B. John libxml2, 2.9.8, Hongxu Jia weston, 3.0.91, Denys Dmytriyenko gobject-introspection, 1.56.0, Alexander Kanavin acpica, 20180313, Fathi Boudra iproute2, 4.15.0, Changhyeok Bae automake, 1.16.1, Robert Yang fontconfig, 2.13.0, Maxin B. John ncurses, 6.1, Hongxu Jia libgpg-error, 1.28, Hongxu Jia gnu-efi, 3.0.8, Yi Zhao nspr, 4.19, Armin Kuster mpfr, 4.0.1, Khem Raj bash, 4.4.18, Hongxu Jia meson, 0.45.0, Alexander Kanavin e2fsprogs, 1.44.0, Robert Yang python3, 3.6.4, Derek Straka ifupdown, 0.8.31, Maxin B. John libcap-ng, 0.7.9, Yi Zhao * Succeeded: 33 util-macros, 1.19.2, Armin Kuster xkbcomp, 1.4.1, Armin Kuster slang, 2.3.2, Yi Zhao linux-firmware, 0.0-new-commits-available, Otavio Salvador dtc, 1.4.6, Alexander Kanavin man-db, 2.8.2, Hongxu Jia atk, 2.28.1, Maxin B. John mkfontscale, 1.1.3, Armin Kuster less, 530, Yi Zhao python-numpy, 1.14.2, Derek Straka autoconf-archive, 2018.03.13, Robert Yang curl, 7.59.0, Armin Kuster nss, 3.35, Armin Kuster kmscube, git-new-commits-available, Carlos Rafael Giani ccache, 3.4.1, Robert Yang wayland, 1.14.91, Denys Dmytriyenko dbus-glib, 0.110, Chen Qi xcb-proto, 1.13, Armin Kuster lzip, 1.20, Denys Dmytriyenko gnutls, 3.6.2, Armin Kuster xkeyboard-config, 2.23.1, Armin Kuster python3-numpy, 1.14.2, Derek Straka man-pages, 4.15, Hongxu Jia libxshmfence, 1.3, Armin Kuster logrotate, 3.14.0, Yi Zhao time, 1.9, Robert Yang gnupg, 2.2.5, Hongxu Jia sysstat, 11.7.2, Chen Qi libxml-sax-perl, 1.00, Tim Orling libevdev, 1.5.9, Maxin B. John ethtool, 4.15, Changhyeok Bae gawk, 4.2.1, Chen Qi libpcre2, 10.31, Armin Kuster * Failed(do_compile): 10 dpkg, 1.19.0.5, Aníbal Limón libtirpc, 1.0.3, Maxin B. John git, 2.16.2, Robert Yang harfbuzz, 1.7.6, Maxin B. John glibc, 2.27.9000, Khem Raj calibrateproto, 0.0-new-commits-available, Armin Kuster sysprof, 3.28.0, Alexander Kanavin linux-libc-headers, 4.15.10, Bruce Ashfield xserver-xorg, 1.19.99.901, Armin Kuster u-boot-mkimage, 2018.03, Marek Vasut * Failed(other errors): 41 lighttpd, 1.4.49, Alexander Kanavin xeyes, 1.1.2, Armin Kuster xset, 1.2.4, Armin Kuster at-spi2-atk, 2.26.2, Maxin B. John libinput, 1.10.3, Maxin B. John vulkan, 1.1.70.0, Maxin B. John glibc-initial, 2.27.9000, Khem Raj bind, 9.12.1, Armin Kuster glib-2.0, 2.56.0, Maxin B. John python3-pygobject, 3.28.0, Derek Straka at-spi2-core, 2.28.0, Maxin B. John vte, 0.52.0, Maxin B. John gnome-desktop3, 3.28.0, Alexander Kanavin libxcb, 1.13, Armin Kuster hdparm, 9.54, Denys Dmytriyenko glib-networking, 2.56.0, Maxin B. John dbus, 1.12.6, Chen Qi epiphany, 3.28.0.1, Alexander Kanavin tcf-agent, 1.7.0, Randy Witt systemd-boot, 238, Chen Qi strace, 4.21, Robert Yang adwaita-icon-theme, 3.28.0, Maxin B. John gcr, 3.28.0, Alexander Kanavin ofono, 1.23, Maxin B. John xf86-video-vesa, 2.4.0, Armin Kuster pango, 1.42.0, Maxin B. John dhcp, 4.4.1, Hongxu Jia xprop, 1.2.3, Armin Kuster xinit, 1.4.0, Armin Kuster build-appliance-image, 18.0.2, Cristian Iorga clutter-gst-3.0, 3.0.26, Maxin B. John gdb, 8.1, Khem Raj python3-pycairo, 1.16.3, Derek Straka gsettings-desktop-schemas, 3.28.0, Maxin B. John vala, 0.40.0, Alexander Kanavin dbus-test, 1.12.6, Chen Qi libsoup-2.4, 2.62.0, Maxin B. John xwininfo, 1.1.4, Armin Kuster gtk+3, 3.22.29, Maxin B. John bluez5, 5.49, Maxin B. John webkitgtk, 2.20.0, Alexander Kanavin TOTAL: attempted=106 succeeded=33(31.13%) failed=73(68.87%) Recipe upgrade statistics per Maintainer: Fathi Boudra -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [AUH] Upgrade status: 2018-03-16
On 03/16/2018 11:21 AM, a...@auh.yoctoproject.org wrote: * Failed(other errors): 41 This is due to xcb-proto having to be updated in tandem with libxcb. If just one is updated, it thwarts the rest of the updates. I'll fix this and re-run AUH. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] uninative: add variables to the whitelist so that it does not re-triger recipe parsing
When uninative is activated (poky's default) internal datastore variables are modified (NATIVELSBSTRING and SSTATEPOSTUNPACKFUNCS) to enable uninative support. This is happening after parsing is done at the beginning of the build. On the next bitbake call the recipe would be parsed if the two variables above were not added to the parsing whitelist BB_HASHCONFIG_WHITELIST. The fix is to add these two variables to the recipe parsing whitelist BB_HASHCONFIG_WHITELIST, this is done at recipe parsing time, only when uninative.bbclass is used. Signed-off-by: Cuero Bugot --- meta/classes/uninative.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 8f34483..d1fdbc8 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -8,6 +8,9 @@ UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2" #UNINATIVE_CHECKSUM[x86_64] = "dead" UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" +# Enabling uninative will change the following variables so they need to go the parsing white list to prevent multiple recipe parsing +BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS" + addhandler uninative_event_fetchloader uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] core-image-minimal-initramfs: prepare initramfs for NFS boot
Hi Andre, I could build initramfs using initramfs-framework. My device was booted successfully. I created my own recipe to build initramfs image and added one more module nfsrootfs to initramfs-framework. Also initramfs-framework*.bb was updated. Module "nfsrootfs" has content: nfsrootfs_enabled() { [ -z ${bootparam_nfsroot+x} ] && return 1 return 0 } nfsrootfs_run() { MODULES="$(find /lib/modules/*/kernel/drivers/net/ethernet -name \*.ko | sed -e 's,^.*/,,' -e 's,\.ko$,,')" modprobe -a $MODULES ifname=$(echo $bootparam_ip | cut -d ':' -f 6) ipaddr=$(echo $bootparam_ip | cut -d ':' -f 1) netmask=$(echo $bootparam_ip | cut -d ':' -f 4) gateway=$(echo $bootparam_ip | cut -d ':' -f 3) ifconfig $ifname $ipaddr netmask $netmask route add default gw $gateway nfs_mount_point=$(echo $bootparam_nfsroot | cut -d ',' -f 1) nfs_mount_params=$(echo $bootparam_nfsroot | cut -d ',' -f 2) mount -t nfs ${nfs_mount_point} -o nolock,${nfs_server_params} $ROOTFS_DIR } This modules does not support ipv6 and dhcp configuration. Taking into account your recommendations, module should have the next content: nfsrootfs_enabled() { [ -z ${bootparam_nfsroot+x} ] && return 1 return 0 } nfsrootfs_run() { nfs_mount_point=$(echo $bootparam_nfsroot | cut -d ',' -f 1) nfs_mount_params=$(echo $bootparam_nfsroot | cut -d ',' -f 2) mount -t nfs ${nfs_mount_point} -o nolock,${nfs_server_params} $ROOTFS_DIR } What module is responsible for network configuration and network driver loading? Should it be separate custom module in initramfs-framework not related to upstream? Best regards, Oleksii On 12.03.18 18:59, André Draszik wrote: Hi. It'd be nice if this was part of initramfs-framework instead. In particular some devices need a bit more than ifconfig & route, e.g. configuration of SoC internal Ethernet switches. As it is, this patch is not very generic, whereas if it was integrated with the initramfs-framework, another module could take care of the driver / hardware specifics, and this module would just do the actual mounting of the ROOTFS. The remaining bits, like mount --move of /proc are also already part of initramfs-framework. That way, this new addition would be useful on a wide range of devices. Cheers, Andre' On Mon, 2018-03-12 at 16:33 +0200, Oleksii Konoplitskyi wrote: It helps to boot device by mounting rootfs via NFS when network drivers are built as modules. We include modules in core-image-minimal-initramfs image and start kernel with specifying custom rdinit in cmdline: rdinit=/init-nfs.sh NFS and IP parameters should be passed to kernel as usual. For example: ip=192.168.0.11::192.168.0.1:255.255.255.0:linux:eth0:off nfsroot=192.168.0.10:/exported_nfs,nfsvers=3,tcp root=/dev/nfs rw loglevel=7 rdinit=/init-nfs.sh To use this initramfs, one could put the following to conf/local.conf: INITRAMFS_LOAD_KERNEL_MODULES = "kernel-module-igb" INITRAMFS_IMAGE_BUNDLE = "1" INITRAMFS_IMAGE = "core-image-minimal-initramfs" INITRAMFS_LOAD_KERNEL_MODULES is a space-separated list of modules that will be added to initramfs. Signed-off-by: Andrii Bordunov Signed-off-by: Oleksii Konoplitskyi --- .../images/core-image-minimal-initramfs.bb | 2 +- meta/recipes-core/initrdscripts/files/init-nfs.sh | 108 + .../initrdscripts/initramfs-nfs-boot_1.0.bb| 14 +++ 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/initrdscripts/files/init-nfs.sh create mode 100644 meta/recipes-core/initrdscripts/initramfs-nfs- boot_1.0.bb diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index c446e87..bf794bf 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first 'init' program more efficiently." -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs- live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" +PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs- live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} initramfs-nfs-boot" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" diff --git a/meta/recipes-core/initrdscripts/files/init-nfs.sh b/meta/recipes-core/initrdscripts/files/init-nfs.sh new file mode 100644 index 000..31a55ec --- /dev/null +++ b/meta/recipes-core/initrdscripts/files/init-nfs.sh @@ -0,0 +1,108 @@ +#!/bin/sh + +CONSOLE="/dev/console" +PATH=/sbin:/bin:/usr/sbin:/usr/bin +ROOT_MOUNT="/rootfs" + +fatal() +{ + echo $1 >$CONSOLE +
Re: [OE-core] [PATCH] kernel.bbclass: set HOSTLDFLAGS in KCONFIG_CONFIG_COMMAND
On Fri, Mar 16, 2018 at 3:13 AM, Burton, Ross wrote: > Picked to mut, thanks Cal > > Ross > > On 15 March 2018 at 19:42, Cal Sullivan > wrote: >> >> Ping. This is still an issue and it looks like this patch fell through the >> cracks! >> >> Thanks, >> Cal >> >> >> On 01/24/2018 07:12 PM, California Sullivan wrote: >>> >>> Kernel v4.14 and newer contain the following in their Makefile: >>> >>> HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS) >>> HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) >>> >>> This breaks our menuconfig, because it can no longer find ncurses if its >>> not on the host machine. This can be seen in linux-yocto-dev, for >>> example: >>> >>> [clsulliv@clsulliv build]$ bitbake virtual/kernel -c menuconfig >>> >>>GEN ./Makefile >>>HOSTLD scripts/kconfig/mconf >>> /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -lncurses >>> /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -ltinfo >>> collect2: error: ld returned 1 exit status >>> make[3]: *** [scripts/Makefile.host:99: scripts/kconfig/mconf] Error 1 >>> make[2]: *** >>> [/home/clsulliv/yocto/poky/build/tmp/work-shared/intel-corei7-64/kernel-source/Makefile:504: >>> menuconfig] Error 2 >>> make[1]: *** [Makefile:146: sub-make] Error 2 >>> make: *** [Makefile:24: __sub-make] Error 2 >>> Command failed. >>> Press any key to continue... >>> >>> Fix this by setting HOSTLDFLAGS to ${BUILD_LDFLAGS} in our >>> 'make menuconfig' command. >>> >>> Signed-off-by: California Sullivan >>> --- >>> meta/classes/kernel.bbclass | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >>> index 2f6eca382e9..e4df1531c19 100644 >>> --- a/meta/classes/kernel.bbclass >>> +++ b/meta/classes/kernel.bbclass >>> @@ -531,6 +531,8 @@ addtask savedefconfig after do_configure >>> inherit cml1 >>> +KCONFIG_CONFIG_COMMAND_append = " HOSTLDFLAGS='${BUILD_LDFLAGS}'" What's the reasoning behind appending to KCONFIG_CONFIG_COMMAND from kernel.bbclass rather than appending from inside cml1.bbclass (the only place KCONFIG_CONFIG_COMMAND is used) or simply updating the default value of KCONFIG_CONFIG_COMMAND? >>> + >>> EXPORT_FUNCTIONS do_compile do_install do_configure >>> # kernel-base becomes kernel-${KERNEL_VERSION} >> >> > > > -- > ___ > 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] kernel.bbclass: set HOSTLDFLAGS in KCONFIG_CONFIG_COMMAND
On 03/16/2018 11:38 AM, Andre McCurdy wrote: On Fri, Mar 16, 2018 at 3:13 AM, Burton, Ross wrote: Picked to mut, thanks Cal Ross On 15 March 2018 at 19:42, Cal Sullivan wrote: Ping. This is still an issue and it looks like this patch fell through the cracks! Thanks, Cal On 01/24/2018 07:12 PM, California Sullivan wrote: Kernel v4.14 and newer contain the following in their Makefile: HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS) HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) This breaks our menuconfig, because it can no longer find ncurses if its not on the host machine. This can be seen in linux-yocto-dev, for example: [clsulliv@clsulliv build]$ bitbake virtual/kernel -c menuconfig GEN ./Makefile HOSTLD scripts/kconfig/mconf /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -lncurses /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -ltinfo collect2: error: ld returned 1 exit status make[3]: *** [scripts/Makefile.host:99: scripts/kconfig/mconf] Error 1 make[2]: *** [/home/clsulliv/yocto/poky/build/tmp/work-shared/intel-corei7-64/kernel-source/Makefile:504: menuconfig] Error 2 make[1]: *** [Makefile:146: sub-make] Error 2 make: *** [Makefile:24: __sub-make] Error 2 Command failed. Press any key to continue... Fix this by setting HOSTLDFLAGS to ${BUILD_LDFLAGS} in our 'make menuconfig' command. Signed-off-by: California Sullivan --- meta/classes/kernel.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2f6eca382e9..e4df1531c19 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -531,6 +531,8 @@ addtask savedefconfig after do_configure inherit cml1 +KCONFIG_CONFIG_COMMAND_append = " HOSTLDFLAGS='${BUILD_LDFLAGS}'" What's the reasoning behind appending to KCONFIG_CONFIG_COMMAND from kernel.bbclass rather than appending from inside cml1.bbclass (the only place KCONFIG_CONFIG_COMMAND is used) or simply updating the default value of KCONFIG_CONFIG_COMMAND? cml1.bbclass is also used by busybox and I don't know what sort of effect this may have on it. Thanks, Cal + EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} -- ___ 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] kernel.bbclass: set HOSTLDFLAGS in KCONFIG_CONFIG_COMMAND
On 03/16/2018 11:41 AM, Cal Sullivan wrote: On 03/16/2018 11:38 AM, Andre McCurdy wrote: On Fri, Mar 16, 2018 at 3:13 AM, Burton, Ross wrote: Picked to mut, thanks Cal Ross On 15 March 2018 at 19:42, Cal Sullivan wrote: Ping. This is still an issue and it looks like this patch fell through the cracks! Thanks, Cal On 01/24/2018 07:12 PM, California Sullivan wrote: Kernel v4.14 and newer contain the following in their Makefile: HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS) HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) This breaks our menuconfig, because it can no longer find ncurses if its not on the host machine. This can be seen in linux-yocto-dev, for example: [clsulliv@clsulliv build]$ bitbake virtual/kernel -c menuconfig GEN ./Makefile HOSTLD scripts/kconfig/mconf /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -lncurses /home/clsulliv/yocto/poky/build/tmp/hosttools/ld: cannot find -ltinfo collect2: error: ld returned 1 exit status make[3]: *** [scripts/Makefile.host:99: scripts/kconfig/mconf] Error 1 make[2]: *** [/home/clsulliv/yocto/poky/build/tmp/work-shared/intel-corei7-64/kernel-source/Makefile:504: menuconfig] Error 2 make[1]: *** [Makefile:146: sub-make] Error 2 make: *** [Makefile:24: __sub-make] Error 2 Command failed. Press any key to continue... Fix this by setting HOSTLDFLAGS to ${BUILD_LDFLAGS} in our 'make menuconfig' command. Signed-off-by: California Sullivan --- meta/classes/kernel.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2f6eca382e9..e4df1531c19 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -531,6 +531,8 @@ addtask savedefconfig after do_configure inherit cml1 +KCONFIG_CONFIG_COMMAND_append = " HOSTLDFLAGS='${BUILD_LDFLAGS}'" What's the reasoning behind appending to KCONFIG_CONFIG_COMMAND from kernel.bbclass rather than appending from inside cml1.bbclass (the only place KCONFIG_CONFIG_COMMAND is used) or simply updating the default value of KCONFIG_CONFIG_COMMAND? cml1.bbclass is also used by busybox and I don't know what sort of effect this may have on it. Eh, it took like five second to test, and it doesn't break busybox's menuconfig. You're probably right that I should just change the default. Thanks, Cal + EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} -- ___ 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] patch.py: Use git format-patch with --no-signature --no-numbered params
What a blasphemy to recommend it, but so many people did, that I'll probably try it as well soon. BTW: I wanted to improve the warning message, because if you grep for ^WARNING: in fairly large build, warnings like: WARNING: nettle-2.7.1-r0 do_patch: doesn't say much (e.g. you cannot immediately grep for the patch filename to discover which layer introduced it). I've checked where this warning is added in meta/lib/oe/patch.py:runcmd(args, dir = None) and my naive 1st attempt was to just include the args (expecting to see the .patch file as well), but for default quilt it's quite useless: WARNING: nettle-2.7.1-r0 do_patch: Patch cannot be applied cleanly with: ['quilt', '--quiltrc', '/OE/build/oe-core/tmp-glibc/ work/core2-64-oe-linux/nettle/2.7.1-r0/recipe-sysroot-native/etc/quiltrc', 'push'] So I've tried to use PATCHTOOL = "patch" and it fails completely: ERROR: nettle-2.7.1-r0 do_patch: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:patch_do_patch(d) 0003: File: '/OE/build/oe-core/openembedded-core/meta/classes/patch.bbclass', lineno: 134, function: patch_do_patch 0130:if not patchdir in classes: 0131:patchset = cls(patchdir, d) 0132:resolver = rcls(patchset, oe_terminal) 0133:classes[patchdir] = (patchset, resolver) *** 0134:patchset.Clean() 0135:else: 0136:patchset, resolver = classes[patchdir] 0137: 0138:bb.note("Applying patch '%s' (%s)" % (parm['patchname'], oe.path.format_display(local, d))) File: '/OE/build/oe-core/openembedded-core/meta/lib/oe/patch.py', lineno: 293, function: Clean 0289:self._current = self._current - 1 0290: 0291:def Clean(self): 0292:"" *** 0293:self.Pop(all=True) 0294: 0295:class GitApplyTree(PatchTree): 0296:patch_line_prefix = '%% original patch' 0297:ignore_commit_prefix = '%% ignore' File: '/OE/build/oe-core/openembedded-core/meta/lib/oe/patch.py', lineno: 280, function: Pop 0276:return ret 0277: 0278:def Pop(self, force = None, all = None): 0279:if all: *** 0280:self._removePatchFile(True) 0281:self._current = None 0282:else: 0283:self._removePatchFile(False) 0284: File: '/OE/build/oe-core/openembedded-core/meta/lib/oe/patch.py', lineno: 211, function: _removePatchFile 0207:with open(self.seriespath, 'r+') as f: 0208:patches = f.readlines() 0209:if all: 0210:for p in reversed(patches): *** 0211:self._removePatch(os.path.join(self.patchdir, p.strip())) 0212:patches = [] 0213:else: 0214:self._removePatch(os.path.join(self.patchdir, patches[-1].strip())) 0215:patches.pop() File: '/OE/build/oe-core/openembedded-core/meta/lib/oe/patch.py', lineno: 201, function: _removePatch 0197: 0198:def _removePatch(self, p): 0199:patch = {} 0200:patch['file'] = p.split(",")[0] *** 0201:patch['strippath'] = p.split(",")[1] 0202:self._applypatch(patch, False, True) 0203: 0204:def _removePatchFile(self, all = False): 0205:if not os.path.exists(self.seriespath): Exception: IndexError: list index out of range ERROR: nettle-2.7.1-r0 do_patch: Function failed: patch_do_patch ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/ work/core2-64-oe-linux/nettle/2.7.1-r0/temp/log.do_patch.2168 ERROR: Task (/OE/build/oe-core/meta-gplv2/recipes-support/nettle/nettle_ 2.7.1.bb:do_patch) failed with exit code '1' PATCHTOOL = "git" fails the same. The questions are: Is patch and git as a PATCHTOOL broken for everybody? Is it worth parsing the fuzz in the patch output somewhere outside runcmd and try _harder_ to show the patch name on the first line of the warning? Maybe using the last line from quilt output (hopefully the "Now at patch Add-target-to-only-build-tests-not-run-them.patch" line) for warning and leaving the long explanation only as a bb.note? Not sure how this is meant to work with various PATCHTOOLs. FYI: I had one .patch which was always being applied with small fuzz, it was caused by some strange character (might be some Korean letter) in comment above the modified lines, so the quilt was somehow counting the lines incorrectly and always showed: Hunk #1 succeeded at 69 with fuzz 2. I've tried to refresh the patch with devtool, then manually and it was always failing like this, until I've tried to remove the strange characters in the same patch and now it applies cleanly. Regards, On Fri, Mar 16, 2018 at 11:37 AM, Alexander Kanavin < alexa
Re: [OE-core] [PATCH 1/3] systemd: upgrade to 237
On 2018-03-12 04:38 AM, Chen Qi wrote: This new version has dropped ptest support, as there's no easy way to do this in the framework of meson. Are you talking to the meson developers to see if we/they can come up with a way to do that? Is there an issue opened: https://github.com/mesonbuild/meson/issues I didn't find one. -- # Randy MacLeod. WR Linux # Wind River an Intel Company -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] systemd: upgrade to 237
On 03/16/2018 09:30 PM, Randy MacLeod wrote: This new version has dropped ptest support, as there's no easy way to do this in the framework of meson. Are you talking to the meson developers to see if we/they can come up with a way to do that? Is there an issue opened: https://github.com/mesonbuild/meson/issues I didn't find one. Yes - please be more specific. What are the difficulties in building and packaging tests when meson is used, as compared to autotools? If you need to patch meson build files in systemd source tree, it's totally fine to do that. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] glide.bbclass: Add class to easy Glide use
To use 'glide' this class does the integration and reduces code duplication. Signed-off-by: Otavio Salvador --- Changes in v2: - Use B to infer the build dir (Matt) meta/classes/glide.bbclass | 9 + 1 file changed, 9 insertions(+) create mode 100644 meta/classes/glide.bbclass diff --git a/meta/classes/glide.bbclass b/meta/classes/glide.bbclass new file mode 100644 index 000..db421745bd0 --- /dev/null +++ b/meta/classes/glide.bbclass @@ -0,0 +1,9 @@ +# Handle Glide Vendor Package Management use +# +# Copyright 2018 (C) O.S. Systems Software LTDA. + +DEPENDS_append = " glide-native" + +do_compile_prepend() { +( cd ${B}/src/${GO_IMPORT} && glide install ) +} -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RESEND PATCH] glide.bbclass: Add class to easy Glide use
On Fri, Mar 16, 2018 at 11:08 AM, Matt Madison wrote: ... >> +do_compile_prepend() { >> +( cd ${WORKDIR}/build/src/${GO_IMPORT} && glide install ) > ^ > Any reason why you aren't just using ${B} here instead? My mistake! Thanks for catching it! I am sending a v2 with this improved :-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty
We allow to set LINKER_HASH_STYLE to be empty so this would fail since --with-linker-hash-style needs an argument and cant be empty Signed-off-by: Khem Raj --- Changes since v1: - Use inline if statement instead of old syntax meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index d56d2c5e06..0f9c32cad8 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\ --disable-bootstrap \ --disable-libmudflap \ --with-system-zlib \ ---with-linker-hash-style=${LINKER_HASH_STYLE} \ +${@'—with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \ --enable-linker-build-id \ --with-ppl=no \ --with-cloog=no \ -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty
We allow to set LINKER_HASH_STYLE to be empty so this would fail since --with-linker-hash-style needs an argument and cant be empty Signed-off-by: Khem Raj --- Changes in v3: - Fix typo in gcc option Changes in v2: - Use inline if statement instead of old syntax meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index d56d2c5e06..a80926216b 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\ --disable-bootstrap \ --disable-libmudflap \ --with-system-zlib \ ---with-linker-hash-style=${LINKER_HASH_STYLE} \ +${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \ --enable-linker-build-id \ --with-ppl=no \ --with-cloog=no \ -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty
On Fri, Mar 16, 2018 at 2:41 PM, Khem Raj wrote: > We allow to set LINKER_HASH_STYLE to be empty so this would fail > since --with-linker-hash-style needs an argument and cant be empty > > Signed-off-by: Khem Raj > --- > Changes in v3: > - Fix typo in gcc option > > Changes in v2: > - Use inline if statement instead of old syntax > > meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc > b/meta/recipes-devtools/gcc/gcc-7.3.inc > index d56d2c5e06..a80926216b 100644 > --- a/meta/recipes-devtools/gcc/gcc-7.3.inc > +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc > @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\ > --disable-bootstrap \ > --disable-libmudflap \ > --with-system-zlib \ > ---with-linker-hash-style=${LINKER_HASH_STYLE} \ > +${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if > '${LINKER_HASH_STYLE}' else ''} \ What are the rules about when to use d.getVar('FOO') -vs- when to use ${FOO} in python fragments like this? > --enable-linker-build-id \ > --with-ppl=no \ > --with-cloog=no \ > -- > 2.16.2 > > -- > ___ > 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] linux-firmware: upgrade to 4c0bf11 revision
License-Update: new releases and copyright years updated. Signed-off-by: Otavio Salvador --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 816c7a0d78f..c96588473b6 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -118,7 +118,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=99d352987a7e29460bcf9b26d146a95a \ +file://WHENCE;md5=ec6f70c8a1104ff87f6aa144d926f0dd \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -181,7 +181,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "65b1c68c63f974d72610db38dfae49861117cae2" +SRCREV = "4c0bf113a55975d702673e57c5542f150807ad66" PE = "1" PV = "0.0+git${SRCPV}" -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] uninative: add variables to the whitelist so that it does not re-triger recipe parsing
On Fri, Mar 16, 2018 at 10:31 AM Cuero Bugot wrote: > When uninative is activated (poky's default) internal datastore variables > are modified (NATIVELSBSTRING and SSTATEPOSTUNPACKFUNCS) to enable uninative > support. This is happening after parsing is done at the beginning of the > build. On the next bitbake call the recipe would be parsed if the two > variables above were not added to the parsing whitelist > BB_HASHCONFIG_WHITELIST. > > The fix is to add these two variables to the recipe parsing whitelist > BB_HASHCONFIG_WHITELIST, this is done at recipe parsing time, only when > uninative.bbclass is used. It seems you have a case where data is already parsed and then uninstive is enabled after this the reparse is happening. Or is it always happening when uninative is enabled > > > Signed-off-by: Cuero Bugot > --- > meta/classes/uninative.bbclass | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/classes/uninative.bbclass > b/meta/classes/uninative.bbclass > index 8f34483..d1fdbc8 100644 > --- a/meta/classes/uninative.bbclass > +++ b/meta/classes/uninative.bbclass > @@ -8,6 +8,9 @@ UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2" > #UNINATIVE_CHECKSUM[x86_64] = "dead" > UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" > > +# Enabling uninative will change the following variables so they need to > go the parsing white list to prevent multiple recipe parsing > +BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS" > + > addhandler uninative_event_fetchloader > uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" > > -- > 2.7.4 > -- > ___ > 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] [AUH] Upgrade status: 2018-03-16
Glibc 2.27.9 seems not right here glibc should only track major.minor for release number On Fri, Mar 16, 2018 at 10:21 AM wrote: > Recipe upgrade statistics: > > * Failed (devtool error): 22 > busybox, 1.28.1, Armin Kuster > dropbear, 2018.76, Yi Zhao > linux-yocto, 4.15.7, Bruce Ashfield > libical, 3.0.3, Maxin B. John > libxml2, 2.9.8, Hongxu Jia > weston, 3.0.91, Denys Dmytriyenko > gobject-introspection, 1.56.0, Alexander Kanavin < > alexander.kana...@intel.com> > acpica, 20180313, Fathi Boudra > iproute2, 4.15.0, Changhyeok Bae > automake, 1.16.1, Robert Yang > fontconfig, 2.13.0, Maxin B. John > ncurses, 6.1, Hongxu Jia > libgpg-error, 1.28, Hongxu Jia > gnu-efi, 3.0.8, Yi Zhao > nspr, 4.19, Armin Kuster > mpfr, 4.0.1, Khem Raj > bash, 4.4.18, Hongxu Jia > meson, 0.45.0, Alexander Kanavin > e2fsprogs, 1.44.0, Robert Yang > python3, 3.6.4, Derek Straka > ifupdown, 0.8.31, Maxin B. John > libcap-ng, 0.7.9, Yi Zhao > * Succeeded: 33 > util-macros, 1.19.2, Armin Kuster > xkbcomp, 1.4.1, Armin Kuster > slang, 2.3.2, Yi Zhao > linux-firmware, 0.0-new-commits-available, Otavio Salvador < > otavio.salva...@ossystems.com.br> > dtc, 1.4.6, Alexander Kanavin > man-db, 2.8.2, Hongxu Jia > atk, 2.28.1, Maxin B. John > mkfontscale, 1.1.3, Armin Kuster > less, 530, Yi Zhao > python-numpy, 1.14.2, Derek Straka > autoconf-archive, 2018.03.13, Robert Yang < > liezhi.y...@windriver.com> > curl, 7.59.0, Armin Kuster > nss, 3.35, Armin Kuster > kmscube, git-new-commits-available, Carlos Rafael Giani < > d...@pseudoterminal.org> > ccache, 3.4.1, Robert Yang > wayland, 1.14.91, Denys Dmytriyenko > dbus-glib, 0.110, Chen Qi > xcb-proto, 1.13, Armin Kuster > lzip, 1.20, Denys Dmytriyenko > gnutls, 3.6.2, Armin Kuster > xkeyboard-config, 2.23.1, Armin Kuster > python3-numpy, 1.14.2, Derek Straka > man-pages, 4.15, Hongxu Jia > libxshmfence, 1.3, Armin Kuster > logrotate, 3.14.0, Yi Zhao > time, 1.9, Robert Yang > gnupg, 2.2.5, Hongxu Jia > sysstat, 11.7.2, Chen Qi > libxml-sax-perl, 1.00, Tim Orling < > timothy.t.orl...@linux.intel.com> > libevdev, 1.5.9, Maxin B. John > ethtool, 4.15, Changhyeok Bae > gawk, 4.2.1, Chen Qi > libpcre2, 10.31, Armin Kuster > * Failed(do_compile): 10 > dpkg, 1.19.0.5, Aníbal Limón > libtirpc, 1.0.3, Maxin B. John > git, 2.16.2, Robert Yang > harfbuzz, 1.7.6, Maxin B. John > glibc, 2.27.9000, Khem Raj > calibrateproto, 0.0-new-commits-available, Armin Kuster < > akus...@mvista.com> > sysprof, 3.28.0, Alexander Kanavin > linux-libc-headers, 4.15.10, Bruce Ashfield < > bruce.ashfi...@windriver.com> > xserver-xorg, 1.19.99.901, Armin Kuster > u-boot-mkimage, 2018.03, Marek Vasut > * Failed(other errors): 41 > lighttpd, 1.4.49, Alexander Kanavin > xeyes, 1.1.2, Armin Kuster > xset, 1.2.4, Armin Kuster > at-spi2-atk, 2.26.2, Maxin B. John > libinput, 1.10.3, Maxin B. John > vulkan, 1.1.70.0, Maxin B. John > glibc-initial, 2.27.9000, Khem Raj > bind, 9.12.1, Armin Kuster > glib-2.0, 2.56.0, Maxin B. John > python3-pygobject, 3.28.0, Derek Straka > at-spi2-core, 2.28.0, Maxin B. John > vte, 0.52.0, Maxin B. John > gnome-desktop3, 3.28.0, Alexander Kanavin < > alexander.kana...@intel.com> > libxcb, 1.13, Armin Kuster > hdparm, 9.54, Denys Dmytriyenko > glib-networking, 2.56.0, Maxin B. John > dbus, 1.12.6, Chen Qi > epiphany, 3.28.0.1, Alexander Kanavin > > tcf-agent, 1.7.0, Randy Witt > systemd-boot, 238, Chen Qi > strace, 4.21, Robert Yang > adwaita-icon-theme, 3.28.0, Maxin B. John > gcr, 3.28.0, Alexander Kanavin > ofono, 1.23, Maxin B. John > xf86-video-vesa, 2.4.0, Armin Kuster > pango, 1.42.0, Maxin B. John > dhcp, 4.4.1, Hongxu Jia > xprop, 1.2.3, Armin Kuster > xinit, 1.4.0, Armin Kuster > build-appliance-image, 18.0.2, Cristian Iorga < > cristian.io...@intel.com> > clutter-gst-3.0, 3.0.26, Maxin B. John > gdb, 8.1, Khem Raj > python3-pycairo, 1.16.3, Derek Straka > gsettings-desktop-schemas, 3.28.0, Maxin B. John < > maxin.j...@intel.com> > vala, 0.40.0, Alexander Kanavin > dbus-test, 1.12.6, Chen Qi > libsoup-2.4, 2.62.0, Maxin B. John > xwininfo, 1.1.4, Armin Kuster >
[OE-core] [PATCH 1/5] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty
We allow to set LINKER_HASH_STYLE to be empty so this would fail since --with-linker-hash-style needs an argument and cant be empty Signed-off-by: Khem Raj --- meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index d56d2c5e06..a80926216b 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\ --disable-bootstrap \ --disable-libmudflap \ --with-system-zlib \ ---with-linker-hash-style=${LINKER_HASH_STYLE} \ +${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \ --enable-linker-build-id \ --with-ppl=no \ --with-cloog=no \ -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] mtd-utils: Explicitly add pthread options to cflags
Some architectures e.g. riscv gcc does not add -D_REENTRANT when enabling pthreads. Help it here by adding these options while gcc gets fixed Signed-off-by: Khem Raj --- meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 3c34bdd84e..d09d633022 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -24,6 +24,8 @@ S = "${WORKDIR}/git/" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = ",,acl," +CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" + EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" ALTERNATIVE_${PN} = "flash_eraseall" -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] RISC-V Build fixes
These packages were failing to build for qemuriscv64 world build Some fixes are common, some are backports and some are already submitted to respective upstream The following changes since commit c94271d87d16323f920891344642f76dfb3c994f: buildperf: measure the size of core-image-sato rootfs (2018-03-16 03:42:03 -0700) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib kraj/riscv64-fixes-3 http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/riscv64-fixes-3 Khem Raj (5): gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty mtd-utils: Explicitly add pthread options to cflags x264: Use updated gnu-config artifacts python-numpy: Fix build for riscv64 dpkg: Backport riscv support .../0001-arch-Add-support-for-riscv64-CPU.patch| 54 .../dpkg/dpkg/glibc2.5-sync_file_range.patch | 21 +++- meta/recipes-devtools/dpkg/dpkg_1.18.24.bb | 1 + meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +- meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 + .../files/0001-npy_cpu-Add-riscv-support.patch | 28 + .../python-numpy/files/riscv64/_numpyconfig.h | 32 + .../python-numpy/files/riscv64/config.h| 139 + .../recipes-devtools/python-numpy/python-numpy.inc | 5 + meta/recipes-multimedia/x264/x264_git.bb | 2 + 10 files changed, 280 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch create mode 100644 meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch create mode 100644 meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h create mode 100644 meta/recipes-devtools/python-numpy/files/riscv64/config.h -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] dpkg: Backport riscv support
Refresh patches with devtool Signed-off-by: Khem Raj --- .../0001-arch-Add-support-for-riscv64-CPU.patch| 54 ++ .../dpkg/dpkg/glibc2.5-sync_file_range.patch | 21 +++-- meta/recipes-devtools/dpkg/dpkg_1.18.24.bb | 1 + 3 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch new file mode 100644 index 00..45c606e690 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch @@ -0,0 +1,54 @@ +From 319f32d743f5b5e725012654d124e49226d5de91 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Mar 2018 20:28:24 -0700 +Subject: [PATCH] arch: Add support for riscv64 CPU + + * Architecture support: +- Add support for riscv64 CPU. Closes: #822914 + Thanks to Manuel A. Fernandez Montecelo + +Upstream-Status: Backport [https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=dpkg%2Fdpkg.git;a=commitdiff_plain;h=ee0855cc66076691de4796be48f8a0d889fde001;hp=2f5816d8be40b449d2473b22f9e0c33b32f3bd78] + +Signed-off-by: Khem Raj +--- + data/cputable | 1 + + scripts/t/Dpkg_Arch.t | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/data/cputable b/data/cputable +index a2bd7d6..9f2a8e0 100644 +--- a/data/cputable b/data/cputable +@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big + powerpcel powerpcle powerpcle 32 little + ppc64 powerpc64 (powerpc|ppc)64 64 big + ppc64el powerpc64le powerpc64le 64 little ++riscv64 riscv64 riscv64 64 little + s390 s390s39032 big + s390x s390x s390x 64 big + sh3 sh3 sh3 32 little +diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t +index d478b49..ecd5d66 100644 +--- a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t +@@ -16,7 +16,7 @@ + use strict; + use warnings; + +-use Test::More tests => 16367; ++use Test::More tests => 16832; + + use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch + debarch_eq debarch_is debarch_is_wildcard +@@ -162,7 +162,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); + is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); + is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); + +-is(scalar get_valid_arches(), 524, 'expected amount of known architectures'); ++is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); + + { + local $ENV{CC} = 'false'; +-- +2.16.2 + diff --git a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch index d56b8a69a3..d48386647e 100644 --- a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch +++ b/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch @@ -1,12 +1,17 @@ +From 9d260d408f9e17abd1d1dccd685bd7e80a3655a9 Mon Sep 17 00:00:00 2001 +From: Donn Seeley +Date: Tue, 25 Feb 2014 17:44:04 +0800 +Subject: [PATCH] dpkg: fix a link problem for dpkg-native on CentOS 5.8 + CentOS 5.8 kernels and headers support the sync_file_range() system call, but glibc 2.5 doesn't provide the syscall stub. It appears that this problem is known but will never be fixed: https://bugzilla.redhat.com/show_bug.cgi?id=518581 - Bug 518581 - [RHEL5] glibc misses sync_file_range syscall interface + Bug 518581 - [RHEL5] glibc misses sync_file_range syscall interface - Status: CLOSED CANTFIX + Status: CLOSED CANTFIX Last Closed: 2009-11-22 22:19:55 Kirby Zhou 2009-08-20 23:37:55 EDT @@ -60,13 +65,16 @@ Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)] Signed-off-by: Donn Seeley Signed-off-by: Lei Liu + --- - src/archives.c |4 ++-- + src/archives.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/archives.c b/src/archives.c +index 4b2fc92..a92b795 100644 --- a/src/archives.c +++ b/src/archives.c -@@ -75,7 +75,7 @@ +@@ -69,7 +69,7 @@ fd_writeback_init(int fd) /* Ignore the return code as it should be considered equivalent to an * asynchronous hint for the kernel, we are doing an fsync() later on * anyway. */ @@ -75,7 +83,7 @@ Signed-off-by: Lei Liu sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); #elif defined(HAVE_POSIX_FADVISE) posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); -@@ -1179,7 +1179,7 @@ +@@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti) return 0; } @@ -84,3 +92,6
[OE-core] [PATCH 4/5] python-numpy: Fix build for riscv64
Signed-off-by: Khem Raj --- .../files/0001-npy_cpu-Add-riscv-support.patch | 28 + .../python-numpy/files/riscv64/_numpyconfig.h | 32 + .../python-numpy/files/riscv64/config.h| 139 + .../recipes-devtools/python-numpy/python-numpy.inc | 5 + 4 files changed, 204 insertions(+) create mode 100644 meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch create mode 100644 meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h create mode 100644 meta/recipes-devtools/python-numpy/files/riscv64/config.h diff --git a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch new file mode 100644 index 00..4f5c4f5f0d --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch @@ -0,0 +1,28 @@ +From 30fb1bf9244bb0789c02ec7c98a923acc7200206 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Mar 2018 19:55:21 -0700 +Subject: [PATCH] npy_cpu: Add riscv support + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761] + + numpy/core/include/numpy/npy_cpu.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +index 84653ea18..9e88db873 100644 +--- a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +@@ -78,6 +78,8 @@ + #define NPY_CPU_AARCH64 + #elif defined(__mc68000__) + #define NPY_CPU_M68K ++#elif defined(__riscv) ++#define NPY_CPU_RISCV + #elif defined(__arc__) && defined(__LITTLE_ENDIAN__) + #define NPY_CPU_ARCEL + #elif defined(__arc__) && defined(__BIG_ENDIAN__) +-- +2.16.2 + diff --git a/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h new file mode 100644 index 00..109deb0435 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h @@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x0109 +#define NPY_API_VERSION 0x000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta/recipes-devtools/python-numpy/files/riscv64/config.h b/meta/recipes-devtools/python-numpy/files/riscv64/config.h new file mode 100644 index 00..c30b868f2f --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/riscv64/config.h @@ -0,0 +1,139 @@ +#define HAVE_ENDIAN_H 1 +#define SIZEOF_PY_INTPTR_T 8 +#define SIZEOF_PY_LONG_LONG 8 +#define MATHLIB m +#define HAVE_SIN 1 +#define HAVE_COS 1 +#define HAVE_TAN 1 +#define HAVE_SINH 1 +#define HAVE_COSH 1 +#define HAVE_TANH 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_SQRT 1 +#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_EXP 1 +#define HAVE_ASIN 1 +#define HAVE_ACOS 1 +#define HAVE_ATAN 1 +#define HAVE_FMOD 1 +#define HAVE_MODF 1 +#define HAVE_FREXP 1 +#define HAVE_LDEXP 1 +#define HAVE_RINT 1 +#define HAVE_TRUNC 1 +#define HAVE_EXP2 1 +#define HAVE_LOG2 1 +#define HAVE_ATAN2 1 +#define HAVE_POW 1 +#define HAVE_NEXTAFTER 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_SINHF 1 +#define HAVE_COSHF 1 +#define HAVE_TANHF 1 +#define HAVE_FABSF 1 +#define HAVE_FLOORF 1 +#define HAVE_CEILF 1 +#define HAVE_RINTF 1 +#define HAVE_TRUNCF 1 +#define HAVE_SQRTF 1 +#define HAVE_LOG10F 1 +#define HAVE_LOGF 1 +#define HAVE_LOG1PF 1 +#define HAVE_EXPF 1 +#define HAVE_EXPM1F 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ASINHF 1 +#define HAVE_ACOSHF 1 +#define HAVE_ATANHF 1 +#define HAVE_HYPOTF 1 +#define HAVE_ATAN2F 1 +#define HAVE_POWF 1 +#define HAVE_FMODF 1 +#define HAVE_MODFF 1 +#define HAVE_FREXPF 1 +#define HAVE_LDEXPF 1 +#define HAVE_EXP2F 1 +#define HAVE_LOG2F 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_NEXTAFTERF 1 +#define HAVE_SINL 1 +#define HAVE_COSL 1 +#define HAVE_TANL 1 +#define HAVE_SINHL 1 +#define HAVE_COSHL 1 +#define HAVE_TANHL 1 +#d
[OE-core] [PATCH 3/5] x264: Use updated gnu-config artifacts
It is not using autoconf completely, therefore there is no autoreconf happening, so when we depend on latest gnu-config changes e.g. new architectures like riscv the build does not see them and fails. Installing these files from native sysroot helps Signed-off-by: Khem Raj --- meta/recipes-multimedia/x264/x264_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index a669295044..c445d15e69 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -43,6 +43,8 @@ EXTRA_OECONF = '--prefix=${prefix} \ ' do_configure() { +install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} +install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} ./configure ${EXTRA_OECONF} } -- 2.16.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core