Re: [OE-core] [yocto] [PATCH v4 1/3] image.bbclass: add prohibited-paths QA test
On 11/17/2017 01:21 AM, Leonardo Sandoval wrote: isn't it this class meta/classes/insane.bbclass for this type of checks? This was already discussed - the test should be on the image rather than package level: http://lists.openembedded.org/pipermail/openembedded-core/2017-November/144335.html Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 18/27] psmisc: update to 23.0
On 11/17/2017 02:35 AM, Burton, Ross wrote: This fixes the build: EXTRA_AUTORECONF="" do_configure_prepend() { ( cd ${S} && po/update-potfiles ) } Thanks for looking! I admit I try to avoid becoming better at autotools :) There's also the question of me being the de facto maintainer of jku's recipes, which means I cut corners a bit more than I otherwise would. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] eudev: sync rules with systemd
- Add whitelist hd* devices - Backport latest rules from upstream - Fix formatting IDE storage does not trigger "change" uevents Signed-off-by: Hongxu Jia --- .../eudev/0001-rules-whitelist-hd-devices.patch| 33 .../udev/eudev/0002-rules-update.patch | 196 + ...les-watch-metadata-changes-in-ide-devices.patch | 43 + meta/recipes-core/udev/eudev_3.2.2.bb | 3 + 4 files changed, 275 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-rules-whitelist-hd-devices.patch create mode 100644 meta/recipes-core/udev/eudev/0002-rules-update.patch create mode 100644 meta/recipes-core/udev/eudev/0003-rules-watch-metadata-changes-in-ide-devices.patch diff --git a/meta/recipes-core/udev/eudev/0001-rules-whitelist-hd-devices.patch b/meta/recipes-core/udev/eudev/0001-rules-whitelist-hd-devices.patch new file mode 100644 index 000..1cc4332 --- /dev/null +++ b/meta/recipes-core/udev/eudev/0001-rules-whitelist-hd-devices.patch @@ -0,0 +1,33 @@ +From 676864191d1855ce23a31026b74c7f64b15e5062 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 9 Nov 2016 19:41:13 -0800 +Subject: [PATCH 1/3] rules: whitelist hd* devices + +qemu by default emulates IDE and the linux-yocto kernel(s) use +CONFIG_IDE instead of the more modern libsata, so disks appear as +/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. + +Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] + +Signed-off-by: Patrick Ohly +Signed-off-by: Khem Raj +--- + rules/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules +index 6f60ae9..bcd573a 100644 +--- a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules +@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" + ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" + + SUBSYSTEM!="block", GOTO="persistent_storage_end" +-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*", GOTO="persistent_storage_end" ++KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|hd*", GOTO="persistent_storage_end" + + # ignore partitions that span the entire disk + TEST=="whole_disk", GOTO="persistent_storage_end" +-- +1.8.3.1 + diff --git a/meta/recipes-core/udev/eudev/0002-rules-update.patch b/meta/recipes-core/udev/eudev/0002-rules-update.patch new file mode 100644 index 000..7cc4d06 --- /dev/null +++ b/meta/recipes-core/udev/eudev/0002-rules-update.patch @@ -0,0 +1,196 @@ +From d29a20381bc6bd85e86bdc5b2adb48fa12ccd22a Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Sun, 3 Sep 2017 13:20:33 -0400 +Subject: [PATCH 2/3] rules: update + +Upstream-Status: Backport [https://github.com/gentoo/eudev/commit/47367bc4df6f05a49cf4b5b0209153d77a9ade83] + +Signed-off-by: Anthony G. Basile +--- + rules/50-udev-default.rules | 3 ++- + rules/60-block.rules | 5 + + rules/60-cdrom_id.rules | 6 +- + rules/60-drm.rules| 5 + + rules/60-evdev.rules | 6 +- + rules/60-persistent-input.rules | 2 ++ + rules/60-persistent-storage.rules | 11 +++ + rules/60-sensor.rules | 8 + rules/78-sound-card.rules | 7 +++ + 9 files changed, 42 insertions(+), 11 deletions(-) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index e9eeb85..87438c0 100644 +--- a/rules/50-udev-default.rules b/rules/50-udev-default.rules +@@ -11,7 +11,6 @@ SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" + SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" + + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" +-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" + ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" + + ACTION!="add", GOTO="default_end" +@@ -34,6 +33,8 @@ SUBSYSTEM=="video4linux", GROUP="video" + SUBSYSTEM=="graphics", GROUP="video" + SUBSYSTEM=="drm", GROUP="video" + SUBSYSTEM=="dvb", GROUP="video" ++SUBSYSTEM=="media", GROUP="video" ++SUBSYSTEM=="cec", GROUP="video" + + SUBSYSTEM=="sound", GROUP="audio", \ + OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" +diff --git a/rules/60-block.rules b/rules/60-block.rules +index 5e38e12..343fc06 100644 +--- a/rules/60-block.rules b/rules/60-block.rules +@@ -8,7 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ + ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" + + # watch metadata changes, caused by tools closing the device node which was opened for writing +-ACTION!="remove", SUB
[OE-core] [PATCH 1/3] systemd: fix formatting IDE storage does not trigger "change" uevents
Formatting IDE storage does not trigger "change" uevents. As a result clients using udev API don't get any updates afterwards and get outdated information about the device. ... root@qemux86-64:~# mkfs.ext4 -F /dev/hda1 Creating filesystem with 262144 4k blocks and 65536 inodes Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 root@qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory ... Include hd* in a match for watch option assignment. Signed-off-by: Hongxu Jia --- ...les-watch-metadata-changes-in-ide-devices.patch | 43 ++ meta/recipes-core/systemd/systemd_234.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch diff --git a/meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch new file mode 100644 index 000..17d698a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch @@ -0,0 +1,43 @@ +From 8207d645582e96c56950674e104653d0cd552d60 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 17 Nov 2017 09:46:00 +0800 +Subject: [PATCH] rules: watch metadata changes in ide devices + +Formatting IDE storage does not trigger "change" uevents. As a result +clients using udev API don't get any updates afterwards and get outdated +information about the device. +... +root@qemux86-64:~# mkfs.ext4 -F /dev/hda1 +Creating filesystem with 262144 4k blocks and 65536 inodes +Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 + +root@qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 +ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory +... +Include hd* in a match for watch option assignment. + +Upstream-Status: Denied + +qemu by default emulates IDE and the linux-yocto kernel(s) use +CONFIG_IDE instead of the more modern libsata, so disks appear as +/dev/hd*. A similar patch rejected by upstream because CONFIG_IDE +is deprecated. + +Signed-off-by: Hongxu Jia +--- + rules/60-block.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rules/60-block.rules b/rules/60-block.rules +index 343fc06..b5237da 100644 +--- a/rules/60-block.rules b/rules/60-block.rules +@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ + ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" + + # watch metadata changes, caused by tools closing the device node which was opened for writing +-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*", OPTIONS+="watch" ++ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|hd*", OPTIONS+="watch" +-- +1.8.3.1 + diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 6b8745b..4283d3d 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0017-remove-duplicate-include-uchar.h.patch \ file://0018-check-for-uchar.h-in-configure.patch \ file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ + file://0020-rules-watch-metadata-changes-in-ide-devices.patch \ file://0001-add-fallback-parse_printf_format-implementation.patch \ file://0002-src-basic-missing.h-check-for-missing-strndupa.patch \ file://0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] mesa/screen: change patch status
The patch has been accepted upstream. Changed patch status Pending/Submitted -> Accepted. Signed-off-by: Hongxu Jia --- .../0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch| 3 ++- .../0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch| 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch b/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch index e8db12c..1274b27 100644 --- a/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch +++ b/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch @@ -9,7 +9,8 @@ test always return true. We rarely use "yes;" to name build dir, so s/yes/yes;/g could fix the issue -Upstream-Status: Pending +Upstream-Status: Accepted +https://git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v4&id=8c2b4061d16756ee2ed37f08db063b8215656943 Signed-off-by: Jian Kang --- diff --git a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch index bd1e863..ff8eda4 100644 --- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch +++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -20,7 +20,8 @@ undefined reference to `XML_GetCurrentLineNumber' explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS -Upstream-Status: Submitted [mesa-...@lists.freedesktop.org] +Upstream-Status: Accepted +https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf Signed-off-by: Hongxu Jia --- -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libepoxy: Fix build break for EGL_CAST dependency
This is a backport [1] to fix the following build error: | In file included from /home/r60874/upstream/xwayland/tmp/work/armv7at2hf-neon-mx6qdl-fslc-linux-gnueabi/gtk+3/3.22.17-r0/recipe-sysroot/usr/include/epoxy/egl.h:46:0, | from ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.h:32, | from ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c:24: | ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize': | ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c:179:43: error: expected expression before 'EGLContext' | : EGL_NO_CONTEXT, |^ [1] https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8 Signed-off-by: Tom Hochstein --- .../Add-fallback-definition-for-EGL-CAST.patch | 31 ++ meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch diff --git a/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch new file mode 100644 index 000..daa1785 --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch @@ -0,0 +1,31 @@ +Add fallback definition for EGL_CAST + +The EGL API update from d11104f introduced a dependency on the +EGL_CAST() macro, provided by an updated eglplatform.h. Given that we +don't provide eglplatform.h, add a fallback definition for if we're +building against Mesa 17.0.x or similar. + +https://bugs.gentoo.org/show_bug.cgi?id=623926 + +Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] + +Index: libepoxy-1.4.3/src/gen_dispatch.py +=== +--- libepoxy-1.4.3.orig/src/gen_dispatch.py2017-06-06 04:24:13.0 -0500 libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 +@@ -491,6 +491,15 @@ + self.outln('#include "epoxy/gl.h"') + if self.target == "egl": + self.outln('#include "EGL/eglplatform.h"') ++# Account for older eglplatform.h, which doesn't define ++# the EGL_CAST macro. ++self.outln('#ifndef EGL_CAST') ++self.outln('#if defined(__cplusplus)') ++self.outln('#define EGL_CAST(type, value) (static_cast(value))') ++self.outln('#else') ++self.outln('#define EGL_CAST(type, value) ((type) (value))') ++self.outln('#endif') ++self.outln('#endif') + else: + # Add some ridiculous inttypes.h redefinitions that are + # from khrplatform.h and not included in the XML. We diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb index c8b398f..0172322 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb @@ -5,7 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" -SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz"; +SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://Add-fallback-definition-for-EGL-CAST.patch" SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"; -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [morty][PATCH] ppp: include netinet/in.h before linux/in.h in pppoe.h
The patch ppp-fix-building-with-linux-4.8.patch tries to fix build error with 4.8 or newer linux headers, but it would break building with kernel < 4.8. There is a better solution to fix this issue in upstream. Backport the upstream patch and replace the old one. [YOCTO #10457] Signed-off-by: Yi Zhao --- ...oe-include-netinet-in.h-before-linux-in.h.patch | 54 ++ .../ppp/ppp/ppp-fix-building-with-linux-4.8.patch | 44 -- meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 2 +- 3 files changed, 55 insertions(+), 45 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch delete mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch new file mode 100644 index 000..9362d12 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch @@ -0,0 +1,54 @@ +From 50a2997b256e0e0ef7a46fae133f56f60fce539c Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 9 Jan 2017 13:34:23 + +Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h + +This fixes builds with newer kernels. Basically, needs to be +included before otherwise the earlier, unaware of the latter, +tries to redefine symbols and structures. Also, doesn't work +alone anymore, since it pulls the headers in the wrong order, so we better +include early. + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/50a2997b256e0e0ef7a46fae133f56f60fce539c] + +Signed-off-by: Yi Zhao +--- + pppd/plugins/rp-pppoe/pppoe.h | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..c4aaa6e 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +@@ -47,6 +47,10 @@ + #include + #endif + ++/* This has to be included before Linux 4.8's linux/in.h ++ * gets dragged in. */ ++#include ++ + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) + #include +@@ -84,8 +88,6 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include + +@@ -98,7 +100,6 @@ typedef unsigned long UINT32_t; + #endif + + +- + /* Ethernet frame types according to RFC 2516 */ + #define ETH_PPPOE_DISCOVERY 0x8863 + #define ETH_PPPOE_SESSION 0x8864 +-- +2.7.4 + diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch deleted file mode 100644 index f77b0de..000 --- a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 13 Oct 2016 13:41:43 +0800 -Subject: [PATCH] ppp: fix building with linux-4.8 - -Fix a build error when using the linux-4.8 headers that results in: - -In file included from pppoe.h:87:0, - from plugin.c:29: -../usr/include/netinet/in.h:211:8: note: originally defined here - struct in6_addr -^~~~ -In file included from ../usr/include/linux/if_pppol2tp.h:20:0, - from ../usr/include/linux/if_pppox.h:26, - from plugin.c:52: -../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' - struct sockaddr_in6 { -^~~~ - -Upstream-Status: Submitted [1] - -[1] https://github.com/paulusmack/ppp/pull/69 - -Signed-off-by: Jackie Huang - pppd/plugins/rp-pppoe/pppoe.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..96d2794 100644 a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -+#include - - #ifdef HAVE_NETINET_IF_ETHER_H - #include --- -2.8.3 - diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 56dbd98..ec9947f 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -30,7 +30,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ file://ppp@.service \ file://fix-CVE-2015-3310.patch \ - file://ppp-fix-building-with-linux-4.8.patch \ + file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ " SRC_URI_append_libc-musl = "\ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists
[OE-core] [PATCH] ppp: include netinet/in.h before linux/in.h in pppoe.h
The patch ppp-fix-building-with-linux-4.8.patch tries to fix build error with 4.8 or newer linux headers, but it would break building with kernel < 4.8. There is a better solution to fix this issue in upstream. Backport the upstream patch and replace the old one. Signed-off-by: Yi Zhao --- ...oe-include-netinet-in.h-before-linux-in.h.patch | 54 ++ .../ppp/ppp/ppp-fix-building-with-linux-4.8.patch | 44 -- meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 2 +- 3 files changed, 55 insertions(+), 45 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch delete mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch new file mode 100644 index 000..9362d12 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch @@ -0,0 +1,54 @@ +From 50a2997b256e0e0ef7a46fae133f56f60fce539c Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 9 Jan 2017 13:34:23 + +Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h + +This fixes builds with newer kernels. Basically, needs to be +included before otherwise the earlier, unaware of the latter, +tries to redefine symbols and structures. Also, doesn't work +alone anymore, since it pulls the headers in the wrong order, so we better +include early. + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/50a2997b256e0e0ef7a46fae133f56f60fce539c] + +Signed-off-by: Yi Zhao +--- + pppd/plugins/rp-pppoe/pppoe.h | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..c4aaa6e 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +@@ -47,6 +47,10 @@ + #include + #endif + ++/* This has to be included before Linux 4.8's linux/in.h ++ * gets dragged in. */ ++#include ++ + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) + #include +@@ -84,8 +88,6 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include + +@@ -98,7 +100,6 @@ typedef unsigned long UINT32_t; + #endif + + +- + /* Ethernet frame types according to RFC 2516 */ + #define ETH_PPPOE_DISCOVERY 0x8863 + #define ETH_PPPOE_SESSION 0x8864 +-- +2.7.4 + diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch deleted file mode 100644 index f77b0de..000 --- a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 13 Oct 2016 13:41:43 +0800 -Subject: [PATCH] ppp: fix building with linux-4.8 - -Fix a build error when using the linux-4.8 headers that results in: - -In file included from pppoe.h:87:0, - from plugin.c:29: -../usr/include/netinet/in.h:211:8: note: originally defined here - struct in6_addr -^~~~ -In file included from ../usr/include/linux/if_pppol2tp.h:20:0, - from ../usr/include/linux/if_pppox.h:26, - from plugin.c:52: -../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' - struct sockaddr_in6 { -^~~~ - -Upstream-Status: Submitted [1] - -[1] https://github.com/paulusmack/ppp/pull/69 - -Signed-off-by: Jackie Huang - pppd/plugins/rp-pppoe/pppoe.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..96d2794 100644 a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -+#include - - #ifdef HAVE_NETINET_IF_ETHER_H - #include --- -2.8.3 - diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index b2c4d4c..a5f764f 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -30,7 +30,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ file://ppp@.service \ file://fix-CVE-2015-3310.patch \ - file://ppp-fix-building-with-linux-4.8.patch \ + file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedd
Re: [OE-core] [PATCH 1/2] bind: build with threads and update configure options
On 2017年11月16日 18:27, Andre McCurdy wrote: On Fri, May 26, 2017 at 8:24 PM, Kang Kai wrote: On 2017年05月23日 17:58, Kang Kai wrote: On 2017年05月19日 19:47, Burton, Ross wrote: On 19 May 2017 at 09:52, wrote: Build without threads for bind is inherited from legacy openembedded. All libc's support proper threading on Linux now, so enable threads support for bind. It is also need to disable static library build which cause package dhcp fail to build after enable bind threads support. It seems this change was made without taking into account the advice given in: http://git.openembedded.org/openembedded-core/commit/?id=f28757a4b89447ea528cba987f0396b92aa0bbfe "If and when we ship bind's shared libraries we should ensure that the libraries go into a separate package." In rocko builds I see "named" running on port 53 and dnsmasq fails to start... Thanks. I'll check that. --Kai Options devpoll and epoll are configured to choose most preferable multiplex method for unix socket. The priorities are: epoll > poll > select. When set '--enable-epoll', it just defines a var and include header file that is available for cross compile. So use epoll for bind. Add PACKAGECONFIG 'urandom' that could use /dev/urandom as random device. Update file/directory ownerships to fix daemon start failure. -- Regards, Neil | Kai Kang -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, Failed tasks 2017-11-
Version 2 of patches came in between builds so lots of "version-going-backwards" == Failed tasks 2017-11-15 == INFO: jenkins-job.sh-1.8.43 Complete log available at http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.report.20171116_060616.log === common (3) === * meta-openembedded/meta-networking/recipes-daemons/ddclient/ddclient_3.8.3.bb:do_install * meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb:do_install * meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb:do_configure === common-x86 (0) === === qemuarm (2) === * meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb:do_compile * openembedded-core/meta/recipes-core/glibc/glibc-locale_2.26.bb:do_package_qa === qemuarm64 (3) === * meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb:do_install * meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb:do_configure * meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb:do_compile === qemux86 (27) === * meta-browser/recipes-browser/chromium/chromium_62.0.3202.94.bb:do_compile * meta-browser/recipes-browser/firefox/firefox_45.9.0esr.bb:do_compile * meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb:do_package * meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb:do_patch * meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb:do_compile * meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb:do_compile * meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb:do_compile * meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb:do_compile * meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb:do_configure * meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb:do_compile * meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb:do_compile * meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb:do_compile * meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb:do_compile * meta-openembedded/meta-oe/recipes-connectivity/umip/umip_1.0.bb:do_compile * meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb:do_compile * meta-openembedded/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb:do_compile * meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb:do_compile * meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.1.9.bb:do_compile * meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb:do_compile * meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb:do_compile * meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb:do_compile * meta-openembedded/meta-python/recipes-devtools/python/python-systemd_234.bb:do_compile * meta-qt5/recipes-qt/qt5/qtlocation_git.bb:do_compile * openembedded-core/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb:do_compile * openembedded-core/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb:do_compile * openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb:do_compile * openembedded-core/meta/recipes-multimedia/x264/x264_git.bb:do_package_qa === qemux86_64 (0) === === Number of failed tasks (45) === {| class=wikitable |- || qemuarm || 5 || http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.world.qemuarm.20171115_170535.log/ || http://errors.yoctoproject.org/Errors/Build/48458/ |- || qemuarm64|| 6 || http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.world.qemuarm64.20171115_214729.log/ || http://errors.yoctoproject.org/Errors/Build/48464/ |- || qemux86 || 30|| http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.world.qemux86.20171115_170555.log/ || http://errors.yoctoproject.org/Errors/Build/48457/ |- || qemux86_64 || 4 || http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.world.qemux86-64.20171115_213129.log/ || http://errors.yoctoproject.org/Errors/Build/48463/ |} === PNBLACKLISTs (0) === === QA issues (6949) === {| class=wikitable !| Count||Issue |- ||0 ||already-stripped |- ||0 ||build-deps |- ||0 ||compile-host-path |- ||0 ||file-rdeps |- ||0 ||invalid-pkgconfig |- ||0 ||ldflags |- ||0 ||libdir |- ||0 ||pkgname |- ||0 ||symlink-to-sysroot |- ||0 ||unknown-configure-option |- ||1 ||installed-vs-shipped |- ||2 ||host-user-contaminated |- ||2 ||textrel |- ||36||qa_pseudo |- ||6908 ||version-going-backwards |} === Incorrect PACKAGE_ARCH or sstate signatures (0) === Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/sumo/log.signatures.20171
Re: [OE-core] [PATCH 18/27] psmisc: update to 23.0
Boom. packages/corei7-64-poky-linux/psmisc: PACKAGES: removed "psmisc-locale", added "psmisc-locale-uk psmisc-locale-sv psmisc-locale-el psmisc-locale-ro psmisc-locale-da psmisc-locale-hr psmisc-locale-cs psmisc-locale-eo psmisc-locale-id psmisc-locale-sr psmisc-locale-it psmisc-locale-pt-br psmisc-locale-eu psmisc-locale-fi psmisc-locale-ca psmisc-locale-fr psmisc-locale-zh-tw psmisc-locale-pt psmisc-locale-de psmisc-locale-nl psmisc-locale-zh-cn psmisc-locale-bg psmisc-locale-vi psmisc-locale-nb psmisc-locale-hu psmisc-locale-pl psmisc-locale-ja psmisc-locale-ru" Upstream has a custom autogen.sh which invokes po/update-potfiles as they don't ship a po/POTFILES.in (which is silly). Without that file gettext doesn't believe po/ is a gettext directory and won't generate po/Makefile. We also disable autopoint by default in autotools.bbclass so that needs to be re-enabled (I've a long-standing branch to fix that but need to finish it off). This fixes the build: EXTRA_AUTORECONF="" do_configure_prepend() { ( cd ${S} && po/update-potfiles ) } Ross On 17 November 2017 at 00:25, Burton, Ross wrote: > I'm not sure that disabling translations entirely is a suitable fix for > upstreams makefile being broken (or our recipe breaking)... > > Did you look at the upstream repo to see if they've a fix, or how > complicated the fix would be? > > Ross > > On 14 November 2017 at 14:57, Alexander Kanavin intel.com> wrote: > >> Switch to gitlab, as that's where development now happens. >> Drop two upstreamed patches, add two patches to avoid newly >> introduced build errors. >> >> Signed-off-by: Alexander Kanavin >> --- >> ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 >> -- >> .../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 -- >> ...-create-src-directory-before-attempting-t.patch | 30 ++ >> ...efile.am-do-not-recurse-into-po-directory.patch | 30 ++ >> meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 -- >> meta/recipes-extended/psmisc/psmisc_23.0.bb| 11 ++ >> 6 files changed, 71 insertions(+), 87 deletions(-) >> delete mode 100644 meta/recipes-extended/psmisc/f >> iles/0001-Typo-in-fuser-makes-M-on-all-the-time.patch >> delete mode 100644 meta/recipes-extended/psmisc/f >> iles/0002-Include-limits.h-for-PATH_MAX.patch >> create mode 100644 meta/recipes-extended/psmisc/p >> smisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch >> create mode 100644 meta/recipes-extended/psmisc/p >> smisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch >> delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb >> create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb >> >> diff --git >> a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch >> b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser- >> makes-M-on-all-the-time.patch >> deleted file mode 100644 >> index e57d60f6a34..000 >> --- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser- >> makes-M-on-all-the-time.patch >> +++ /dev/null >> @@ -1,46 +0,0 @@ >> -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 >> -From: Brad Jorsch >> -Date: Fri, 28 Feb 2014 21:55:02 +1100 >> -Subject: [PATCH] Typo in fuser makes -M on all the time >> - >> -Brad found that fuser had the -M option on all the time. >> -A simple but significant typo caused this, thanks the the patch. >> - >> -Bug-Debian: http://bugs.debian.org/740275 >> - >> -Upstream-Status: Backport >> - >> -Signed-off-by: Craig Small >> >> - ChangeLog | 4 >> - src/fuser.c | 2 +- >> - 2 files changed, 5 insertions(+), 1 deletion(-) >> - >> -diff --git a/ChangeLog b/ChangeLog >> -index fd1cccf..e5f784c 100644 >> a/ChangeLog >> -+++ b/ChangeLog >> -@@ -1,3 +1,7 @@ >> -+Changes in 22.22 >> -+ >> -+ * Fixed typo in fuser which has -M on Debian #740275 >> -+ >> - Changes in 22.21 >> - >> - * Missing comma in fuser(1) added Debian #702391 >> -diff --git a/src/fuser.c b/src/fuser.c >> -index b485f65..389b302 100644 >> a/src/fuser.c >> -+++ b/src/fuser.c >> -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) >> - usage(_("No process specification given")); >> - >> - /* Check if -M flag was used and if so check mounts */ >> -- if (opts * OPT_ISMOUNTPOINT) { >> -+ if (opts & OPT_ISMOUNTPOINT) { >> - check_mountpoints(&mounts, &names_head, &names_tail); >> - } >> - >> --- >> -1.8.4.2 >> - >> diff --git >> a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch >> b/meta/recipes-extended/psmisc/files/0002-Include-limits.h- >> for-PATH_MAX.patch >> deleted file mode 100644 >> index c8afcac8a8b..000 >> --- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h- >> for-PATH_MAX.patch >> +++ /dev/null >> @@ -1,29 +0,0 @@ >> -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 0
Re: [OE-core] [PATCH 18/27] psmisc: update to 23.0
I'm not sure that disabling translations entirely is a suitable fix for upstreams makefile being broken (or our recipe breaking)... Did you look at the upstream repo to see if they've a fix, or how complicated the fix would be? Ross On 14 November 2017 at 14:57, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > Switch to gitlab, as that's where development now happens. > Drop two upstreamed patches, add two patches to avoid newly > introduced build errors. > > Signed-off-by: Alexander Kanavin > --- > ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 > -- > .../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 -- > ...-create-src-directory-before-attempting-t.patch | 30 ++ > ...efile.am-do-not-recurse-into-po-directory.patch | 30 ++ > meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 -- > meta/recipes-extended/psmisc/psmisc_23.0.bb| 11 ++ > 6 files changed, 71 insertions(+), 87 deletions(-) > delete mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser- > makes-M-on-all-the-time.patch > delete mode 100644 meta/recipes-extended/psmisc/ > files/0002-Include-limits.h-for-PATH_MAX.patch > create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am- > create-src-directory-before-attempting-t.patch > create mode 100644 meta/recipes-extended/psmisc/ > psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch > delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb > create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb > > diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in- > fuser-makes-M-on-all-the-time.patch b/meta/recipes-extended/ > psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch > deleted file mode 100644 > index e57d60f6a34..000 > --- a/meta/recipes-extended/psmisc/files/0001-Typo-in- > fuser-makes-M-on-all-the-time.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 > -From: Brad Jorsch > -Date: Fri, 28 Feb 2014 21:55:02 +1100 > -Subject: [PATCH] Typo in fuser makes -M on all the time > - > -Brad found that fuser had the -M option on all the time. > -A simple but significant typo caused this, thanks the the patch. > - > -Bug-Debian: http://bugs.debian.org/740275 > - > -Upstream-Status: Backport > - > -Signed-off-by: Craig Small > > - ChangeLog | 4 > - src/fuser.c | 2 +- > - 2 files changed, 5 insertions(+), 1 deletion(-) > - > -diff --git a/ChangeLog b/ChangeLog > -index fd1cccf..e5f784c 100644 > a/ChangeLog > -+++ b/ChangeLog > -@@ -1,3 +1,7 @@ > -+Changes in 22.22 > -+ > -+ * Fixed typo in fuser which has -M on Debian #740275 > -+ > - Changes in 22.21 > - > - * Missing comma in fuser(1) added Debian #702391 > -diff --git a/src/fuser.c b/src/fuser.c > -index b485f65..389b302 100644 > a/src/fuser.c > -+++ b/src/fuser.c > -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) > - usage(_("No process specification given")); > - > - /* Check if -M flag was used and if so check mounts */ > -- if (opts * OPT_ISMOUNTPOINT) { > -+ if (opts & OPT_ISMOUNTPOINT) { > - check_mountpoints(&mounts, &names_head, &names_tail); > - } > - > --- > -1.8.4.2 > - > diff --git > a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch > b/meta/recipes-extended/psmisc/files/0002-Include- > limits.h-for-PATH_MAX.patch > deleted file mode 100644 > index c8afcac8a8b..000 > --- a/meta/recipes-extended/psmisc/files/0002-Include- > limits.h-for-PATH_MAX.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001 > -From: Paul Barker > -Date: Wed, 20 Aug 2014 10:31:37 + > -Subject: [PATCH] Include for PATH_MAX > - > -When building against musl libc, PATH_MAX is defined in . > - > -Signed-off-by: Paul Barker > - > -Upstream-Status: Accepted (Should be in next release after 22.21) > > - src/pstree.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/pstree.c b/src/pstree.c > -index 071e6c4..0d28260 100644 > a/src/pstree.c > -+++ b/src/pstree.c > -@@ -41,6 +41,7 @@ > - #include > - #include > - #include > -+#include > - > - #include "i18n.h" > - #include "comm.h" > --- > -2.0.4 > - > diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile. > am-create-src-directory-before-attempting-t.patch b/meta/recipes-extended/ > psmisc/psmisc/0001-Makefile.am-create-src-directory- > before-attempting-t.patch > new file mode 100644 > index 000..4d44495fd3f > --- /dev/null > +++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile. > am-create-src-directory-before-attempting-t.patch > @@ -0,0 +1,30 @@ > +From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin > +Date: Thu, 2 Nov 2017 16:21:22 +0200 > +Subject: [
Re: [OE-core] [PATCH v2] go: ensure use of BUILD_CC when building bootstrap tools
On Thu, Nov 16, 2017 at 12:29 PM, Burton, Ross wrote: > Looks like this is failing on some of our autobuilders, such as > https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/58/steps/BuildImages/logs/stdio I'm looking into it. Thanks, -Matt > > | cmd/go/internal/vet > | # cmd/api > | > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/go/src/host-tools/link: > running x86_64-poky-linux-musl-gcc failed: exit status 1 > | > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/build-tmp/go-link-213113620/00.o: > In function `vfprintf': > | /usr/include/x86_64-linux-gnu/bits/stdio2.h:127: undefined reference to > `__vfprintf_chk' > | > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/build-tmp/go-link-213113620/00.o: > In function `fprintf': > | /usr/include/x86_64-linux-gnu/bits/stdio2.h:97: undefined reference to > `__fprintf_chk' > | collect2: error: ld returned 1 exit status > > It's running x86-64-poky-linux-musl-gcc but using headers from /usr, which > looks wrong. > > Ross > > > On 14 November 2017 at 17:21, Matt Madison wrote: >> >> Yes, drat it, v3 should fix that. >> >> Thanks, >> -Matt >> >> On Tue, Nov 14, 2017 at 9:20 AM, Otavio Salvador >> wrote: >> > Hello Matt, >> > >> > A minor thing: >> > >> > Upstream-Status: Pending >> > >> > On Tue, Nov 14, 2017 at 3:18 PM, Matt Madison >> > wrote: >> >> For cross-canadian builds, we were accidentally using >> >> the crosssdk C compiler when building the Go compiler >> >> bootstrap. Add a patch to the make script to let us >> >> use BUILD_CC, and prepend do_compile to set it in >> >> the local environment to ensure that the trailing >> >> blank gets stripped, since that confuses Go. >> >> >> >> [YOCTO #12341] >> >> >> >> Signed-off-by: Matt Madison >> >> --- >> >> meta/recipes-devtools/go/go-1.9.inc| 1 + >> >> ...verride-CC-when-building-dist-and-go_boot.patch | 43 >> >> ++ >> >> meta/recipes-devtools/go/go-common.inc | 4 ++ >> >> 3 files changed, 48 insertions(+) >> >> create mode 100644 >> >> meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch >> >> >> >> diff --git a/meta/recipes-devtools/go/go-1.9.inc >> >> b/meta/recipes-devtools/go/go-1.9.inc >> >> index 65adaa8..1dbb5ef 100644 >> >> --- a/meta/recipes-devtools/go/go-1.9.inc >> >> +++ b/meta/recipes-devtools/go/go-1.9.inc >> >> @@ -15,6 +15,7 @@ SRC_URI += "\ >> >> file://0007-ld-add-soname-to-shareable-objects.patch \ >> >> >> >> file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \ >> >> >> >> file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \ >> >> + >> >> file://0010-make.bash-override-CC-when-building-dist-and-go_boot.patch \ >> >> " >> >> SRC_URI[main.md5sum] = "da2d44ea384076efec43ee1f8b7d45d2" >> >> SRC_URI[main.sha256sum] = >> >> "a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993" >> >> diff --git >> >> a/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch >> >> b/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch >> >> new file mode 100644 >> >> index 000..94ea197 >> >> --- /dev/null >> >> +++ >> >> b/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch >> >> @@ -0,0 +1,43 @@ >> >> +From 36787fbf0e0a6298ba1038bbbae526654597eee4 Mon Sep 17 00:00:00 2001 >> >> +From: Matt Madison >> >> +Date: Tue, 14 Nov 2017 07:38:42 -0800 >> >> +Subject: [PATCH 10/10] make.bash: override CC when building dist and >> >> + go_bootstrap >> >> + >> >> +For cross-canadian builds, dist and go_bootstrap >> >> +run on the build host, so CC needs to point to the >> >> +build host's C compiler. Add a BUILD_CC environment >> >> +for this, falling back to $CC if not present. >> >> + >> >> +Upstream-Status: pending >> >> + >> >> +Signed-off-by: Matt Madison >> >> +--- >> >> + src/make.bash | 4 ++-- >> >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> >> + >> >> +diff --git a/src/make.bash b/src/make.bash >> >> +index 0bdadc6..f199349 100755 >> >> +--- a/src/make.bash >> >> b/src/make.bash >> >> +@@ -131,7 +131,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then >> >> + exit 1 >> >> + fi >> >> + rm -f cmd/dist/dist >> >> +-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" >> >> "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist >> >> ++CC=${BUILD_CC:-${CC}} GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" >> >> "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist >> >> + >> >> + # -e doesn't propagate out of eval, so check success by hand. >> >> + eval $(./cmd/dist/dist env -p || echo FAIL=true) >> >> +@@ -167,7 +167,7 @@ elif [ "$1" = "--host-only" ]; th
Re: [OE-core] [PATCH] python-setuptools: update to 36.7.2
python3-setuptools includes this file too, so this patch breaks that recipe. Ross On 16 November 2017 at 09:11, zhengrq wrote: > 1) Upgrade python-setuptools from 36.5.0 to 36.7.2. > > Signed-off-by: Zheng Ruoqin > --- > meta/recipes-devtools/python/python-setuptools.inc| > 4 ++-- > .../{python-setuptools_36.5.0.bb => python-setuptools_36.7.2.bb} | 0 > 2 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-devtools/python/{python-setuptools_36.5.0.bb => > python-setuptools_36.7.2.bb} (100%) > > diff --git a/meta/recipes-devtools/python/python-setuptools.inc > b/meta/recipes-devtools/python/python-setuptools.inc > index 1eae0b6..56b17ad 100644 > --- a/meta/recipes-devtools/python/python-setuptools.inc > +++ b/meta/recipes-devtools/python/python-setuptools.inc > @@ -9,8 +9,8 @@ SRCNAME = "setuptools" > > SRC_URI = "https://files.pythonhosted.org/packages/source/s/${ > SRCNAME}/${SRCNAME}-${PV}.zip" > > -SRC_URI[md5sum] = "704f500dd55f4bd0be905444f3ba892c" > -SRC_URI[sha256sum] = "ce2007c1cea3359870b80657d63425 > 3a0765b0c7dc5a988d77ba803fc86f2c64" > +SRC_URI[md5sum] = "1874983171af0f7b16b5ec48558e6e55" > +SRC_URI[sha256sum] = "ad86fd8dd09c285c33b4c5b82bbc21 > d21883637faef78b0ab58fa9984847220d" > > UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"; > > diff --git a/meta/recipes-devtools/python/python-setuptools_36.5.0.bb > b/meta/recipes-devtools/python/python-setuptools_36.7.2.bb > similarity index 100% > rename from meta/recipes-devtools/python/python-setuptools_36.5.0.bb > rename to meta/recipes-devtools/python/python-setuptools_36.7.2.bb > -- > 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] [yocto] [PATCH v4 1/3] image.bbclass: add prohibited-paths QA test
isn't it this class meta/classes/insane.bbclass for this type of checks? On Thu, 16 Nov 2017 15:05:56 + Martyn Welch wrote: > Sometimes we wish to ensure that files or directories are not installed > somewhere that may prove detrimental to the operation of the system. For > example, this may be the case if files are placed in a directory that is > utilised as a mount point at run time, thus making them inaccessible once > when the mount point is being utilised. > > Implement the prohibited paths QA test, which enables such locations to be > specified in a "IMAGE_QA_PROHIBITED_PATHS" variable. This implementation > allows for a colon separated list of paths to be provided. Shell style > wildcards can be used. > > Signed-off-by: Fabien Lahoudere > Signed-off-by: Martyn Welch > --- > Changes since v1: > - Correcting author and SOB. > > Changes since v2: > - Reimplemented as image rather than package level QA test. > - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better >reflect its use. > > Changes since v3: > - Rename variable to IMAGE_QA_PROHIBITED_PATHS. > - Use str.startswith(). > - Simplify if statement. > > meta/classes/image.bbclass | 20 > 1 file changed, 20 insertions(+) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index d93de02..9053ce3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -296,6 +296,26 @@ python do_image_complete_setscene () { > } > addtask do_image_complete_setscene > > +python image_check_prohibited_paths () { > +import glob > +from oe.utils import ImageQAFailed > + > +rootfs = d.getVar('IMAGE_ROOTFS') > + > +path = (d.getVar('IMAGE_QA_PROHIBITED_PATHS') or "") > +if path != "": > +for p in path.split(':'): > +if not p.startswith('/'): > +raise ImageQAFailed("IMAGE_QA_PROHIBITED_PATHS \"%s\" must > be an absolute path" % p, image_check_prohibited_paths) > + > +match = glob.glob("%s%s" % (rootfs, p)) > +if match: > +loc = ", ".join(item.replace(rootfs, '') for item in match) > +raise ImageQAFailed("Match(es) for IMAGE_QA_PROHIBITED_PATHS > \"%s\": %s" % (p, loc), image_check_prohibited_paths) > +} > + > +IMAGE_QA_COMMANDS += "image_check_prohibited_paths" > + > # Add image-level QA/sanity checks to IMAGE_QA_COMMANDS > # > # IMAGE_QA_COMMANDS += " \ > -- > 2.1.4 > > -- > ___ > yocto mailing list > yo...@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH v2 1/2] glibc: Fix CVE-2015-5180
On Thu, Nov 16, 2017 at 12:45 PM, akuster808 wrote: > > > On 11/15/2017 12:36 PM, George McCollister wrote: >> Add backported patch to fix CVE-2015-5180 from the upstream >> release/2.24/master branch. >> >> Signed-off-by: George McCollister > > Thanks for this series. I will have to wait until I address this in Pyro. CVE-2015-5180 should not be an issue in glibc 2.25. The CVE-2017-1000366 commits backported to glibc 2.25 are here: https://sourceware.org/git/?p=glibc.git;a=commit;h=3c7cd21290cabdadd72984fb69bc51e64ff1002d https://sourceware.org/git/?p=glibc.git;a=commit;h=46703a3995aa3ca2b816814aa4ad05ed524194dd https://sourceware.org/git/?p=glibc.git;a=commit;h=c69d4a0f680a24fdbe323764a50382ad324041e9 Would it help if I sent Pyro patches for these? > > - armin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] go: ensure use of BUILD_CC when building bootstrap tools
Looks like this is failing on some of our autobuilders, such as https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/58/steps/BuildImages/logs/stdio | cmd/go/internal/vet | # cmd/api | /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/go/src/host-tools/link: running x86_64-poky-linux-musl-gcc failed: exit status 1 | /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/build-tmp/go-link-213113620/00.o: In function `vfprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:127: undefined reference to `__vfprintf_chk' | /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/go/1.9-r0/build-tmp/go-link-213113620/00.o: In function `fprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:97: undefined reference to `__fprintf_chk' | collect2: error: ld returned 1 exit status It's running x86-64-poky-linux-musl-gcc but using headers from /usr, which looks wrong. Ross On 14 November 2017 at 17:21, Matt Madison wrote: > > Yes, drat it, v3 should fix that. > > Thanks, > -Matt > > On Tue, Nov 14, 2017 at 9:20 AM, Otavio Salvador > wrote: > > Hello Matt, > > > > A minor thing: > > > > Upstream-Status: Pending > > > > On Tue, Nov 14, 2017 at 3:18 PM, Matt Madison wrote: > >> For cross-canadian builds, we were accidentally using > >> the crosssdk C compiler when building the Go compiler > >> bootstrap. Add a patch to the make script to let us > >> use BUILD_CC, and prepend do_compile to set it in > >> the local environment to ensure that the trailing > >> blank gets stripped, since that confuses Go. > >> > >> [YOCTO #12341] > >> > >> Signed-off-by: Matt Madison > >> --- > >> meta/recipes-devtools/go/go-1.9.inc| 1 + > >> ...verride-CC-when-building-dist-and-go_boot.patch | 43 ++ > >> meta/recipes-devtools/go/go-common.inc | 4 ++ > >> 3 files changed, 48 insertions(+) > >> create mode 100644 meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch > >> > >> diff --git a/meta/recipes-devtools/go/go-1.9.inc b/meta/recipes-devtools/go/go-1.9.inc > >> index 65adaa8..1dbb5ef 100644 > >> --- a/meta/recipes-devtools/go/go-1.9.inc > >> +++ b/meta/recipes-devtools/go/go-1.9.inc > >> @@ -15,6 +15,7 @@ SRC_URI += "\ > >> file://0007-ld-add-soname-to-shareable-objects.patch \ > >> file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \ > >> file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \ > >> + file://0010-make.bash-override-CC-when-building-dist-and-go_boot.patch \ > >> " > >> SRC_URI[main.md5sum] = "da2d44ea384076efec43ee1f8b7d45d2" > >> SRC_URI[main.sha256sum] = "a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993" > >> diff --git a/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch > >> new file mode 100644 > >> index 000..94ea197 > >> --- /dev/null > >> +++ b/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch > >> @@ -0,0 +1,43 @@ > >> +From 36787fbf0e0a6298ba1038bbbae526654597eee4 Mon Sep 17 00:00:00 2001 > >> +From: Matt Madison > >> +Date: Tue, 14 Nov 2017 07:38:42 -0800 > >> +Subject: [PATCH 10/10] make.bash: override CC when building dist and > >> + go_bootstrap > >> + > >> +For cross-canadian builds, dist and go_bootstrap > >> +run on the build host, so CC needs to point to the > >> +build host's C compiler. Add a BUILD_CC environment > >> +for this, falling back to $CC if not present. > >> + > >> +Upstream-Status: pending > >> + > >> +Signed-off-by: Matt Madison > >> +--- > >> + src/make.bash | 4 ++-- > >> + 1 file changed, 2 insertions(+), 2 deletions(-) > >> + > >> +diff --git a/src/make.bash b/src/make.bash > >> +index 0bdadc6..f199349 100755 > >> +--- a/src/make.bash > >> b/src/make.bash > >> +@@ -131,7 +131,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then > >> + exit 1 > >> + fi > >> + rm -f cmd/dist/dist > >> +-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist > >> ++CC=${BUILD_CC:-${CC}} GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist > >> + > >> + # -e doesn't propagate out of eval, so check success by hand. > >> + eval $(./cmd/dist/dist env -p || echo FAIL=true) > >> +@@ -167,7 +167,7 @@ elif [ "$1" = "--host-only" ]; then > >> + fi > >> + > >> + if [ "$do_host_build" = "yes" ]; then > >> +- ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap > >> ++ CC=${BUILD_CC:-${CC}} ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap > >> + # Delay move of dist t
Re: [OE-core] [PATCH 1/4] gnutls: improve reproducibility
On Thu, Nov 16, 2017 at 11:48 AM, Juro Bystricky wrote: > Sanitize generated config.h containing build host reference such as: > > #define POSIX_SHELL "/tmp/hosttools/bash" > > The path for POSIX_SHELL is not only wrong for the cross-compiled target, > it also prevents reproducible build. > > Prior the compilation we edit the value to: > > #define POSIX_SHELL "bash" > > With this change we can build reproducible libgnutls-bin, libgnutls-dev > and libgnutls-dbg packages. Is there a configure option we could use (perhaps via CACHED_CONFIGUREVARS) to achieve the same end result without needing to run sed on config.h? > Signed-off-by: Juro Bystricky > --- > meta/recipes-support/gnutls/gnutls.inc | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/meta/recipes-support/gnutls/gnutls.inc > b/meta/recipes-support/gnutls/gnutls.inc > index 29b5dd6..5b45b27 100644 > --- a/meta/recipes-support/gnutls/gnutls.inc > +++ b/meta/recipes-support/gnutls/gnutls.inc > @@ -53,6 +53,11 @@ do_configure_prepend() { > done > } > > +do_configure_append_class-target () { > + # Remove build host references from config.h > + sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${B}/config.h > +} > + > PACKAGES =+ "${PN}-openssl ${PN}-xx" > > FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" > -- > 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
[OE-core] [PATCH 2/4] grub-efi_2.02.bb: improve reproducibility
Remove several build host references from modinfo.sh files. Signed-off-by: Juro Bystricky --- meta/recipes-bsp/grub/grub-efi_2.02.bb | 10 ++ 1 file changed, 10 insertions(+) diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb b/meta/recipes-bsp/grub/grub-efi_2.02.bb index b949beb..44e32a8 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.02.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb @@ -41,6 +41,16 @@ do_install_class-native() { install -m 755 grub-mkimage ${D}${bindir} } +do_install_append_class-target() { +# Remove build host references... +find "${D}" -name modinfo.sh -type f -exec \ +sed -i \ +-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ +-e 's|${DEBUG_PREFIX_MAP}||g' \ +-e 's:${RECIPE_SYSROOT_NATIVE}::g' \ +{} + +} + GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search" do_deploy() { -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] gnutls: improve reproducibility
Sanitize generated config.h containing build host reference such as: #define POSIX_SHELL "/tmp/hosttools/bash" The path for POSIX_SHELL is not only wrong for the cross-compiled target, it also prevents reproducible build. Prior the compilation we edit the value to: #define POSIX_SHELL "bash" With this change we can build reproducible libgnutls-bin, libgnutls-dev and libgnutls-dbg packages. Signed-off-by: Juro Bystricky --- meta/recipes-support/gnutls/gnutls.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 29b5dd6..5b45b27 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -53,6 +53,11 @@ do_configure_prepend() { done } +do_configure_append_class-target () { + # Remove build host references from config.h + sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${B}/config.h +} + PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] x11perf: improve reproducibility
Remove build host refeences. Signed-off-by: Juro Bystricky --- meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb index 4e93558..a06aa26 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +do_install_append_class-target () { +sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp +} + FILES_${PN} += "${libdir}/X11/x11perfcomp/*" SRC_URI[md5sum] = "f0b24e4d8beb622a419e8431e1c03cd7" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] sudo: improve reproducibility
Delete various build host references from the internally generated file sudo_usage.h. The references get compiled into executables, which leads to non-reproducible builds. The removed references (configure options) were only used as part of the sudo "usage", and even then only when ran as root. Signed-off-by: Juro Bystricky --- meta/recipes-extended/sudo/sudo.inc | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 8c16d83..80ec0ae 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -27,6 +27,12 @@ EXTRA_OECONF_append_libc-musl = " --disable-hardening " # mksigname/mksiglist are used on build host to generate source files do_compile_prepend () { + # Remove build host references from sudo_usage.h + sed -i \ + -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,--build=${BUILD_SYS},,g' \ + -e 's,--host=${HOST_SYS},,g' \ + ${B}/src/sudo_usage.h oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] improve reproducibility of several packages
These are independent patches with the same theme: leaking build host information in various distributed files. Juro Bystricky (4): gnutls: improve reproducibility grub-efi_2.02.bb: improve reproducibility x11perf: improve reproducibility sudo: improve reproducibility meta/recipes-bsp/grub/grub-efi_2.02.bb | 10 ++ meta/recipes-extended/sudo/sudo.inc | 6 ++ meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb | 4 meta/recipes-support/gnutls/gnutls.inc | 5 + 4 files changed, 25 insertions(+) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bitbake.conf: add 'xz' to HOSTTOOLS
On Thu, Nov 16, 2017 at 1:16 AM André Draszik wrote: > Files in SRC_URI that are xz compressed can not be > unpacked without this, as we'd have no decompressor > available. I thought we added xz-native dependency to such recipes > > > Signed-off-by: André Draszik > --- > meta/conf/bitbake.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 9696273acc..dfc4de56a6 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -480,7 +480,7 @@ HOSTTOOLS += " \ > mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd > python python2 \ > python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh > sha256sum \ > sleep sort split stat strings strip tail tar tee test touch tr true > uname \ > -uniq wc wget which xargs \ > +uniq wc wget which xargs xz \ > " > > # Tools needed to run testimage runtime image testing > -- > 2.15.0.rc1 > > -- > ___ > 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] [meta-oe][PATCH V2]ethtool updated to 4.13] ethtool bb: upgraded the .bb to pick latest ethtool-4.13.tar.xz
4.13 Release notes : * Fix: Do not return error code if no changes were attempted. * Fix: Fix formatting of advertise bitmask * Feature: Document 56000 advertise link modes * Fix: fix the rx vs tx mixup in set channel message * Feature: add support for HWTSTAMP_FILTER_NTP_ALL * Feature: Add DMA Coalescing support * Feature: Remove UDP Fragmentation Offload error prints * Feature: stmmac: Add macros for number of registers * Feature: stmmac: Add DMA HW Feature Register John W. Linville more info at this link https://marc.info/?l=linux-netdev&m=150912901726399&w=2 Tests : - Compiled and tested the ethtool 4.13 package from https://www.kernel.org/pub/software/network/ethtool/ethtool-4.13.tar.xz using AARCH64 compiler [compilation succeed and also the binary works] Signed-off-by: RC Reddy --- meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool_4.11.bb b/meta/recipes-extended/ethtool/ethtool_4.13.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.11.bb rename to meta/recipes-extended/ethtool/ethtool_4.13.bb index befe9b9..c862a57 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.11.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.13.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "8f1072679888c9335e49b17efb798b4c" -SRC_URI[sha256sum] = "af2fd9692f3159d3ab1e41e6f9b7d8db2a4693f1cb22348c88ba89f70f0e6503" +SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" +SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH v2 1/2] glibc: Fix CVE-2015-5180
On 11/15/2017 12:36 PM, George McCollister wrote: > Add backported patch to fix CVE-2015-5180 from the upstream > release/2.24/master branch. > > Signed-off-by: George McCollister Thanks for this series. I will have to wait until I address this in Pyro. - armin > --- > > Changes in v2: > - Fix commit message > > ...80-resolv-Fix-crash-with-internal-QTYPE-B.patch | 357 > + > meta/recipes-core/glibc/glibc_2.24.bb | 1 + > 2 files changed, 358 insertions(+) > create mode 100644 > meta/recipes-core/glibc/glibc/0001-CVE-2015-5180-resolv-Fix-crash-with-internal-QTYPE-B.patch > > diff --git > a/meta/recipes-core/glibc/glibc/0001-CVE-2015-5180-resolv-Fix-crash-with-internal-QTYPE-B.patch > > b/meta/recipes-core/glibc/glibc/0001-CVE-2015-5180-resolv-Fix-crash-with-internal-QTYPE-B.patch > new file mode 100644 > index 00..ba0bebe488 > --- /dev/null > +++ > b/meta/recipes-core/glibc/glibc/0001-CVE-2015-5180-resolv-Fix-crash-with-internal-QTYPE-B.patch > @@ -0,0 +1,357 @@ > +From ff9b7c4fb73295cd2de2d2ccfbbf4f6d50883d47 Mon Sep 17 00:00:00 2001 > +From: Florian Weimer > +Date: Sat, 31 Dec 2016 20:22:09 +0100 > +Subject: [PATCH] CVE-2015-5180: resolv: Fix crash with internal QTYPE [BZ > + #18784] > + > +Also rename T_UNSPEC because an upcoming public header file > +update will use that name. > + > +(cherry picked from commit fc82b0a2dfe7dbd35671c10510a8da1043d746a5) > + > +Upstream-Status: Backport > +https://sourceware.org/git/?p=glibc.git;a=patch;h=b3b37f1a5559a7620e31c8053ed1b44f798f2b6d > + > +CVE: CVE-2015-5180 > + > +Signed-off-by: George McCollister > +--- > + ChangeLog | 14 > + NEWS | 6 ++ > + include/arpa/nameser_compat.h | 6 +- > + resolv/Makefile | 5 ++ > + resolv/nss_dns/dns-host.c | 2 +- > + resolv/res_mkquery.c | 4 + > + resolv/res_query.c| 6 +- > + resolv/tst-resolv-qtypes.c| 185 > ++ > + 8 files changed, 221 insertions(+), 7 deletions(-) > + create mode 100644 resolv/tst-resolv-qtypes.c > + > +diff --git a/ChangeLog b/ChangeLog > +index 893262de11..2bdaf69e43 100644 > +--- a/ChangeLog > b/ChangeLog > +@@ -1,3 +1,17 @@ > ++2016-12-31 Florian Weimer > ++ > ++[BZ #18784] > ++CVE-2015-5180 > ++* include/arpa/nameser_compat.h (T_QUERY_A_AND_): Rename from > ++T_UNSPEC. Adjust value. > ++* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname4_r): Use it. > ++* resolv/res_query.c (__libc_res_nquery): Likewise. > ++* resolv/res_mkquery.c (res_nmkquery): Check for out-of-range > ++QTYPEs. > ++* resolv/tst-resolv-qtypes.c: New file. > ++* resolv/Makefile (xtests): Add tst-resolv-qtypes. > ++(tst-resolv-qtypes): Link against libresolv and libpthread. > ++ > + 2016-10-26 Carlos O'Donell > + > + * include/atomic.h > +diff --git a/NEWS b/NEWS > +index 3002773c16..4b1ca3cb65 100644 > +--- a/NEWS > b/NEWS > +@@ -11,6 +11,12 @@ using `glibc' in the "product" field. > + printers show various pthread variables in human-readable form when read > + using the 'print' or 'display' commands in gdb. > + > ++* The DNS stub resolver functions would crash due to a NULL pointer > ++ dereference when processing a query with a valid DNS question type which > ++ was used internally in the implementation. The stub resolver now uses a > ++ question type which is outside the range of valid question type values. > ++ (CVE-2015-5180) > ++ > + Version 2.24 > + > + * The minimum Linux kernel version that this version of the GNU C Library > +diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h > +index 2e735ede4c..7c0deed9ae 100644 > +--- a/include/arpa/nameser_compat.h > b/include/arpa/nameser_compat.h > +@@ -1,8 +1,8 @@ > + #ifndef _ARPA_NAMESER_COMPAT_ > + #include > + > +-/* Picksome unused number to represent lookups of IPv4 and IPv6 (i.e., > +- T_A and T_). */ > +-#define T_UNSPEC 62321 > ++/* The number is outside the 16-bit RR type range and is used > ++ internally by the implementation. */ > ++#define T_QUERY_A_AND_ 439963904 > + > + #endif > +diff --git a/resolv/Makefile b/resolv/Makefile > +index 8be41d3ae1..a4c86b9762 100644 > +--- a/resolv/Makefile > b/resolv/Makefile > +@@ -40,6 +40,9 @@ ifeq ($(have-thread-library),yes) > + extra-libs += libanl > + routines += gai_sigqueue > + tests += tst-res_hconf_reorder > ++ > ++# This test sends millions of packets and is rather slow. > ++xtests += tst-resolv-qtypes > + endif > + extra-libs-others = $(extra-libs) > + libresolv-routines := gethnamaddr res_comp res_debug\ > +@@ -117,3 +120,5 @@ tst-leaks2-ENV = MALLOC_TRACE=$(objpfx)tst-leaks2.mtrace > + $(objpfx)mtrace-tst-leaks2.out: $(objpfx)tst-leaks2.out > + $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@; \ > + $(evaluate-test) > ++ > ++$(objpfx)tst-resolv-qtypes: $(objpfx)libre
Re: [OE-core] [meta-oe][PATCH]ethool updated to 4.13] ethtool bb: upgraded the .bb to pick latest ethtool-4.13.tar.xz
Hi Larson, I built ethtool individually [download 4.13 tar and then compiled] and a yocto image generated has 4.11, i wanted to upgrade the default in the yocto, thats why the effort. i will put the release notes on upgrade. will correct the typo. Thanks On Thu, Nov 16, 2017 at 10:55 AM, Christopher Larson wrote: > > > On Thu, Nov 16, 2017 at 8:47 AM, RC Reddy wrote: > >> Tests : - Compiled and tested the ethtool 4.13 package from >> https://www.kernel.org/pub/software/network/ethtool/ethtool-4.13.tar.xz >> using AARCH64 compiler [compilation succeed and also the binary works] >> >> Signed-off-by: RC Reddy >> --- >> meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} | 4 >> ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> rename meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} >> (88%) >> >> diff --git a/meta/recipes-extended/ethtool/ethtool_4.11.bb >> b/meta/recipes-extended/ethtool/ethtool_4.13.bb >> similarity index 88% >> rename from meta/recipes-extended/ethtool/ethtool_4.11.bb >> rename to meta/recipes-extended/ethtool/ethtool_4.13.bb >> index befe9b9..c862a57 100644 >> --- a/meta/recipes-extended/ethtool/ethtool_4.11.bb >> +++ b/meta/recipes-extended/ethtool/ethtool_4.13.bb >> @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/ >> network/ethtool/ethtool-${PV}.tar.gz \ >> file://avoid_parallel_tests.patch \ >> " >> >> -SRC_URI[md5sum] = "8f1072679888c9335e49b17efb798b4c" >> -SRC_URI[sha256sum] = "af2fd9692f3159d3ab1e41e6f9b7d >> 8db2a4693f1cb22348c88ba89f70f0e6503" >> +SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" >> +SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19 >> c391a60d8e4830b6a7f41be16d89c0556de" >> >> > If you’re going to update a checksum for a tarball that was replaced > in-place upstream, we need to know why it changed, and what changed, > otherwise it could well have been compromised. Also, the subject line has a > typo: ethool. > -- > Christopher Larson > kergoth at gmail dot com > Founder - BitBake, OpenEmbedded, OpenZaurus > Senior Software Engineer, Mentor Graphics > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [U-Boot] [PATCH] u-boot: Upgrade to 2017.11 release
On Thu, Nov 16, 2017 at 4:21 PM, Marek Vasut wrote: > On 11/16/2017 01:02 PM, Otavio Salvador wrote: >> On Thu, Nov 16, 2017 at 6:12 AM, Marek Vasut wrote: >>> On 11/15/2017 05:47 PM, Stefan Agner wrote: On 2017-11-14 19:32, Otavio Salvador wrote: > This upgrades the U-Boot from 2017.09 to 2017.11 release. You might encounter this when building fw_printenv/setenv tools alone: https://lists.denx.de/pipermail/u-boot/2017-November/311505.html >>> >>> [...] >>> > SRC_URI = "git://git.denx.de/u-boot.git \ > file://MPC8315ERDB-enable-DHCP.patch \ >>> I also see that the number of out-of-tree patches didn't change since >>> last time, even though I complained about it ... why are these patches >>> still here ? >> >> Because you are the maintainer and didn't do your duty. > > And what duty is that exactly ? I at least inquired about the status of > these patches and reviewed them [1] (the other was not submitted to ML > yet and submitter is not responding), so do you have anything else in mind ? > > [1] https://marc.info/?l=u-boot&m=150533817907015&w=2 Good, so I don't see the reason for the question. I did upgrade the recipe and tested. It didn't have patches merged so there is nothing I can do. You being the maintainer can keep an eye here. >>> I also see that the number of out-of-tree patches didn't change since >>> last time, even though I complained about it ... why are these patches >>> still here ? Your question was pointless. So instead of "complain" as you said, make sure those are merged. -- 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
Re: [OE-core] [U-Boot] [PATCH] u-boot: Upgrade to 2017.11 release
On 11/16/2017 01:02 PM, Otavio Salvador wrote: > On Thu, Nov 16, 2017 at 6:12 AM, Marek Vasut wrote: >> On 11/15/2017 05:47 PM, Stefan Agner wrote: >>> On 2017-11-14 19:32, Otavio Salvador wrote: This upgrades the U-Boot from 2017.09 to 2017.11 release. >>> >>> You might encounter this when building fw_printenv/setenv tools alone: >>> >>> https://lists.denx.de/pipermail/u-boot/2017-November/311505.html >> >> [...] >> SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \ >> I also see that the number of out-of-tree patches didn't change since >> last time, even though I complained about it ... why are these patches >> still here ? > > Because you are the maintainer and didn't do your duty. And what duty is that exactly ? I at least inquired about the status of these patches and reviewed them [1] (the other was not submitted to ML yet and submitter is not responding), so do you have anything else in mind ? [1] https://marc.info/?l=u-boot&m=150533817907015&w=2 > Stop complaining and go help please. I'll just ignore this comment, see above. -- Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] meson: export native env only for native build
On 11/16/2017 09:52 AM, Alexander Kanavin wrote: On 11/15/2017 07:53 PM, Martin Kelly wrote: +meson_do_configure_prepend_class-native() { + export PKG_CONFIG="pkg-config-native" +} + What does this bit do? Should it go to a separate patch? Alex This is from Ross Burton's patch to meta-oe 6e2d975fc16f4228a2d952bde1a874f337281ada ("meson: export PKG_CONFIG to use pkg-config-native for native builds"). Since it's already present in meta-oe, this logic doesn't need a separate patch for meta-oe; I just moved the line into meson_do_configure instead of making it global. However, your branch doesn't have Ross's patch. Ideally, I think you should first cherry-pick Ross Burton's patch into your branch and then put my patch on top of it. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/3] image.bbclass: add prohibited-paths QA test
On Thu, Nov 16, 2017 at 1:05 PM, Martyn Welch wrote: > Sometimes we wish to ensure that files or directories are not installed > somewhere that may prove detrimental to the operation of the system. For > example, this may be the case if files are placed in a directory that is > utilised as a mount point at run time, thus making them inaccessible once > when the mount point is being utilised. > > Implement the prohibited paths QA test, which enables such locations to be > specified in a "IMAGE_QA_PROHIBITED_PATHS" variable. This implementation > allows for a colon separated list of paths to be provided. Shell style > wildcards can be used. > > Signed-off-by: Fabien Lahoudere > Signed-off-by: Martyn Welch > --- > Changes since v1: > - Correcting author and SOB. > > Changes since v2: > - Reimplemented as image rather than package level QA test. > - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better >reflect its use. > > Changes since v3: > - Rename variable to IMAGE_QA_PROHIBITED_PATHS. > - Use str.startswith(). > - Simplify if statement. > > meta/classes/image.bbclass | 20 > 1 file changed, 20 insertions(+) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index d93de02..9053ce3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -296,6 +296,26 @@ python do_image_complete_setscene () { > } > addtask do_image_complete_setscene > > +python image_check_prohibited_paths () { > +import glob > +from oe.utils import ImageQAFailed > + > +rootfs = d.getVar('IMAGE_ROOTFS') > + > +path = (d.getVar('IMAGE_QA_PROHIBITED_PATHS') or "") > +if path != "": > +for p in path.split(':'): > +if not p.startswith('/'): > +raise ImageQAFailed("IMAGE_QA_PROHIBITED_PATHS \"%s\" must > be an absolute path" % p, image_check_prohibited_paths) > + > +match = glob.glob("%s%s" % (rootfs, p)) > +if match: > +loc = ", ".join(item.replace(rootfs, '') for item in match) > +raise ImageQAFailed("Match(es) for IMAGE_QA_PROHIBITED_PATHS > \"%s\": %s" % (p, loc), image_check_prohibited_paths) > +} for p in path.split(':'): if not p.startswith('/'): so you can drop the if path != "". An empty list won't go inside the for. Each item needs to be tested. > +IMAGE_QA_COMMANDS += "image_check_prohibited_paths" > + > # Add image-level QA/sanity checks to IMAGE_QA_COMMANDS > # > # IMAGE_QA_COMMANDS += " \ > -- > 2.1.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- 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
Re: [OE-core] [PATCH v2] meson: Port pkgconfig-native patch to 0.43.0
On Thu, Nov 16, 2017 at 6:54 PM, Alexander Kanavin wrote: > On 11/16/2017 07:45 PM, Ricardo Ribalda Delgado wrote: >> >> +Some libraries, like QT, have pre-processors that convert their input >> +files into something that the cross-compiler can process. We find the >> +path of those pre-processors via pkg-config-native instead of >> +pkg-config. >> + >> +This path forces the use of pkg-config-native for host_bins arguments. >> + >> +There are some discussions upstream to merge this patch, but I presonaly >> believe >> +that is is OE only. >> https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 > > > Does the snippet from Martin's patch that I just commented on solve this > issue in a much simpler way? I am afraid not. We need to call pkg-config for getting the -libs -cflags, et all, and pkg-config-native for --host_bins We cannot use the same pkg-config for all unfortunatelly. > > Alex -- Ricardo Ribalda -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] meson: Port pkgconfig-native patch to 0.43.0
On 11/16/2017 07:45 PM, Ricardo Ribalda Delgado wrote: +Some libraries, like QT, have pre-processors that convert their input +files into something that the cross-compiler can process. We find the +path of those pre-processors via pkg-config-native instead of +pkg-config. + +This path forces the use of pkg-config-native for host_bins arguments. + +There are some discussions upstream to merge this patch, but I presonaly believe +that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 Does the snippet from Martin's patch that I just commented on solve this issue in a much simpler way? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] meson: export native env only for native build
On 11/15/2017 07:53 PM, Martin Kelly wrote: +meson_do_configure_prepend_class-native() { +export PKG_CONFIG="pkg-config-native" +} + What does this bit do? Should it go to a separate patch? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] meson: Port pkgconfig-native patch to 0.43.0
The update to 0.43.0 forgot to add this patch required for qt builds. Signed-off-by: Ricardo Ribalda Delgado --- This patch sits on top of Alexander Kanavin's "Introduce meson build system" patchset. .../meson/meson/0003-native_bindir.patch | 95 ++ meta/recipes-devtools/meson/meson_0.43.0.bb| 1 + 2 files changed, 96 insertions(+) create mode 100644 meta/recipes-devtools/meson/meson/0003-native_bindir.patch diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch new file mode 100644 index ..1df1536a7228 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -0,0 +1,95 @@ +From 01dd18c9c9c042268b87d576624c16fc74253cd9 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado +Date: Wed, 15 Nov 2017 15:05:01 +0100 +Subject: [PATCH] native_bindir + +Some libraries, like QT, have pre-processors that convert their input +files into something that the cross-compiler can process. We find the +path of those pre-processors via pkg-config-native instead of +pkg-config. + +This path forces the use of pkg-config-native for host_bins arguments. + +There are some discussions upstream to merge this patch, but I presonaly believe +that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ricardo Ribalda Delgado +--- + mesonbuild/dependencies/base.py | 14 +- + mesonbuild/dependencies/ui.py | 6 +++--- + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index 0d9742d426cb..0c8e79a8e9e3 100644 +--- a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +@@ -114,7 +114,7 @@ class Dependency: + def need_threads(self): + return False + +-def get_pkgconfig_variable(self, variable_name): ++def get_pkgconfig_variable(self, variable_name, use_native=False): + raise NotImplementedError('{!r} is not a pkgconfig dependency'.format(self.name)) + + +@@ -256,8 +256,12 @@ class PkgConfigDependency(ExternalDependency): + return s.format(self.__class__.__name__, self.name, self.is_found, + self.version_reqs) + +-def _call_pkgbin(self, args): +-p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] ++def _call_pkgbin(self, args, use_native=False): ++if use_native: ++pkgbin = [self.pkgbin + "-native"] ++else: ++pkgbin = [self.pkgbin] ++p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2] + return p.returncode, out.strip() + + def _set_cargs(self): +@@ -291,8 +295,8 @@ class PkgConfigDependency(ExternalDependency): + self.is_libtool = True + self.link_args.append(lib) + +-def get_pkgconfig_variable(self, variable_name): +-ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) ++def get_pkgconfig_variable(self, variable_name, use_native=False): ++ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native) + variable = '' + if ret != 0: + if self.required: +diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +index 8f183e54d4d2..34ef33e79ad9 100644 +--- a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency): + self.bindir = self.get_pkgconfig_host_bins(core) + if not self.bindir: + # If exec_prefix is not defined, the pkg-config file is broken +-prefix = core.get_pkgconfig_variable('exec_prefix') ++prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True) + if prefix: + self.bindir = os.path.join(prefix, 'bin') + +@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency): + applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] + for application in applications: + try: +-return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application)) ++return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, use_native=True)) + except MesonException: + pass + +@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency): + QtBaseDependency.__init__(self, 'qt5', env, kwargs) + + def get_pkgconfig_host_bins(self, core): +-return core.get_pkgconfig_variable('host_bins') ++return core.get_pkgconfig_variable('host_bins', use_native=True) + + + # There are three different ways of depending on SDL2: +-- +2.15.0 + diff --git a/meta/recipes-devtools/meson/meson_0.43.0.bb b/meta/recipes-devtools/meson/meson_0.43.0.bb index bbb48d9197c0..403f744c1cf5 100644 --- a/
Re: [OE-core] Error when connecting to OpenSSH server using rocko
On 2017-11-16 16:06, Alexander Kanavin wrote: > On 11/16/2017 04:51 PM, Stefan Agner wrote: >> True, I cannot reproduce using qemuarm, but I created a ARMv7 qemu >> machine and run that using qemu-system-arm -M virt -cpu cortex-a15, and >> it did fail... >> >> So yeah qemuarm is not affected, but pretty much every relevant 32-bit >> ARM machine out there... > > openssl recipes have an architecture-specific configuration step where > you need to specify the target machine by hand. I strongly *suspect* > we do something incorrectly there in the 1.0 recipe for ARM machines. Nothing really concerning has changed in that region between morty to rocko from what I can tell. I replaced libcrypto.so (OpenSSL 1.0.2j) from a morty build and I was able to connect again... (while still using OpenSSH_7.5p1). So it seems to be a OpenSSL issue. > > I couldn't stand looking at that mess when writing 1.1, so rewrote the > whole recipe from scratch, and it *probably* works correctly on ARM :) Yeah it seems to work fine here, even on ARMv7 :-) -- Stefan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/7] screen: upgrade to 4.6.2
Breaks under MIPS, see https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353. Ross On 10 November 2017 at 12:00, Maxin B. John wrote: > 4.6.1 -> 4.6.2 > > Removed backported patches: > 1. 0001-fix-for-multijob-build.patch > 2. 0002-comm.h-now-depends-on-term.h.patch > > Signed-off-by: Maxin B. John > --- > .../screen/0001-fix-for-multijob-build.patch | 58 > -- > .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 > .../screen/{screen_4.6.1.bb => screen_4.6.2.bb}| 6 +-- > 3 files changed, 2 insertions(+), 95 deletions(-) > delete mode 100644 meta/recipes-extended/screen/ > screen/0001-fix-for-multijob-build.patch > delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now- > depends-on-term.h.patch > rename meta/recipes-extended/screen/{screen_4.6.1.bb => screen_4.6.2.bb} > (88%) > > diff --git > a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch > b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch > deleted file mode 100644 > index fbdb0eb..000 > --- a/meta/recipes-extended/screen/screen/0001-fix-for- > multijob-build.patch > +++ /dev/null > @@ -1,58 +0,0 @@ > -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 > -From: Jackie Huang > -Date: Tue, 26 Jul 2016 14:23:59 +0800 > -Subject: [PATCH] fix for multijob build > - > -make sure that comm.sh script generates comm.h header before doing > -anything else > - > -Signed-off-by: Amadeusz Sawiski > - > -Upstream-Status: Backport > - > -Backport patch to fix parallel build failure and update context to make > patch > -coulde be applied. > - > -http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd > - > -Signed-off-by: Kai Kang > -Signed-off-by: Jackie Huang > > - Makefile.in | 8 > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/Makefile.in b/Makefile.in > -index aca7da3..3607711 100644 > a/Makefile.in > -+++ b/Makefile.in > -@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c > config.h screen.h os.h osdef.h a > - comm.h layer.h term.h image.h display.h window.h mark.h extern.h > - tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h > ansi.h acls.h comm.h \ > - layer.h term.h image.h display.h window.h extern.h > --term.o: layout.h viewport.h canvas.h term.c term.h > -+term.o: layout.h viewport.h canvas.h term.c term.h comm.h > - window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h > osdef.h ansi.h acls.h \ > - comm.h layer.h term.h image.h display.h window.h extern.h logfile.h > - utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h > osdef.h ansi.h acls.h \ > -@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c > config.h screen.h os.h osdef.h a > - comm.h layer.h term.h image.h display.h window.h extern.h \ > - braille.h > - comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h > --kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h > -+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h > - acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h > osdef.h ansi.h acls.h comm.h \ > - layer.h term.h image.h display.h window.h extern.h > - braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h > osdef.h ansi.h acls.h \ > -@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c > config.h screen.h os.h osdef.h a > - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h > os.h osdef.h ansi.h acls.h \ > - comm.h layer.h term.h image.h display.h window.h extern.h \ > - braille.h > --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h > --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h > -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h > comm.h > -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h > comm.h > - list_window.o: list_generic.h list_window.c window.h layer.h screen.h > osdef.h comm.h > - > --- > -1.9.1 > - > diff --git > a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch > b/meta/recipes-extended/screen/screen/0002-comm.h-now- > depends-on-term.h.patch > deleted file mode 100644 > index b5d71cc..000 > --- a/meta/recipes-extended/screen/screen/0002-comm.h-now- > depends-on-term.h.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Upstream-Status: Backport > - > -Backport from: > - > -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c > - > -Signed-off-by: Kai Kang > > -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 > -From: Mike Gerwitz > -Date: Tue, 24 Dec 2013 22:16:31 -0500 > -Subject: [PATCH] comm.h now depends on term.h > - > > - src/Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/Makefile.in b/src/Makefile.in > -index e791e79..d4f7c0b 100644 > a/Makefile.i
Re: [OE-core] [PATCH] meson: Port pkgconfig-native patch to 0.43.0
On 11/16/2017 05:52 PM, Ricardo Ribalda Delgado wrote: The update to 0.43.0 forgot to add this patch required for qt builds Please explain why the patch is needed and what does it do (in the commit message of the patch file). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] image.bbclass: improve reproducibility
Improve reproducibility of builds by adding --apparent-size to du -ks in get_rootfs_size [YOCTO #12235] Signed-off-by: Maxin B. John --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0d14250..a24a561 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -524,7 +524,7 @@ def get_rootfs_size(d): initramfs_fstypes = d.getVar('INITRAMFS_FSTYPES') or '' initramfs_maxsize = d.getVar('INITRAMFS_MAXSIZE') -output = subprocess.check_output(['du', '-ks', +output = subprocess.check_output(['du', '--apparent-size', '-ks', d.getVar('IMAGE_ROOTFS')]) size_kb = int(output.split()[0]) base_size = size_kb * overhead_factor -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] libogg: upgrade to 1.3.3
1.3.2 -> 1.3.3 Signed-off-by: Maxin B. John --- meta/recipes-multimedia/libogg/{libogg_1.3.2.bb => libogg_1.3.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/libogg/{libogg_1.3.2.bb => libogg_1.3.3.bb} (80%) diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.2.bb b/meta/recipes-multimedia/libogg/libogg_1.3.3.bb similarity index 80% rename from meta/recipes-multimedia/libogg/libogg_1.3.2.bb rename to meta/recipes-multimedia/libogg/libogg_1.3.3.bb index 0142e0f..8d88f1f 100644 --- a/meta/recipes-multimedia/libogg/libogg_1.3.2.bb +++ b/meta/recipes-multimedia/libogg/libogg_1.3.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ SRC_URI = "http://downloads.xiph.org/releases/ogg/${BP}.tar.xz"; -SRC_URI[md5sum] = "5c3a34309d8b98640827e5d0991a4015" -SRC_URI[sha256sum] = "3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b" +SRC_URI[md5sum] = "87ed742047f065046eb6c36745d871b8" +SRC_URI[sha256sum] = "4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08" inherit autotools pkgconfig -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH]ethool updated to 4.13] ethtool bb: upgraded the .bb to pick latest ethtool-4.13.tar.xz
On Thu, Nov 16, 2017 at 8:47 AM, RC Reddy wrote: > Tests : - Compiled and tested the ethtool 4.13 package from > https://www.kernel.org/pub/software/network/ethtool/ethtool-4.13.tar.xz > using AARCH64 compiler [compilation succeed and also the binary works] > > Signed-off-by: RC Reddy > --- > meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} | 4 > ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} > (88%) > > diff --git a/meta/recipes-extended/ethtool/ethtool_4.11.bb > b/meta/recipes-extended/ethtool/ethtool_4.13.bb > similarity index 88% > rename from meta/recipes-extended/ethtool/ethtool_4.11.bb > rename to meta/recipes-extended/ethtool/ethtool_4.13.bb > index befe9b9..c862a57 100644 > --- a/meta/recipes-extended/ethtool/ethtool_4.11.bb > +++ b/meta/recipes-extended/ethtool/ethtool_4.13.bb > @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/ > network/ethtool/ethtool-${PV}.tar.gz \ > file://avoid_parallel_tests.patch \ > " > > -SRC_URI[md5sum] = "8f1072679888c9335e49b17efb798b4c" > -SRC_URI[sha256sum] = "af2fd9692f3159d3ab1e41e6f9b7d8 > db2a4693f1cb22348c88ba89f70f0e6503" > +SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" > +SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c > 391a60d8e4830b6a7f41be16d89c0556de" > > If you’re going to update a checksum for a tarball that was replaced in-place upstream, we need to know why it changed, and what changed, otherwise it could well have been compromised. Also, the subject line has a typo: ethool. -- Christopher Larson kergoth at gmail dot com Founder - BitBake, OpenEmbedded, OpenZaurus Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson: Port pkgconfig-native patch to 0.43.0
The update to 0.43.0 forgot to add this patch required for qt builds Signed-off-by: Ricardo Ribalda Delgado --- This patch sits on top of Alexander Kanavin's "Introduce meson build system" patchset .../meson/meson/0003-native_bindir.patch | 88 ++ meta/recipes-devtools/meson/meson_0.43.0.bb| 1 + 2 files changed, 89 insertions(+) create mode 100644 meta/recipes-devtools/meson/meson/0003-native_bindir.patch diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch new file mode 100644 index ..805c1f6a50dc --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -0,0 +1,88 @@ +From 01dd18c9c9c042268b87d576624c16fc74253cd9 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado +Date: Wed, 15 Nov 2017 15:05:01 +0100 +Subject: [PATCH] native_bindir + +There are some discussions upstream to merge this patch, but I presonaly believe +that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ricardo Ribalda Delgado +--- + mesonbuild/dependencies/base.py | 14 +- + mesonbuild/dependencies/ui.py | 6 +++--- + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index 0d9742d426cb..0c8e79a8e9e3 100644 +--- a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +@@ -114,7 +114,7 @@ class Dependency: + def need_threads(self): + return False + +-def get_pkgconfig_variable(self, variable_name): ++def get_pkgconfig_variable(self, variable_name, use_native=False): + raise NotImplementedError('{!r} is not a pkgconfig dependency'.format(self.name)) + + +@@ -256,8 +256,12 @@ class PkgConfigDependency(ExternalDependency): + return s.format(self.__class__.__name__, self.name, self.is_found, + self.version_reqs) + +-def _call_pkgbin(self, args): +-p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] ++def _call_pkgbin(self, args, use_native=False): ++if use_native: ++pkgbin = [self.pkgbin + "-native"] ++else: ++pkgbin = [self.pkgbin] ++p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2] + return p.returncode, out.strip() + + def _set_cargs(self): +@@ -291,8 +295,8 @@ class PkgConfigDependency(ExternalDependency): + self.is_libtool = True + self.link_args.append(lib) + +-def get_pkgconfig_variable(self, variable_name): +-ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) ++def get_pkgconfig_variable(self, variable_name, use_native=False): ++ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native) + variable = '' + if ret != 0: + if self.required: +diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +index 8f183e54d4d2..34ef33e79ad9 100644 +--- a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency): + self.bindir = self.get_pkgconfig_host_bins(core) + if not self.bindir: + # If exec_prefix is not defined, the pkg-config file is broken +-prefix = core.get_pkgconfig_variable('exec_prefix') ++prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True) + if prefix: + self.bindir = os.path.join(prefix, 'bin') + +@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency): + applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] + for application in applications: + try: +-return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application)) ++return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, use_native=True)) + except MesonException: + pass + +@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency): + QtBaseDependency.__init__(self, 'qt5', env, kwargs) + + def get_pkgconfig_host_bins(self, core): +-return core.get_pkgconfig_variable('host_bins') ++return core.get_pkgconfig_variable('host_bins', use_native=True) + + + # There are three different ways of depending on SDL2: +-- +2.15.0 + diff --git a/meta/recipes-devtools/meson/meson_0.43.0.bb b/meta/recipes-devtools/meson/meson_0.43.0.bb index bbb48d9197c0..403f744c1cf5 100644 --- a/meta/recipes-devtools/meson/meson_0.43.0.bb +++ b/meta/recipes-devtools/meson/meson_0.43.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar.gz \ file://0001-
[OE-core] [meta-oe][PATCH]ethool updated to 4.13] ethtool bb: upgraded the .bb to pick latest ethtool-4.13.tar.xz
Tests : - Compiled and tested the ethtool 4.13 package from https://www.kernel.org/pub/software/network/ethtool/ethtool-4.13.tar.xz using AARCH64 compiler [compilation succeed and also the binary works] Signed-off-by: RC Reddy --- meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.11.bb => ethtool_4.13.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool_4.11.bb b/meta/recipes-extended/ethtool/ethtool_4.13.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.11.bb rename to meta/recipes-extended/ethtool/ethtool_4.13.bb index befe9b9..c862a57 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.11.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.13.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "8f1072679888c9335e49b17efb798b4c" -SRC_URI[sha256sum] = "af2fd9692f3159d3ab1e41e6f9b7d8db2a4693f1cb22348c88ba89f70f0e6503" +SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" +SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 3/3] ref-manual: Add documentation for prohibited-path QA test
Add documentation for the IMAGE_QA_PROHIBITED_PATHS variable and associated prohibited-path QA test Signed-off-by: Martyn Welch --- Changes since v1: - Correcting author and SOB. Changes since v2: - Reimplemented as image rather than package level QA test, altering documentation to suit. - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better reflect its use. Changes since v3: - Variable changed from PROHIBITED_PATHS to IMAGE_QA_PROHIBITED_PATHS. documentation/ref-manual/ref-variables.xml | 24 1 file changed, 24 insertions(+) diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index e31aa21..57f969f 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -6162,6 +6162,30 @@ +IMAGE_QA_PROHIBITED_PATHS + +IMAGE_QA_PROHIBITED_PATHS[doc] = "A colon separated list of paths in which recipes are prohibited from installing." + + + + +A colon separated list of paths in which recipes are +prohibited from installing. +Shell-style wildcards can be used in paths. All paths need +to be absolute paths. + + + +For example, the following +IMAGE_QA_PROHIBITED_PATHS ensures +nothing is installed under /mnt: + + IMAGE_QA_PROHIBITED_PATHS += "/mnt/*" + + + + + IMAGE_ROOTFS IMAGE_ROOTFS[doc] = "The location of the root filesystem while it is under construction (i.e. during do_rootfs)." -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/3] image.bbclass: add prohibited-paths QA test
Sometimes we wish to ensure that files or directories are not installed somewhere that may prove detrimental to the operation of the system. For example, this may be the case if files are placed in a directory that is utilised as a mount point at run time, thus making them inaccessible once when the mount point is being utilised. Implement the prohibited paths QA test, which enables such locations to be specified in a "IMAGE_QA_PROHIBITED_PATHS" variable. This implementation allows for a colon separated list of paths to be provided. Shell style wildcards can be used. Signed-off-by: Fabien Lahoudere Signed-off-by: Martyn Welch --- Changes since v1: - Correcting author and SOB. Changes since v2: - Reimplemented as image rather than package level QA test. - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better reflect its use. Changes since v3: - Rename variable to IMAGE_QA_PROHIBITED_PATHS. - Use str.startswith(). - Simplify if statement. meta/classes/image.bbclass | 20 1 file changed, 20 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d93de02..9053ce3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -296,6 +296,26 @@ python do_image_complete_setscene () { } addtask do_image_complete_setscene +python image_check_prohibited_paths () { +import glob +from oe.utils import ImageQAFailed + +rootfs = d.getVar('IMAGE_ROOTFS') + +path = (d.getVar('IMAGE_QA_PROHIBITED_PATHS') or "") +if path != "": +for p in path.split(':'): +if not p.startswith('/'): +raise ImageQAFailed("IMAGE_QA_PROHIBITED_PATHS \"%s\" must be an absolute path" % p, image_check_prohibited_paths) + +match = glob.glob("%s%s" % (rootfs, p)) +if match: +loc = ", ".join(item.replace(rootfs, '') for item in match) +raise ImageQAFailed("Match(es) for IMAGE_QA_PROHIBITED_PATHS \"%s\": %s" % (p, loc), image_check_prohibited_paths) +} + +IMAGE_QA_COMMANDS += "image_check_prohibited_paths" + # Add image-level QA/sanity checks to IMAGE_QA_COMMANDS # # IMAGE_QA_COMMANDS += " \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/3] core-image.bbclass: add default IMAGE_QA_PROHIBIT_PATHS variable
Add a default IMAGE_QA_PROHIBIT_PATHS variable containing paths known to be mounted in the default fstab, which are known mount points or directories which should be populated at runtime. Suggested-by: Alexander Kanavin Signed-off-by: Martyn Welch --- Changes since v3: - This patch added. meta/classes/core-image.bbclass | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index a9a2cec..8d5fb97 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -56,6 +56,11 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' # An error exception would be raised if both image features foo and bar1(or bar2) are included +# IMAGE_QA_PROHIBITED_PATHS +# Ensure images aren't including files in places that will be used as mount points or that are +# reserved for runtime data. +IMAGE_QA_PROHIBITED_PATHS ?= "/dev/pts/*:/media/*:/mnt/*:/proc/*:/run/*:/tmp/*:/var/run/*:/var/tmp/*:/var/volatile/*" + MACHINE_HWCODECS ??= "" CORE_IMAGE_BASE_INSTALL = '\ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Error when connecting to OpenSSH server using rocko
On 11/16/2017 04:51 PM, Stefan Agner wrote: True, I cannot reproduce using qemuarm, but I created a ARMv7 qemu machine and run that using qemu-system-arm -M virt -cpu cortex-a15, and it did fail... So yeah qemuarm is not affected, but pretty much every relevant 32-bit ARM machine out there... openssl recipes have an architecture-specific configuration step where you need to specify the target machine by hand. I strongly *suspect* we do something incorrectly there in the 1.0 recipe for ARM machines. I couldn't stand looking at that mess when writing 1.1, so rewrote the whole recipe from scratch, and it *probably* works correctly on ARM :) Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Error when connecting to OpenSSH server using rocko
On 2017-11-16 11:39, Alexander Kanavin wrote: > On 11/16/2017 11:48 AM, Stefan Agner wrote: >> In a quick test I removed the PREFERRED_VERSION_openssl to get 1.1.0f, >> removed openssl10 DEPENDS in the openssh recipe and added the ArchLinux' >> openssl-1.1.0.patch: >> >> # ssh -V >> OpenSSH_7.5p1, OpenSSL 1.1.0f 25 May 2017 >> >> With that I could login. >> >> User nayfe on IRC reported the same issue. >> >> I guess moving rocko to OpenSSL 1.1 is not really an option at this >> point? Thoughts? > > Openssl 1.0 is what the openssh upstream officially supports. All the > 1.1 patches are vendor hacks. > > Can you try to bisect the issue with the rocko branch? Find some > commit in the past where it still works, and take it from there. And > do everything you can to enable additional diagnostics on the server > side when it fails. Note that we use ssh on the autobuilder to run > commands on test images, and this surely would've been noticed if it > was a common issue. True, I cannot reproduce using qemuarm, but I created a ARMv7 qemu machine and run that using qemu-system-arm -M virt -cpu cortex-a15, and it did fail... So yeah qemuarm is not affected, but pretty much every relevant 32-bit ARM machine out there... -- Stefan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][morty] linux-yocto/4.8: update to v4.8.26
Integrating the stable commits from Paul Gortmaker for 4.8.26: 72fd9e50372d Linux 4.8.26 bca975f9d61e pstore: Shut down worker when unregistering 831528f6d369 libnvdimm, pfn: fix 'npfns' vs section alignment 24e6cea34654 libnvdimm, pmem: fix a NULL pointer BUG in nd_pmem_notify 6585d5899c12 libnvdimm, region: fix flush hint detection crash 5679bab89552 ipmi: Fix kernel panic at ipmi_ssif_thread() a0edda9d006a Bluetooth: hci_intel: add missing tty-device sanity check bdfa99dcaf41 Bluetooth: hci_bcm: add missing tty-device sanity check 3a197a20503b Bluetooth: Fix user channel for 32bit userspace on 64bit kernel 2dd96e6a56f6 tty: pty: Fix ldisc flush after userspace become aware of the data already bcb0e0973a3f serial: omap: suspend device on probe errors e689fc4ccff0 serial: omap: fix runtime-pm handling on unbind f1a81a255788 serial: samsung: Use right device for DMA-mapping calls a437a5323381 padata: free correct variable a05f144a9d3b CIFS: add misssing SFM mapping for doublequote 349eb07c3118 cifs: fix CIFS_IOC_GET_MNT_INFO oops 4ca4593289e4 CIFS: fix oplock break deadlocks dfc44a5e2f72 CIFS: fix mapping of SFM_SPACE and SFM_PERIOD 53c2f66294a5 SMB3: Work around mount failure when using SMB3 dialect to Macs f39f85a9ec9c Set unicode flag on cifs echo request to avoid Mac error ab4bab94e003 Fix match_prepath() 853849a70bbb mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC 2a5e703230d8 fs/block_dev: always invalidate cleancache in invalidate_bdev() 70a6a7422b35 ceph: fix memory leak in __ceph_setxattr() 1eeca04d2091 fs/xattr.c: zero out memory copied to userspace in getxattr 6fba0c4d3153 orangefs: do not check possibly stale size on truncate aef961cbc788 orangefs: do not set getattr_time on orangefs_lookup ad35f4485072 orangefs: clean up oversize xattr validation decc9664a7e4 orangefs: fix bounds check for listxattr d62cac98eeb2 ext4: evict inline data when writing to memory map ae88e436f00e IB/hfi1: Prevent kernel QP post send hard lockups 5512f0343e1c IB/mlx4: Reduce SRIOV multicast cleanup warning message to debug level c831cf234702 IB/mlx4: Fix ib device initialization error flow a2f97e715839 IB/IPoIB: ibX: failed to create mcg debug file 4bb65c977cec IB/core: For multicast functions, verify that LIDs are multicast LIDs 20ad33c71d4d IB/core: Fix sysfs registration error flow 0c4446e4d65c dm thin: fix a memory leak when passing discard bio down 8d5feb420e3b dm rq: check blk_mq_register_dev() return value in dm_mq_init_request_queue() c7c19f2ba5db dm era: save spacemap metadata root after the pre-commit 820b3860065f crypto: algif_aead - Require setkey before accept(2) f0757bc95106 block: fix blk_integrity_register to use template's interval_exp if not 0 491700e5904b KVM: arm/arm64: fix races in kvm_psci_vcpu_on 2146d0cf63d9 KVM: x86: fix user triggerable warning in kvm_apic_accept_events() 42f69a5e282f perf/x86: Fix Broadwell-EP DRAM RAPL events b07a3600b881 um: Fix PTRACE_POKEUSER on x86_64 583a0e218a99 x86, pmem: Fix cache flushing for iovec write < 8 bytes 57760637e50b selftests/x86/ldt_gdt_32: Work around a glibc sigaction() bug 60ca4f96555f x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup 7fbd5421d5be usb: hub: Do not attempt to autosuspend disconnected devices 812c5f577e13 usb: hub: Fix error loop seen after hub communication errors 41c09b5e0036 usb: Make sure usb/phy/of gets built-in 2a164b1e1a37 usb: misc: add missing continue in switch f184320880ec staging: comedi: jr3_pci: cope with jiffies wraparound c38aa7ed4029 staging: comedi: jr3_pci: fix possible null pointer dereference 452fd7a68826 staging: gdm724x: gdm_mux: fix use-after-free on module unload 1ad9126ccbcb USB: Proper handling of Race Condition when two USB class drivers try to call init_usb_class simultaneously ea0e314f4b99 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit 4e9575b41329 usb: host: xhci: print correct command ring address fe51d203bf26 usb: xhci: bInterval quirk for TI TUSB73x0 cb3c76399e7d iscsi-target: Set session_fall_back_to_erl0 when forcing reinstatement 82d4c0daad4d target/fileio: Fix zero-length READ and WRITE handling 1fb92530ac51 target: Fix compare_and_write_callback handling for non GOOD status 82c59b4dee19 block: get rid of blk_integrity_revalidate() bb25c9749298 drm/ttm: fix use-after-free races in vm fault handling 04b96345d77c f2fs: sanity check segment count 8004022099cb net: mdio-mux: bcm-iproc: call mdiobus_free() in error path 9974c98f5155 bpf: don't let ldimm64 leak map addresses on unprivileged 8ed935b2461f bnxt_en: allocate enough space for ->ntp_fltr_bmap 547e949b6556 ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf 41c79abb8e54 ipv6: initialize route null entry in addrconf_init() 60b4e1ac1bcd rtnetlink: NUL-
Re: [OE-core] [PATCH v3] curl: upgrade to 7.56.1
This upgrade is causing dnf to crash with musl, as Python3 is segfaulting in gnutls (via curl). Reverting this upgrade fixes the problem. Ross On 13 November 2017 at 12:47, Oleksandr Kravchuk < oleksandr.kravc...@pelagicore.com> wrote: > Upgarded curl to version 7.56.1. Removed few patches fixing CVEs, since > those fixes are included in the this release. > > Also removed installation of 'curl/curlbuild.h', which has been removed > in v7.55.0: > http://daniel.haxx.se/blog/2017/06/15/target-independent-libcurl-headers > > Signed-off-by: Oleksandr Kravchuk > --- > .../curl/{curl_7.54.1.bb => curl_7.56.1.bb}| 14 > +++--- > 1 file changed, 3 insertions(+), 11 deletions(-) > rename meta/recipes-support/curl/{curl_7.54.1.bb => curl_7.56.1.bb} (87%) > > diff --git a/meta/recipes-support/curl/curl_7.54.1.bb > b/meta/recipes-support/curl/curl_7.56.1.bb > similarity index 87% > rename from meta/recipes-support/curl/curl_7.54.1.bb > rename to meta/recipes-support/curl/curl_7.56.1.bb > index 58f0531..830f350 100644 > --- a/meta/recipes-support/curl/curl_7.54.1.bb > +++ b/meta/recipes-support/curl/curl_7.56.1.bb > @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5= > 3a34942f4ae3fbf1a303160714e66 > > SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ > file://0001-replace-krb5-config-with-pkg-config.patch \ > - file://CVE-2017-199.patch \ > - file://CVE-2017-1000100.patch \ > - file://CVE-2017-1000101.patch \ > - file://CVE-2017-1000254.patch \ > " > > SRC_URI_append_class-target = " \ > @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \ > # > SRC_URI += " file://configure_ac.patch" > > -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55" > -SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e770 > 046249263c491fcae48df0e1a3ca8f25a0" > +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e" > +SRC_URI[sha256sum] = "2594670367875e7d87b0f129b5e469 > 0150780884d90244ba0fe3e74a778b5f90" > > CVE_PRODUCT = "libcurl" > -inherit autotools pkgconfig binconfig multilib_header > +inherit autotools pkgconfig binconfig > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} > gnutls proxy threaded-resolver zlib" > PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" > @@ -64,10 +60,6 @@ EXTRA_OECONF = " \ > --without-libpsl \ > " > > -do_install_append() { > - oe_multilib_header curl/curlbuild.h > -} > - > do_install_append_class-target() { > # cleanup buildpaths from curl-config > sed -i \ > -- > 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] [PATCH] wic: fallback to dd, if sparse_copy does not work
On 2017-11-16 12:49, Dogukan Ergun wrote: Docker's aufs filesystem doesn't support file ioctl operations like FIGETBSZ or FIEMAP. Sparse_copy operation will fail if those ioctls are not supported. If sparse_copy fails while generating wic images, fallback to dd for copying filesystems on final image. Signed-off-by: Dogukan Ergun --- scripts/lib/wic/plugins/imager/direct.py | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index da1c061..70f93ee 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -577,8 +577,14 @@ class PartitionedImage(): for part in self.partitions: source = part.source_file if source: -# install source_file contents into a partition -sparse_copy(source, self.path, seek=part.start * self.sector_size) +try: +# install source_file contents into a partition +sparse_copy(source, self.path, seek=part.start * self.sector_size) +except: I guess a failing sparse_copy() would raise an IOError. Shouldn't you limit the except to catching only those? // Martin +# Sparse_copy failed, fallback to dd method +dd_cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \ +(source, self.path, self.sector_size, part.start, part.size_sec) +exec_cmd(dd_cmd) logger.debug("Installed %s in partition %d, sectors %d-%d, " "size %d sectors", source, part.num, part.start, -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wic: fallback to dd, if sparse_copy does not work
Would it be neater to change sparse_copy itself so that it does the fallback, not every caller? Ross On 16 November 2017 at 11:49, Dogukan Ergun wrote: > Docker's aufs filesystem doesn't support file ioctl operations like > FIGETBSZ > or FIEMAP. > Sparse_copy operation will fail if those ioctls are not supported. > If sparse_copy fails while generating wic images, fallback to dd for > copying > filesystems on final image. > > Signed-off-by: Dogukan Ergun > --- > scripts/lib/wic/plugins/imager/direct.py | 10 -- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/scripts/lib/wic/plugins/imager/direct.py > b/scripts/lib/wic/plugins/imager/direct.py > index da1c061..70f93ee 100644 > --- a/scripts/lib/wic/plugins/imager/direct.py > +++ b/scripts/lib/wic/plugins/imager/direct.py > @@ -577,8 +577,14 @@ class PartitionedImage(): > for part in self.partitions: > source = part.source_file > if source: > -# install source_file contents into a partition > -sparse_copy(source, self.path, seek=part.start * > self.sector_size) > +try: > +# install source_file contents into a partition > +sparse_copy(source, self.path, seek=part.start * > self.sector_size) > +except: > +# Sparse_copy failed, fallback to dd method > +dd_cmd = "dd if=%s of=%s bs=%d seek=%d count=%d > conv=notrunc" % \ > +(source, self.path, self.sector_size, part.start, > part.size_sec) > +exec_cmd(dd_cmd) > > logger.debug("Installed %s in partition %d, sectors > %d-%d, " > "size %d sectors", source, part.num, > part.start, > -- > 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] [PATCH] qemu.inc: Drop rng-tools
Hello Richard, Hello Ross, On Thu, Nov 16, 2017 at 11:14 AM, Richard Purdie wrote: > On Thu, 2017-11-16 at 13:11 +, Burton, Ross wrote: >> On 15 November 2017 at 19:59, Otavio Salvador > ems.com.br> wrote: >> > > Are you enabling the virtio-rng driver so qemu can bridge the >> > host entropy >> > > into the guest? >> > >> > I am not. Do you have an example of command line for it? >> https://wiki.qemu.org/Features/VirtIORNG talks about qemu's support >> and what to turn on there (the default qemu machines enable that). >> >> http://elixir.free-electrons.com/linux/latest/source/drivers/char/hw_ >> random/Kconfig documents HW_RANDOM_VIRTIO and says at the top that >> the devices feed into the kernel pool. > > Just to add, for qemuarm: > > machine/qemuarm.conf:QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet > -device virtio-rng-pci" > > the key piece being virtio-rng-pci on the commandline. I did try it here. Thanks for the pointers. We use a Docker container to run QEMU and in this environment, it does not work well. At least I did not get it working. I don't know if it is a problem or not for OE-Core. Possibly people will run things inside a container and keep rng-tools makes it working in those environments. I will keep investigating here if I can make it work in a container ... -- 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
Re: [OE-core] [PATCH] qemu.inc: Drop rng-tools
On Thu, 2017-11-16 at 13:11 +, Burton, Ross wrote: > On 15 November 2017 at 19:59, Otavio Salvador ems.com.br> wrote: > > > Are you enabling the virtio-rng driver so qemu can bridge the > > host entropy > > > into the guest? > > > > I am not. Do you have an example of command line for it? > https://wiki.qemu.org/Features/VirtIORNG talks about qemu's support > and what to turn on there (the default qemu machines enable that). > > http://elixir.free-electrons.com/linux/latest/source/drivers/char/hw_ > random/Kconfig documents HW_RANDOM_VIRTIO and says at the top that > the devices feed into the kernel pool. Just to add, for qemuarm: machine/qemuarm.conf:QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" the key piece being virtio-rng-pci on the commandline. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu.inc: Drop rng-tools
On 15 November 2017 at 19:59, Otavio Salvador < otavio.salva...@ossystems.com.br> wrote: > > Are you enabling the virtio-rng driver so qemu can bridge the host > entropy > > into the guest? > > I am not. Do you have an example of command line for it? https://wiki.qemu.org/Features/VirtIORNG talks about qemu's support and what to turn on there (the default qemu machines enable that). http://elixir.free-electrons.com/linux/latest/source/drivers/char/hw_random/Kconfig documents HW_RANDOM_VIRTIO and says at the top that the devices feed into the kernel pool. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [U-Boot] [PATCH] u-boot: Upgrade to 2017.11 release
On Thu, Nov 16, 2017 at 6:12 AM, Marek Vasut wrote: > On 11/15/2017 05:47 PM, Stefan Agner wrote: >> On 2017-11-14 19:32, Otavio Salvador wrote: >>> This upgrades the U-Boot from 2017.09 to 2017.11 release. >> >> You might encounter this when building fw_printenv/setenv tools alone: >> >> https://lists.denx.de/pipermail/u-boot/2017-November/311505.html > > [...] > >>> SRC_URI = "git://git.denx.de/u-boot.git \ >>> file://MPC8315ERDB-enable-DHCP.patch \ > I also see that the number of out-of-tree patches didn't change since > last time, even though I complained about it ... why are these patches > still here ? Because you are the maintainer and didn't do your duty. Stop complaining and go help please. -- 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] wic: fallback to dd, if sparse_copy does not work
Docker's aufs filesystem doesn't support file ioctl operations like FIGETBSZ or FIEMAP. Sparse_copy operation will fail if those ioctls are not supported. If sparse_copy fails while generating wic images, fallback to dd for copying filesystems on final image. Signed-off-by: Dogukan Ergun --- scripts/lib/wic/plugins/imager/direct.py | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index da1c061..70f93ee 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -577,8 +577,14 @@ class PartitionedImage(): for part in self.partitions: source = part.source_file if source: -# install source_file contents into a partition -sparse_copy(source, self.path, seek=part.start * self.sector_size) +try: +# install source_file contents into a partition +sparse_copy(source, self.path, seek=part.start * self.sector_size) +except: +# Sparse_copy failed, fallback to dd method +dd_cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \ +(source, self.path, self.sector_size, part.start, part.size_sec) +exec_cmd(dd_cmd) logger.debug("Installed %s in partition %d, sectors %d-%d, " "size %d sectors", source, part.num, part.start, -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] bind: build with threads and update configure options
On Fri, 2017-05-19 at 16:52 +0800, kai.k...@windriver.com wrote: > From: Kai Kang > > Build without threads for bind is inherited from legacy openembedded. > All libc's support proper threading on Linux now, so enable threads > support for bind. > > It is also need to disable static library build which cause package dhcp > fail to build after enable bind threads support. > > Options devpoll and epoll are configured to choose most preferable > multiplex method for unix socket. The priorities are: epoll > poll > > select. When set '--enable-epoll', it just defines a var and include > header file that is available for cross compile. So use epoll for bind. > > Add PACKAGECONFIG 'urandom' that could use /dev/urandom as random device. I'd say using /dev/urandom should also be made the default. Cheers, Andre' -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Error when connecting to OpenSSH server using rocko
On 11/16/2017 11:48 AM, Stefan Agner wrote: In a quick test I removed the PREFERRED_VERSION_openssl to get 1.1.0f, removed openssl10 DEPENDS in the openssh recipe and added the ArchLinux' openssl-1.1.0.patch: # ssh -V OpenSSH_7.5p1, OpenSSL 1.1.0f 25 May 2017 With that I could login. User nayfe on IRC reported the same issue. I guess moving rocko to OpenSSL 1.1 is not really an option at this point? Thoughts? Openssl 1.0 is what the openssh upstream officially supports. All the 1.1 patches are vendor hacks. Can you try to bisect the issue with the rocko branch? Find some commit in the past where it still works, and take it from there. And do everything you can to enable additional diagnostics on the server side when it fails. Note that we use ssh on the autobuilder to run commands on test images, and this surely would've been noticed if it was a common issue. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] image.bbclass: add prohibited-paths QA test
On 11/15/2017 05:10 PM, Martyn Welch wrote: Sometimes we wish to ensure that files or directories are not installed somewhere that may prove detrimental to the operation of the system. For example, this may be the case if files are placed in a directory that is utilised as a mount point at run time, thus making them inaccessible once when the mount point is being utilised. Implement the prohibited paths QA test, which enables such locations to be specified in a "PROHIBITED_PATHS" variable. This implementation allows for a colon separated list of paths to be provided. Shell style wildcards can be used. The test does nothing if PROHIBITED_PATHS is not set. Can you set it in core-image.bbclass to some reasonable default common to reference images? Something like /mnt /media /tmp /run /var/run /var/tmp (not sure at the moment what the mount points in those images are). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] bind: build with threads and update configure options
On Fri, May 26, 2017 at 8:24 PM, Kang Kai wrote: > On 2017年05月23日 17:58, Kang Kai wrote: > On 2017年05月19日 19:47, Burton, Ross wrote: > On 19 May 2017 at 09:52, wrote: >> >> Build without threads for bind is inherited from legacy openembedded. >> All libc's support proper threading on Linux now, so enable threads >> support for bind. >> >> It is also need to disable static library build which cause package dhcp >> fail to build after enable bind threads support. It seems this change was made without taking into account the advice given in: http://git.openembedded.org/openembedded-core/commit/?id=f28757a4b89447ea528cba987f0396b92aa0bbfe "If and when we ship bind's shared libraries we should ensure that the libraries go into a separate package." In rocko builds I see "named" running on port 53 and dnsmasq fails to start... >> Options devpoll and epoll are configured to choose most preferable >> multiplex method for unix socket. The priorities are: epoll > poll > >> select. When set '--enable-epoll', it just defines a var and include >> header file that is available for cross compile. So use epoll for bind. >> >> Add PACKAGECONFIG 'urandom' that could use /dev/urandom as random device. >> >> Update file/directory ownerships to fix daemon start failure. > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] image.bbclass: add prohibited-paths QA test
On Wed, 2017-11-15 at 18:46 -0200, Otavio Salvador wrote: > On Wed, Nov 15, 2017 at 1:10 PM, Martyn Welch > wrote: > > Sometimes we wish to ensure that files or directories are not installed > > somewhere that may prove detrimental to the operation of the system. For > > example, this may be the case if files are placed in a directory that is > > utilised as a mount point at run time, thus making them inaccessible once > > when the mount point is being utilised. > > > > Implement the prohibited paths QA test, which enables such locations to be > > specified in a "PROHIBITED_PATHS" variable. This implementation allows for > > a colon separated list of paths to be provided. Shell style wildcards can > > be used. > > > > Signed-off-by: Fabien Lahoudere > > Signed-off-by: Martyn Welch > > --- > > Changes since v1: > > - Correcting author and SOB. > > > > Changes since v2: > > - Reimplemented as image rather than package level QA test. > > - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better > >reflect its use. > > > > meta/classes/image.bbclass | 20 > > 1 file changed, 20 insertions(+) > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index d93de02..bebb363 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -296,6 +296,26 @@ python do_image_complete_setscene () { > > } > > addtask do_image_complete_setscene > > > > +python image_check_prohibited_paths () { > > +import glob > > +from oe.utils import ImageQAFailed > > + > > +rootfs = d.getVar('IMAGE_ROOTFS') > > + > > +path = d.getVar('PROHIBITED_PATHS') > > path = (d.getVar('PROHIBITED_PATHS') or "") > > I'd use IMAGE_QA_PROHIBITED_PATHS as variable name. It makes easier to > know what it relates to. > > > +if path != None and path != "": > > If can die. > OK, if is still needed, else the zero length path triggers the "not p.startswith('/')" error condition. > > +for p in path.split(':'): > > +if p[0] != '/': > > if not p.startswith('/'): > > > +raise ImageQAFailed("PROHIBITED_PATHS \"%s\" must be an > > absolute path" % p, image_check_prohibited_paths) > > + > > +match = glob.glob("%s%s" % (rootfs, p)) > > +if match: > > I'd use: > > if glob.glob(...): > > It is a single use so not sure it is worth the extra variable. > > > +loc = ", ".join(item.replace(rootfs, '') for item in match) > > +raise ImageQAFailed("Match(es) for PROHIBITED_PATHS > > \"%s\": %s" % (p, loc), image_check_prohibited_paths) > > +} > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] meson: export native env only for native build
On 11/15/2017 07:53 PM, Martin Kelly wrote: Although the meson crossfile should take care of setting the right cross environment for a target build, meson slurps any set CFLAGS, CXXFLAGS, LDFLAGS, and CPPFLAGS from the environment and injects them into the build (see mesonbuild/environment.py:get_args_from_envvars for details). This means that we are seeing native CFLAGS, CXXFLAGS, LDFLAGS, and CPPFLAGS in the target build, which is wrong and causes build failures when target and native have libraries in common (the linker gets confused and bails). That said, we *do* need to set certain vars for all builds so that meson can find the right build tools. Without this, meson will fail during its sanity checking step because it will determine the build tools to be unrunnable since they output target instead of native artifacts. The solution to all of this is to set CC, CXX, LD, and AR globally to the native tools while setting the other native vars *only* for the native build. For target builds, these vars will get overridden by the cross file as we expect. Thanks; I will add this patch to my branch (so you get the credit for it). There's still a few failures to sort first though, discovered by AB (see Ross' email). Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Error when connecting to OpenSSH server using rocko
Hi, We currently experience problems when trying to connect to OpenSSH servers on rocko distros. Connecting between rocko machines seems to work, however, connecting from a morty based machine or Desktop distributions fails: $ ssh root@192.168.10.171 ssh_dispatch_run_fatal: Connection to 192.168.10.171 port 22: incorrect signature The server shows not special sign other than that the client closed the connection. Forcing Ciphers/MACs seems not to help. This is ssh used on the client side ArchLinux machine: $ ssh -V OpenSSH_7.6p1, OpenSSL 1.1.0g 2 Nov 2017 But the same happens from a Fedora machine: $ ssh -V OpenSSH_7.5p1, OpenSSL 1.1.0f-fips 25 May 2017 And morty based machine: # ssh -V OpenSSH_7.3p1, OpenSSL 1.0.2j 26 Sep 2016 The OpenSSH version on rocko: # ssh -V OpenSSH_7.5p1, OpenSSL 1.0.2l 25 May 2017 I also backported 7.6p1 from master, but it fails as well. It seems that at least OpenSSH 7.5p1/7.6p1 is broken with the OpenSSL 1.0 version used in rocko... In a quick test I removed the PREFERRED_VERSION_openssl to get 1.1.0f, removed openssl10 DEPENDS in the openssh recipe and added the ArchLinux' openssl-1.1.0.patch: # ssh -V OpenSSH_7.5p1, OpenSSL 1.1.0f 25 May 2017 With that I could login. User nayfe on IRC reported the same issue. I guess moving rocko to OpenSSL 1.1 is not really an option at this point? Thoughts? -- Stefan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] image.bbclass: add prohibited-paths QA test
On Wed, 2017-11-15 at 18:46 -0200, Otavio Salvador wrote: > On Wed, Nov 15, 2017 at 1:10 PM, Martyn Welch > wrote: > > Sometimes we wish to ensure that files or directories are not installed > > somewhere that may prove detrimental to the operation of the system. For > > example, this may be the case if files are placed in a directory that is > > utilised as a mount point at run time, thus making them inaccessible once > > when the mount point is being utilised. > > > > Implement the prohibited paths QA test, which enables such locations to be > > specified in a "PROHIBITED_PATHS" variable. This implementation allows for > > a colon separated list of paths to be provided. Shell style wildcards can > > be used. > > > > Signed-off-by: Fabien Lahoudere > > Signed-off-by: Martyn Welch > > --- > > Changes since v1: > > - Correcting author and SOB. > > > > Changes since v2: > > - Reimplemented as image rather than package level QA test. > > - Changed variable from PROHIBITED_PATH to PROHIBITED_PATHS to better > >reflect its use. > > > > meta/classes/image.bbclass | 20 > > 1 file changed, 20 insertions(+) > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index d93de02..bebb363 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -296,6 +296,26 @@ python do_image_complete_setscene () { > > } > > addtask do_image_complete_setscene > > > > +python image_check_prohibited_paths () { > > +import glob > > +from oe.utils import ImageQAFailed > > + > > +rootfs = d.getVar('IMAGE_ROOTFS') > > + > > +path = d.getVar('PROHIBITED_PATHS') > > path = (d.getVar('PROHIBITED_PATHS') or "") > > I'd use IMAGE_QA_PROHIBITED_PATHS as variable name. It makes easier to > know what it relates to. > > > +if path != None and path != "": > > If can die. > > > +for p in path.split(':'): > > +if p[0] != '/': > > if not p.startswith('/'): > > > +raise ImageQAFailed("PROHIBITED_PATHS \"%s\" must be an > > absolute path" % p, image_check_prohibited_paths) > > + > > +match = glob.glob("%s%s" % (rootfs, p)) > > +if match: > > I'd use: > > if glob.glob(...): > > It is a single use so not sure it is worth the extra variable. > > > +loc = ", ".join(item.replace(rootfs, '') for item in match) match is used here. > > +raise ImageQAFailed("Match(es) for PROHIBITED_PATHS > > \"%s\": %s" % (p, loc), image_check_prohibited_paths) > > +} > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bitbake.conf: add 'xz' to HOSTTOOLS
Files in SRC_URI that are xz compressed can not be unpacked without this, as we'd have no decompressor available. Signed-off-by: André Draszik --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9696273acc..dfc4de56a6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -480,7 +480,7 @@ HOSTTOOLS += " \ mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python python2 \ python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ -uniq wc wget which xargs \ +uniq wc wget which xargs xz \ " # Tools needed to run testimage runtime image testing -- 2.15.0.rc1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] toolchain-scripts.bbclass: do not extend dependency if extended already
On 2017年10月18日 16:02, kai.k...@windriver.com wrote: From: Kai Kang When set MULTILIBS with two or more items, such as for mips64: MULTILIBS ?= "multilib:lib32 multilib:libn32" It extends dependency package name once in multilib.bbclass, and expand again in toolchain-scripts.bbclass which causes error: | ERROR: Nothing PROVIDES 'virtual/lib32-libn32-libc'. Close matches: | virtual/libn32-libc | virtual/lib32-libc | virtual/libn32-librpc | ERROR: Required build target 'libn32-meta-ide-support' has no buildable providers. | Missing or unbuildable dependency chain was: ['libn32-meta-ide-support', 'virtual/lib32-libn32-libc'] Don't extend package name if it has been extended already. Any comment? Thanks. --Kai Signed-off-by: Kai Kang --- meta/classes/toolchain-scripts.bbclass | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 9bcfe708c7..4e4334abbb 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -150,11 +150,17 @@ toolchain_create_sdk_siteconfig () { toolchain_create_sdk_siteconfig[vardepsexclude] = "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE" python __anonymous () { +import re import oe.classextend deps = "" for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split(): deps += " %s:do_populate_sysroot" % dep -for variant in (d.getVar('MULTILIB_VARIANTS') or "").split(): +ml_variants = (d.getVar('MULTILIB_VARIANTS') or "").split() +for variant in ml_variants: +# don't extend if dep has been extended already +if filter(lambda x: re.match('(virtual/)?' + x, dep), ml_variants): +continue + clsextend = oe.classextend.ClassExtender(variant, d) newdep = clsextend.extend_name(dep) deps += " %s:do_populate_sysroot" % newdep -- Regards, Neil | Kai Kang -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Upgrade to 2017.11 release
On 11/15/2017 05:47 PM, Stefan Agner wrote: > On 2017-11-14 19:32, Otavio Salvador wrote: >> This upgrades the U-Boot from 2017.09 to 2017.11 release. > > You might encounter this when building fw_printenv/setenv tools alone: > > https://lists.denx.de/pipermail/u-boot/2017-November/311505.html [...] >> SRC_URI = "git://git.denx.de/u-boot.git \ >> file://MPC8315ERDB-enable-DHCP.patch \ I also see that the number of out-of-tree patches didn't change since last time, even though I complained about it ... why are these patches still here ? -- Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core