* [PATCH 05/12] xf86-input-keyboard: Remove git recipe
From: Jussi Kukkonen @ 2016-12-12 10:11 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481536730.git.jussi.kukkonen@intel.com>
Last used revision was from 8 years ago.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../xorg-driver/xf86-input-keyboard_git.bb | 16 ----------------
1 file changed, 16 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
deleted file mode 100644
index dfb08f7..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-driver-input.inc
-
-SUMMARY = "X.Org X server -- keyboard input driver"
-
-DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \
-driver supports the standard OS-provided keyboard interface. The driver \
-functions as a keyboard input device, and may be used as the X server's \
-core keyboard."
-
-SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892"
-PV = "1.3.2+git${SRCPV}"
-PR = "${INC_PR}.0"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard"
-S = "${WORKDIR}/git"
-
--
2.1.4
^ permalink raw reply related
* [PATCH 02/12] xserver-xorg: Upgrade 1.18.4 -> 1.19.0
From: Jussi Kukkonen @ 2016-12-12 10:11 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481536730.git.jussi.kukkonen@intel.com>
* xserver depends on xfont2 now.
* xwayland support requires wayland-scanner: Add patch to find
wayland-scanner and protocol files while cross-compiling.
* patch MONOTONIC_CLOCK check so it works when cross-compiling
(otherwise we always end with no monotonic clock and xwayland
compile fails)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 +-
...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 61 ++++++++++++++++++++++
...c-Fix-wayland-scanner-and-protocols-locat.patch | 38 ++++++++++++++
...erver-xorg_1.18.4.bb => xserver-xorg_1.19.0.bb} | 9 ++--
4 files changed, 108 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.18.4.bb => xserver-xorg_1.19.0.bb} (70%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 269fa63..400502f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -27,7 +27,7 @@ inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
+LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
# Split out some modules and extensions from the main package
@@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--with-xkb-output=/var/lib/xkb \
+ WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \
"
PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
@@ -138,7 +139,7 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-
PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
-PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
# Xorg requires a SHA1 implementation, pick one
XORG_CRYPTO ??= "openssl"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
new file mode 100644
index 0000000..16ec3ed
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
@@ -0,0 +1,61 @@
+Discover monotonic clock using compile-time check
+
+monotonic clock check does not work when cross-compiling.
+
+Upstream-Status: Denied [Does not work on OpenBSD]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+
+
+Original patch follows:
+
+When xorg-xserver is being cross-compiled, there is currently no way
+for us to detect whether the monotonic clock is available on the
+target system, because we aren't able to run a test program on the host
+system. Currently, in this situation, we default to not use the
+monotonic clock. One problem with this situation is that the user will
+be treated as idle when the date is updated.
+
+To fix this situation, we now use a compile-time check to detect whether the
+monotonic clock is available. This check can run just fine when we are
+cross-compiling.
+
+Signed-off-by: David James <davidjames at google.com>
+---
+ configure.ac | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7ab48c..26e85cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
+ fi
+
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <time.h>
+-
+-int main(int argc, char *argv[[]]) {
+- struct timespec tp;
+-
+- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
++#include <unistd.h>
++int main() {
++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
++ #error No monotonic clock
++#endif
+ return 0;
+- else
+- return 1;
+ }
+- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
+- [MONOTONIC_CLOCK="cross compiling"])
++]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
+
+ LIBS="$LIBS_SAVE"
+ CPPFLAGS="$CPPFLAGS_SAVE"
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch
new file mode 100644
index 0000000..eafd07a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch
@@ -0,0 +1,38 @@
+From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 16 Nov 2016 00:41:51 +0200
+Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations
+
+We want to use the wayland-scanner in path (native sysroot)
+instead of using pkg-config which gives us target paths.
+
+The protocols paths on the other hand need to be prefixed with the
+(allarch) sysroot because, again, pkg-config gives us target paths.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58f1567..383a7df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then
+ AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.])
+ fi
+
+- WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
+- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
+- [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+
+- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
+ fi
+
+
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb
similarity index 70%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb
index 6700565..8725382 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb
@@ -1,8 +1,11 @@
require xserver-xorg.inc
-SRC_URI += "file://musl-arm-inb-outb.patch"
-SRC_URI[md5sum] = "d4842dfe3bd9a9d062f2fa1df9104a46"
-SRC_URI[sha256sum] = "278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8"
+SRC_URI += "file://musl-arm-inb-outb.patch \
+ file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
+ file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
+ "
+SRC_URI[md5sum] = "6a4d01e4e5047ab8f556960424ba1fa9"
+SRC_URI[sha256sum] = "149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.1.4
^ permalink raw reply related
* [PATCH 00/12] Xorg 1.19 and related driver updates
From: Jussi Kukkonen @ 2016-12-12 10:11 UTC (permalink / raw)
To: openembedded-core
Fairly large xorg release (it's been more than a year since 1.18), with
input and video ABI breaks.
xfont2 is what xfont is now called: it's got a new API and it is
parallel installable with the old one.
Almost all of the driver updates are required because of the ABI
changes. I've removed some git xorg driver recipes that haven't been
touched in ages.
Thanks,
Jussi
The following changes since commit 36e178a62f04e7f2611b26964efe46b9af97189a:
linux-yocto: Update genericx86* SRCREVs for linux-yocto 4.8 (2016-12-09 08:54:07 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/xorg19
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/xorg19
Jussi Kukkonen (12):
libxfont2: Add recipe
xserver-xorg: Upgrade 1.18.4 -> 1.19.0
xf86-input-evdev: Upgrade 2.10.3 -> 2.10.4
xf86-input-keyboard: Upgrade 1.8.1 -> 1.9.0
xf86-input-keyboard: Remove git recipe
xf86-input-mouse: Upgrade 1.9.1 -> 1.9.2
xf86-input-mouse: Remove git recipe
xf86-input-synaptics: Upgrade 1.8.3 -> 1.9.0
xf86-input-synaptics: Remove git recipe
xf86-video-omap: Upgrade 0.4.4 -> 0.4.5
xf86-video-vmware: Upgrade 13.1.0 -> 13.2.1
xf86-input-libinput: Upgrade 0.22 -> 0.23
...-evdev_2.10.3.bb => xf86-input-evdev_2.10.4.bb} | 4 +-
...board_1.8.1.bb => xf86-input-keyboard_1.9.0.bb} | 4 +-
.../xorg-driver/xf86-input-keyboard_git.bb | 16 ------
...put_0.22.0.bb => xf86-input-libinput_0.23.0.bb} | 4 +-
...ut-mouse_1.9.1.bb => xf86-input-mouse_1.9.2.bb} | 5 +-
.../xorg-driver/xf86-input-mouse_git.bb | 18 -------
...tics_1.8.3.bb => xf86-input-synaptics_1.9.0.bb} | 4 +-
.../xorg-driver/xf86-input-synaptics_git.bb | 18 -------
...ideo-omap_0.4.4.bb => xf86-video-omap_0.4.5.bb} | 4 +-
.../0002-add-option-for-vmwgfx.patch | 37 +++++++------
...mware_13.1.0.bb => xf86-video-vmware_13.2.1.bb} | 4 +-
meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb | 22 ++++++++
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 +-
...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 61 ++++++++++++++++++++++
...c-Fix-wayland-scanner-and-protocols-locat.patch | 38 ++++++++++++++
...erver-xorg_1.18.4.bb => xserver-xorg_1.19.0.bb} | 9 ++--
16 files changed, 165 insertions(+), 88 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.3.bb => xf86-input-evdev_2.10.4.bb} (83%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.8.1.bb => xf86-input-keyboard_1.9.0.bb} (73%)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
rename meta/recipes-graphics/xorg-driver/{xf86-input-libinput_0.22.0.bb => xf86-input-libinput_0.23.0.bb} (63%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.9.1.bb => xf86-input-mouse_1.9.2.bb} (76%)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.3.bb => xf86-input-synaptics_1.9.0.bb} (79%)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_0.4.4.bb => xf86-video-omap_0.4.5.bb} (89%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.1.0.bb => xf86-video-vmware_13.2.1.bb} (78%)
create mode 100644 meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.18.4.bb => xserver-xorg_1.19.0.bb} (70%)
--
2.1.4
^ permalink raw reply
* Re: [PATCH] glibc: add -fno-builtin-strlen when not using -O2
From: Andre McCurdy @ 2016-12-12 9:54 UTC (permalink / raw)
To: Huang, Jie (Jackie); +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1B858668EC6A94408DCA5225FDFA85AA013DE49043@ALA-MBA.corp.ad.wrs.com>
On Sun, Dec 11, 2016 at 11:41 PM, Huang, Jie (Jackie)
<Jackie.Huang@windriver.com> wrote:
>> -----Original Message-----
>> From: Khem Raj [mailto:raj.khem@gmail.com]
>> Sent: Monday, December 12, 2016 2:37 PM
>> To: Huang, Jie (Jackie)
>> Cc: Patches and discussions about the oe-core layer
>> Subject: Re: [OE-core] [PATCH] glibc: add -fno-builtin-strlen when not using -O2
>>
>> On Sun, Dec 11, 2016 at 9:42 PM, <jackie.huang@windriver.com> wrote:
>> > From: Jackie Huang <jackie.huang@windriver.com>
>> >
>> > The strlen will be inlined when compile with -O, -O1 or -Os,
>> > so there is no symbol for strlen in ld-linux-x86-64.so.2,
>> > causing a fatal error in valgrind:
>> >
>> > valgrind: Fatal error at startup: a function redirection
>> > valgrind: which is mandatory for this platform-tool combination
>> > valgrind: cannot be set up. Details of the redirection are:
>> > valgrind:
>> > valgrind: A must-be-redirected function
>> > valgrind: whose name matches the pattern: strlen
>> > valgrind: in an object with soname matching: ld-linux-x86-64.so.2
>> >
>> > so add -fno-builtin-strlen when compile with -O, -O1 or -Os.
>>
>> This is a bug in valgrind, I read the same on forums. KDE has proposed a fix
>> https://bugsfiles.kde.org/attachment.cgi?id=82043
>> can you check if this fixes the issue
>
> Thanks, I will check that and change to patch for valgrind if it works.
For reference, here's the patch I've been using. It's a slightly more
generic fix than the one in the KDE bug report.
diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 7e4df8d..640a346 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -1220,7 +1220,18 @@ static void add_hardwired_spec (const HChar*
sopatt, const HChar* fnpatt,
spec->from_fnpatt = CONST_CAST(HChar *,fnpatt);
spec->to_addr = to_addr;
spec->isWrap = False;
- spec->mandatory = mandatory;
+
+ /* Hack: Depending on how glibc was compiled (e.g. optimised for size or
+ built with _FORTIFY_SOURCE enabled) the strlen symbol might not be found.
+ Therefore although we should still try to intercept it, don't make it
+ mandatory to do so. We over-ride "mandatory" here to avoid the need to
+ patch the many different architecture specific callers to
+ add_hardwired_spec(). */
+ if (0==VG_(strcmp)("strlen", fnpatt))
+ spec->mandatory = NULL;
+ else
+ spec->mandatory = mandatory;
+
/* VARIABLE PARTS */
spec->mark = False; /* not significant */
spec->done = False; /* not significant */
^ permalink raw reply related
* Re: [PATCH 3/4] initscripts: support persistent /var/log
From: Patrick Ohly @ 2016-12-12 8:05 UTC (permalink / raw)
To: Chen Qi; +Cc: openembedded-core
In-Reply-To: <4d5b1453815a0fe2389ced2a0a152249b3a97e62.1479809328.git.Qi.Chen@windriver.com>
On Tue, 2016-11-22 at 18:10 +0800, Chen Qi wrote:
> ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core
> + if [ "${VOLATILE_LOG_DIR}" = "log" ]; then
> + echo "l root root 0755 /var/log /var/volatile/log" >>
> ${D}${sysconfdir}/default/volatiles/00_core
> + fi
Why are you checking for "log" here? I thought VOLATILE_LOG_DIR was
supposed to be a boolean?
Using oe.types.boolean in shell code is a bit awkward, but would be
necessary for the sake of consistency when allowing VOLATILE_LOG_DIR to
have more than just yes/no. Untested (relies on bool->str conversion):
if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* Re: [PATCH 2/4] base-files: respect VOLATILE_LOG_DIR
From: Patrick Ohly @ 2016-12-12 8:01 UTC (permalink / raw)
To: Chen Qi; +Cc: openembedded-core
In-Reply-To: <ab38ee33f9231e77d0ce97eb56809c4e3eac4855.1479809328.git.Qi.Chen@windriver.com>
On Tue, 2016-11-22 at 18:10 +0800, Chen Qi wrote:
> - ${localstatedir}/volatile/log \
> + ${localstatedir}/${@['',
> 'volatile/'][d.getVar('VOLATILE_LOG_DIR', True) == 'yes']}log \
I find the "if/else" expression easier to read, there's no need for an
explicit d.getVar(), and there's an utility method for variables which
are meant to be booleans:
${@ 'volatile/' if oe.types.boolean('${VOLATILE_LOG_DIR'}) else '' }
Using the utility function ensures that typos are caught and allows
several other values besides yes/no.
The change itself of course works either way. Just my 2 cents ;-}
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* Re: [PATCH 1/1] Use weak assignment for SERIAL_CONSOLES in qemu configuration files
From: ChenQi @ 2016-12-12 7:56 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: openembedded-core
In-Reply-To: <alpine.LFD.2.20.1612090255100.13215@localhost.localdomain>
On 12/09/2016 03:55 PM, Robert P. J. Day wrote:
> On Fri, 9 Dec 2016, Chen Qi wrote:
>
>> Use weak assignment for SERIAL_CONSOLES in qemu configuration files so that
>> the value could serve as a default value and could be easily overridden in
>> configuration files like local.conf.
>>
>> When using the default value for SERAIL_CONSOLES in qemux86-64,we would have
> ^^^^^^
>
>
> rday
>
Thanks for spotting this.
I've fixed the typo and updated the remote repo.
git://git.openembedded.org/openembedded-core-contrib ChenQi/qemu-console
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/qemu-console
Best Regards,
Chen Qi
^ permalink raw reply
* Re: [PATCH] glibc: add -fno-builtin-strlen when not using -O2
From: Huang, Jie (Jackie) @ 2016-12-12 7:41 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1sqm-YotzrkeqvvLr5MQsPNoiN6W2y_UhfYkx-dJWR66Fw@mail.gmail.com>
> -----Original Message-----
> From: Khem Raj [mailto:raj.khem@gmail.com]
> Sent: Monday, December 12, 2016 2:37 PM
> To: Huang, Jie (Jackie)
> Cc: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH] glibc: add -fno-builtin-strlen when not using -O2
>
> On Sun, Dec 11, 2016 at 9:42 PM, <jackie.huang@windriver.com> wrote:
> > From: Jackie Huang <jackie.huang@windriver.com>
> >
> > The strlen will be inlined when compile with -O, -O1 or -Os,
> > so there is no symbol for strlen in ld-linux-x86-64.so.2,
> > causing a fatal error in valgrind:
> >
> > valgrind: Fatal error at startup: a function redirection
> > valgrind: which is mandatory for this platform-tool combination
> > valgrind: cannot be set up. Details of the redirection are:
> > valgrind:
> > valgrind: A must-be-redirected function
> > valgrind: whose name matches the pattern: strlen
> > valgrind: in an object with soname matching: ld-linux-x86-64.so.2
> >
> > so add -fno-builtin-strlen when compile with -O, -O1 or -Os.
>
> This is a bug in valgrind, I read the same on forums. KDE has proposed a fix
> https://bugsfiles.kde.org/attachment.cgi?id=82043
> can you check if this fixes the issue
Thanks, I will check that and change to patch for valgrind if it works.
Thanks,
Jackie
>
> >
> > Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> > ---
> > meta/recipes-core/glibc/glibc.inc | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
> > index e85c704..7f3e0f6 100644
> > --- a/meta/recipes-core/glibc/glibc.inc
> > +++ b/meta/recipes-core/glibc/glibc.inc
> > @@ -16,8 +16,8 @@ python () {
> > if opt_effective == "-O0":
> > bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective))
> > if opt_effective in ("-O", "-O1", "-Os"):
> > - bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" %
> (d.getVar('PN', True), opt_effective))
> > - d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
> > + bb.note("%s doesn't build cleanly with %s, adding -Wno-error and -fno-builtin-strlen to
> SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
> > + d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error -fno-builtin-strlen")
> > }
> >
> > # siteconfig.bbclass runs configure which needs a working compiler
> > --
> > 2.8.3
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH] xkeyboard-config: 2.18 -> 2.19
From: Khem Raj @ 2016-12-12 7:35 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: OE-core
In-Reply-To: <CAHiDW_F_o8X6B6y4JuLBMKUnLmhXqREnD1tJObDZCUPTedyE5w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5975 bytes --]
> On Dec 7, 2016, at 3:20 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>
> Since you're already resending: please set "diff.renames" in your git configuration to get smaller diffs.
> Example from my ~/.gitconfig:
>
> [diff]
> renames = true
if you want to do this, then its better to set renames = copies
since many a times we rename recipes when upgrading this comes quite handy
>
>
> Thanks,
> Jussi
>
>
> On 7 December 2016 at 13:05, Burton, Ross <ross.burton@intel.com <mailto:ross.burton@intel.com>> wrote:
> Can you resend with a proper From: address please not just root?
>
> Ross
>
> On 7 December 2016 at 10:33, root <zhengrq.fnst@cn.fujitsu.com <mailto:zhengrq.fnst@cn.fujitsu.com>> wrote:
> Upgrade xkeyboard-config from 2.18 to 2.19
>
> Signed-off-by: zhengruoqin <zhengrq.fnst@cn.fujitsu.com <mailto:zhengrq.fnst@cn.fujitsu.com>>
> ---
> .../xorg-lib/xkeyboard-config_2.18.bb <http://xkeyboard-config_2.18.bb/> | 31 ----------------------
> .../xorg-lib/xkeyboard-config_2.19.bb <http://xkeyboard-config_2.19.bb/> | 31 ++++++++++++++++++++++
> 2 files changed, 31 insertions(+), 31 deletions(-)
> delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb <http://xkeyboard-config_2.18.bb/>
> create mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.19.bb <http://xkeyboard-config_2.19.bb/>
>
> diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb <http://xkeyboard-config_2.18.bb/> b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb <http://xkeyboard-config_2.18.bb/>
> deleted file mode 100644
> index 79fcbd8..0000000
> --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb <http://xkeyboard-config_2.18.bb/>
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -SUMMARY = "Keyboard configuration database for X Window"
> -
> -DESCRIPTION = "The non-arch keyboard configuration database for X \
> -Window. The goal is to provide the consistent, well-structured, \
> -frequently released open source of X keyboard configuration data for X \
> -Window System implementations. The project is targeted to XKB-based \
> -systems."
> -
> -HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig <http://freedesktop.org/wiki/Software/XKeyboardConfig>"
> -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config <https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config>"
> -
> -LICENSE = "MIT & MIT-style"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
> -
> -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
> -SRC_URI[md5sum] = "c28cf45616bfec276879360bc36c6b27"
> -SRC_URI[sha256sum] = "c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0"
> -
> -SECTION = "x11/libs"
> -DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
> -
> -EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps"
> -
> -FILES_${PN} += "${datadir}/X11/xkb"
> -
> -inherit autotools pkgconfig gettext
> -
> -do_install_append () {
> - install -d ${D}${datadir}/X11/xkb/compiled
> - cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
> -}
> diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.19.bb <http://xkeyboard-config_2.19.bb/> b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.19.bb <http://xkeyboard-config_2.19.bb/>
> new file mode 100644
> index 0000000..79fcbd8
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.19.bb <http://xkeyboard-config_2.19.bb/>
> @@ -0,0 +1,31 @@
> +SUMMARY = "Keyboard configuration database for X Window"
> +
> +DESCRIPTION = "The non-arch keyboard configuration database for X \
> +Window. The goal is to provide the consistent, well-structured, \
> +frequently released open source of X keyboard configuration data for X \
> +Window System implementations. The project is targeted to XKB-based \
> +systems."
> +
> +HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig <http://freedesktop.org/wiki/Software/XKeyboardConfig>"
> +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config <https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config>"
> +
> +LICENSE = "MIT & MIT-style"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
> +
> +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "c28cf45616bfec276879360bc36c6b27"
> +SRC_URI[sha256sum] = "c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0"
> +
> +SECTION = "x11/libs"
> +DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
> +
> +EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps"
> +
> +FILES_${PN} += "${datadir}/X11/xkb"
> +
> +inherit autotools pkgconfig gettext
> +
> +do_install_append () {
> + install -d ${D}${datadir}/X11/xkb/compiled
> + cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
> +}
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org <mailto:Openembedded-core@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org <mailto:Openembedded-core@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core <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
[-- Attachment #2: Type: text/html, Size: 10807 bytes --]
^ permalink raw reply
* Re: [PATCH] libpcap: Disable exposed bits of WinPCAP remote capture support
From: Lei, Maohui @ 2016-12-12 6:55 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
In-Reply-To: <1479838559-24993-1-git-send-email-fabio.berton@ossystems.com.br>
Hi all
I met the same issue when I build wireshark comes from meta-oe.
Why this patch hasn't been merged yet?
Best regards
Lei
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-
> core-bounces@lists.openembedded.org] On Behalf Of Fabio Berton
> Sent: Wednesday, November 23, 2016 2:16 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] libpcap: Disable exposed bits of WinPCAP remote
> capture support
>
> Disable bits of remote capture support inherited from the WinPCAP merge which
> cause applications to fails to build if they define HAVE_REMOTE.
>
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ---
> .../libpcap/libpcap/disable-remote.patch | 36 ++++++++++++++++++++++
> meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb | 1 +
> 2 files changed, 37 insertions(+)
> create mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-
> remote.patch
>
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> new file mode 100644
> index 0000000..7e1eea6
> --- /dev/null
> +++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> @@ -0,0 +1,36 @@
> +Disable bits of remote capture support inherited from the WinPCAP merge
> +which cause applications to FTBFS if they define HAVE_REMOTE.
> +
> +Patch from:
> +https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/?
> +id=f35949969269dfdcc3549b12fade604755e1e326
> +
> +Upstream-Status: Pending
> +
> +--- a/pcap/pcap.h
> ++++ b/pcap/pcap.h
> +@@ -506,6 +506,11 @@
> + #define MODE_STAT 1
> + #define MODE_MON 2
> +
> ++#ifdef HAVE_REMOTE
> ++ /* Includes most of the public stuff that is needed for the remote
> ++capture */
> ++ #include <remote-ext.h>
> ++#endif /* HAVE_REMOTE */
> ++
> + #elif defined(MSDOS)
> +
> + /*
> +@@ -526,11 +531,6 @@
> +
> + #endif /* _WIN32/MSDOS/UN*X */
> +
> +-#ifdef HAVE_REMOTE
> +- /* Includes most of the public stuff that is needed for the remote
> +capture */
> +- #include <remote-ext.h>
> +-#endif /* HAVE_REMOTE */
> +-
> + #ifdef __cplusplus
> + }
> + #endif
> +
> diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-
> connectivity/libpcap/libpcap_1.8.1.bb
> index 9072fe0..8ce18e5 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> @@ -2,6 +2,7 @@ require libpcap.inc
>
> SRC_URI += " \
> file://libpcap-pkgconfig-support.patch \
> + file://disable-remote.patch \
> "
>
> SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH] glibc: add -fno-builtin-strlen when not using -O2
From: Khem Raj @ 2016-12-12 6:37 UTC (permalink / raw)
To: jhuang0; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161212054215.20513-1-jackie.huang@windriver.com>
On Sun, Dec 11, 2016 at 9:42 PM, <jackie.huang@windriver.com> wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> The strlen will be inlined when compile with -O, -O1 or -Os,
> so there is no symbol for strlen in ld-linux-x86-64.so.2,
> causing a fatal error in valgrind:
>
> valgrind: Fatal error at startup: a function redirection
> valgrind: which is mandatory for this platform-tool combination
> valgrind: cannot be set up. Details of the redirection are:
> valgrind:
> valgrind: A must-be-redirected function
> valgrind: whose name matches the pattern: strlen
> valgrind: in an object with soname matching: ld-linux-x86-64.so.2
>
> so add -fno-builtin-strlen when compile with -O, -O1 or -Os.
This is a bug in valgrind, I read the same on forums. KDE has proposed a fix
https://bugsfiles.kde.org/attachment.cgi?id=82043
can you check if this fixes the issue
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> meta/recipes-core/glibc/glibc.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
> index e85c704..7f3e0f6 100644
> --- a/meta/recipes-core/glibc/glibc.inc
> +++ b/meta/recipes-core/glibc/glibc.inc
> @@ -16,8 +16,8 @@ python () {
> if opt_effective == "-O0":
> bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective))
> if opt_effective in ("-O", "-O1", "-Os"):
> - bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
> - d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
> + bb.note("%s doesn't build cleanly with %s, adding -Wno-error and -fno-builtin-strlen to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
> + d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error -fno-builtin-strlen")
> }
>
> # siteconfig.bbclass runs configure which needs a working compiler
> --
> 2.8.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH 2/2] ltp/posix: replace CWD with PWD
From: jackie.huang @ 2016-12-12 5:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481522082.git.jackie.huang@windriver.com>
From: Jackie Huang <jackie.huang@windriver.com>
Backport a patch to replace CWD with PWD to avoid
error messages in test results:
basename: missing operand
Try 'basename --help' for more information.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20160126.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
diff --git a/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
new file mode 100644
index 0000000..8034152
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
@@ -0,0 +1,44 @@
+From f356775c400f40e3803d80a7bd295b4265959c45 Mon Sep 17 00:00:00 2001
+From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
+Date: Mon, 29 Feb 2016 14:34:40 +0530
+Subject: [PATCH] run-posix-option-group-test: replace CWD qith PWD
+
+When running LTP Open Posix Testsuite there is lot of messages as:
+
+| Usage: basename FILE [SUFFIX]
+|
+| Strip directory path and .SUFFIX from FILE
+|
+| *******************
+| Testing
+| *******************
+
+This is because there is no $CWD defined in shell and it looks like $PWD
+was intended instead.
+
+Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
+Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ testcases/open_posix_testsuite/bin/run-tests.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/open_posix_testsuite/bin/run-tests.sh b/testcases/open_posix_testsuite/bin/run-tests.sh
+index d4bd988..5ee5687 100755
+--- a/testcases/open_posix_testsuite/bin/run-tests.sh
++++ b/testcases/open_posix_testsuite/bin/run-tests.sh
+@@ -29,7 +29,7 @@ run_test_loop() {
+
+ cat <<EOF
+ *******************
+-Testing $(basename $CWD)
++Testing $(basename $PWD)
+ *******************
+ $(printf "PASS\t\t%3d" $NUM_PASS)
+ $(printf "FAIL\t\t%3d" $NUM_FAIL)
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 841302b..6e2ceac 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -64,6 +64,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0035-fix-test_proc_kill-hang.patch \
file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \
+ file://0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch \
"
S = "${WORKDIR}/git"
--
2.8.3
^ permalink raw reply related
* [PATCH 1/2] ltp: avoid segmentation fault in netns tests
From: jackie.huang @ 2016-12-12 5:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481522082.git.jackie.huang@windriver.com>
From: Jackie Huang <jackie.huang@windriver.com>
* backport a patch to avoid segmentation
fault in netns tests.
* rename previous patch to have ordered
prefix number.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
...twork-nfsv4-acl-acl1.c-Security-fix-on-s.patch} | 0
...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20160126.bb | 3 +-
3 files changed, 52 insertions(+), 1 deletion(-)
rename meta/recipes-extended/ltp/ltp/{0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch => 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch} (100%)
create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
similarity index 100%
rename from meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
rename to meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
diff --git a/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
new file mode 100644
index 0000000..18d1f72
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
@@ -0,0 +1,50 @@
+From 193ce739b2a5174269a958b00c3a5590de944e0d Mon Sep 17 00:00:00 2001
+From: Huacai Chen <chenhc@lemote.com>
+Date: Thu, 27 Oct 2016 14:45:52 +0800
+Subject: [PATCH] containers/netns_netlink: Avoid segmentation fault
+
+In order to avoid segmentation fault (use NULL as a function pointer),
+this patch modify check_netns() by passing a dummy function pointer to
+do_clone_unshare_test().
+
+Signed-off-by: Huacai Chen <chenhc@lemote.com>
+Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ testcases/kernel/containers/netns/netns_helper.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/testcases/kernel/containers/netns/netns_helper.h b/testcases/kernel/containers/netns/netns_helper.h
+index 2a331ae..7df6dcb 100644
+--- a/testcases/kernel/containers/netns/netns_helper.h
++++ b/testcases/kernel/containers/netns/netns_helper.h
+@@ -56,6 +56,12 @@ static void check_iproute(unsigned int spe_ipver)
+ pclose(ipf);
+ }
+
++static int dummy(void *arg)
++{
++ (void) arg;
++ return 0;
++}
++
+ static void check_netns(void)
+ {
+ int pid, status;
+@@ -64,8 +70,8 @@ static void check_netns(void)
+ tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported",
+ CLONE_NEWNS);
+
+- pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, NULL,
+- NULL);
++ pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS,
++ dummy, NULL);
+ if (pid == -1)
+ tst_brkm(TCONF | TERRNO, NULL,
+ "unshare syscall smoke test failed");
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 7ee84e3..841302b 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -62,7 +62,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
file://0034-periodic_output.patch \
file://0035-fix-test_proc_kill-hang.patch \
- file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \
"
S = "${WORKDIR}/git"
--
2.8.3
^ permalink raw reply related
* [PATCH 0/2] ltp/posix: backport two patches to fix some tests
From: jackie.huang @ 2016-12-12 5:59 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
--
The following changes since commit dae00fbb913c24b6bab00d5b99bd61f3455b4728:
sdk-manual: Added note about nullpointer error for launch eclipse (2016-12-08 16:36:40 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib.git jhuang0/d_ltp_161212-0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_ltp_161212-0
Jackie Huang (2):
ltp: avoid segmentation fault in netns tests
ltp/posix: replace CWD with PWD
...twork-nfsv4-acl-acl1.c-Security-fix-on-s.patch} | 0
...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++++++++++++++++++++++
...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 +++++++++++++++++++
meta/recipes-extended/ltp/ltp_20160126.bb | 4 +-
4 files changed, 97 insertions(+), 1 deletion(-)
rename meta/recipes-extended/ltp/ltp/{0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch => 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch} (100%)
create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
--
2.8.3
^ permalink raw reply
* [PATCH] glibc: add -fno-builtin-strlen when not using -O2
From: jackie.huang @ 2016-12-12 5:42 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
The strlen will be inlined when compile with -O, -O1 or -Os,
so there is no symbol for strlen in ld-linux-x86-64.so.2,
causing a fatal error in valgrind:
valgrind: Fatal error at startup: a function redirection
valgrind: which is mandatory for this platform-tool combination
valgrind: cannot be set up. Details of the redirection are:
valgrind:
valgrind: A must-be-redirected function
valgrind: whose name matches the pattern: strlen
valgrind: in an object with soname matching: ld-linux-x86-64.so.2
so add -fno-builtin-strlen when compile with -O, -O1 or -Os.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/recipes-core/glibc/glibc.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index e85c704..7f3e0f6 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -16,8 +16,8 @@ python () {
if opt_effective == "-O0":
bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective))
if opt_effective in ("-O", "-O1", "-Os"):
- bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
- d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
+ bb.note("%s doesn't build cleanly with %s, adding -Wno-error and -fno-builtin-strlen to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
+ d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error -fno-builtin-strlen")
}
# siteconfig.bbclass runs configure which needs a working compiler
--
2.8.3
^ permalink raw reply related
* [PATCH v2] gcr: add missing dependencies for vapi
From: jackie.huang @ 2016-12-12 5:22 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
According to the vapi_DEPS definition:
gcr-3.vapi depends on gck-1.vapi,
gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi
But these dependencies are missing for the make targets,
so it will fail when build in parallel:
error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../gcr-add-missing-dependencies-for-vapi.patch | 51 ++++++++++++++++++++++
meta/recipes-gnome/gcr/gcr_3.20.0.bb | 2 +
2 files changed, 53 insertions(+)
create mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
new file mode 100644
index 0000000..a205429
--- /dev/null
+++ b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
@@ -0,0 +1,51 @@
+From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Mon, 28 Nov 2016 10:17:34 +0800
+Subject: [PATCH] gcr: add missing dependencies for vapi
+
+According to the vapi_DEPS definition:
+gcr-3.vapi depends on gck-1.vapi,
+gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi
+
+But these dependencies are missing for the make targets,
+so it will fail when build in parallel:
+error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories
+error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories
+
+Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ gcr/Makefile.am | 2 +-
+ ui/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcr/Makefile.am b/gcr/Makefile.am
+index eda302f..6e78dba 100644
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
+@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir
+
+ if ENABLE_VAPIGEN
+
+-gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps
++gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi
+
+ VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi
+
+diff --git a/ui/Makefile.am b/ui/Makefile.am
+index aa52476..6612f0d 100644
+--- a/ui/Makefile.am
++++ b/ui/Makefile.am
+@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir
+
+ if ENABLE_VAPIGEN
+
+-gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps
++gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi
+
+ VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi
+
+--
+2.8.3
+
diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
index b32a455..2088902 100644
--- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
@@ -11,6 +11,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstrea
# depends on gtk+3, but also x11 through gtk+-x11
REQUIRED_DISTRO_FEATURES = "x11"
+SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch"
+
SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35"
SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"
--
2.8.3
^ permalink raw reply related
* Re: [PATCH V2 5/6] runqemu: fixes for slirp, network device and hostfwd
From: Robert Yang @ 2016-12-12 3:31 UTC (permalink / raw)
To: Randy Witt, openembedded-core
In-Reply-To: <4f79b40c-e1a8-3e62-0cbb-ea4c9d4176e4@linux.intel.com>
On 12/08/2016 01:58 AM, Randy Witt wrote:
>
>> def setup_slirp(self):
>> """Setup user networking"""
>>
>> if self.fstype == 'nfs':
>> self.setup_nfs()
>> self.kernel_cmdline_script += ' ip=dhcp'
>> - self.set('NETWORK_CMD', self.get('QB_SLIRP_OPT'))
>> + # Port mapping
>> + hostfwd = ",hostfwd=tcp::2222-:22,hostfwd=tcp::2323-:23"
>> + qb_slirp_opt_default = "-netdev user,id=net0%s" % hostfwd
>> + qb_slirp_opt = self.get('QB_SLIRP_OPT') or qb_slirp_opt_default
>> + # Figure out the port
>> + ports = re.findall('hostfwd=[^-]*:([0-9]+)-[^,-]*', qb_slirp_opt)
>> + ports = [int(i) for i in ports]
>> + mac = 2
>> + # Find a free port to avoid conflicts
>> + for p in ports[:]:
>> + p_new = p
>> + while not check_free_port('localhost', p_new):
>> + p_new += 1
>> + mac += 1
>> + while p_new in ports:
>> + p_new += 1
>> + mac += 1
>> + if p != p_new:
>> + ports.append(p_new)
>> + qb_slirp_opt = re.sub(':%s-' % p, ':%s-' % p_new, qb_slirp_opt)
>> + logger.info("Port forward changed: %s -> %s" % (p, p_new))
> Regardless if the port is changed or not, so that things like tests have an
> easier time of figuring out the port mappings, would it be good add a flag that
> prints out the entire list of ports used, or always do it? i.e. "Port forwarding
> 2222:22 2333:23.... It's not necessary of course, you can always look at the
Thansk, make sense, I added the following lines:
+ # Print out port foward
+ hostfwd = re.findall('(hostfwd=[^,]*)', qb_slirp_opt)
+ if hostfwd:
+ logger.info('Port forward: %s' % ' '.join(hostfwd))
Now print:
runqemu - INFO - Port forward: hostfwd=tcp::2222-:22 hostfwd=tcp::2323-:23
Updated in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/runqemu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/runqemu
Robert Yang (6):
scripts/runqemu: fix checking for <file>.cpio.gz
qemuboot.bbclass: use IMGDEPLOYDIR
runqemu-export-rootfs: fix inconsistent var names
runqemu: support mutiple qemus running when nfs
runqemu: fixes for slirp, network device and hostfwd
qemuboot.bbclass: add blank lines in comments
// Robert
> command line and then check to see if anything is remapped. But that's a bit
> more work.
>
>> + mac = "%s%02x" % (self.mac_slirp, mac)
>> + self.set('NETWORK_CMD', '%s %s' %
>> (self.network_device.replace('@MAC@', mac), qb_slirp_opt))
>
>
^ permalink raw reply
* Re: [PATCH] gcr: add missing dependencies for vapi
From: Huang, Jie (Jackie) @ 2016-12-12 0:58 UTC (permalink / raw)
To: BURTON, ROSS; +Cc: OE-core
In-Reply-To: <CAJTo0LaXmKPSRG1VgLXdOERkxuFSaqFX-D-7Oo9MTKY_ydcq1w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Yes, I will re-send the patch.
Thanks,
Jackie
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Saturday, December 10, 2016 6:43 PM
To: Huang, Jie (Jackie)
Cc: OE-core
Subject: Re: [OE-core] [PATCH] gcr: add missing dependencies for vapi
On 10 December 2016 at 02:56, <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote:
+Upstream-Status: Submitted [https://github.com/GNOME/gcr/pull/4]
Did you get the message that GNOME doesn't take pull requests at github?
Ross
[-- Attachment #2: Type: text/html, Size: 3999 bytes --]
^ permalink raw reply
* [PATCH] fontconfig: Fix namespace conflicts with glibc
From: Khem Raj @ 2016-12-11 23:07 UTC (permalink / raw)
To: openembedded-core
glibc 2.25 will come with TS 18661-1 macro definitions in limits.h which ends with following errors
| ../../fontconfig-2.12.1/src/fcmatch.c:324:63: error: 'PRI_CHAR_WIDTH_STRONG' undeclared here (not in a function)
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },
| ^
| ../../fontconfig-2.12.1/src/fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
| ^~~~~~~~~
| ../../fontconfig-2.12.1/src/fcmatch.c:324:84: error: 'PRI_CHAR_WIDTH_WEAK' undeclared here (not in a function)
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },
| ^
| ../../fontconfig-2.12.1/src/fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
| ^~~~~~~~~
| make[3]: *** [Makefile:632: fcmatch.lo] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...icts-with-integer-width-macros-from-TS-18.patch | 74 ++++++++++++++++++++++
.../fontconfig/fontconfig_2.12.1.bb | 1 +
2 files changed, 75 insertions(+)
create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
new file mode 100644
index 0000000..326ff3c
--- /dev/null
+++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
@@ -0,0 +1,74 @@
+From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 11 Dec 2016 14:32:00 -0800
+Subject: [PATCH] Avoid conflicts with integer width macros from TS
+ 18661-1:2014
+
+glibc 2.25+ has now defined these macros in <limits.h>
+https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ fontconfig/fontconfig.h | 2 +-
+ src/fcobjs.h | 2 +-
+ src/fcobjshash.gperf | 2 +-
+ src/fcobjshash.h | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
+index 5c72b22..843c532 100644
+--- a/fontconfig/fontconfig.h
++++ b/fontconfig/fontconfig.h
+@@ -128,7 +128,7 @@ typedef int FcBool;
+ #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
+
+ /* Adjust outline rasterizer */
+-#define FC_CHAR_WIDTH "charwidth" /* Int */
++#define FC_CHARWIDTH "charwidth" /* Int */
+ #define FC_CHAR_HEIGHT "charheight"/* Int */
+ #define FC_MATRIX "matrix" /* FcMatrix */
+
+diff --git a/src/fcobjs.h b/src/fcobjs.h
+index 1fc4f65..d27864b 100644
+--- a/src/fcobjs.h
++++ b/src/fcobjs.h
+@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
+ FC_OBJECT (RGBA, FcTypeInteger, NULL)
+ FC_OBJECT (SCALE, FcTypeDouble, NULL)
+ FC_OBJECT (MINSPACE, FcTypeBool, NULL)
+-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
++FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
+ FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
+ FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
+ FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
+diff --git a/src/fcobjshash.gperf b/src/fcobjshash.gperf
+index 80a0237..eb4ad84 100644
+--- a/src/fcobjshash.gperf
++++ b/src/fcobjshash.gperf
+@@ -44,7 +44,7 @@ int id;
+ "rgba",FC_RGBA_OBJECT
+ "scale",FC_SCALE_OBJECT
+ "minspace",FC_MINSPACE_OBJECT
+-"charwidth",FC_CHAR_WIDTH_OBJECT
++"charwidth",FC_CHARWIDTH_OBJECT
+ "charheight",FC_CHAR_HEIGHT_OBJECT
+ "matrix",FC_MATRIX_OBJECT
+ "charset",FC_CHARSET_OBJECT
+diff --git a/src/fcobjshash.h b/src/fcobjshash.h
+index 5a4d1ea..4e66bb0 100644
+--- a/src/fcobjshash.h
++++ b/src/fcobjshash.h
+@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char *str, register unsigned int len)
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
+ {-1},
+ #line 47 "fcobjshash.gperf"
+- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
++ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
+ #line 48 "fcobjshash.gperf"
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
+ #line 55 "fcobjshash.gperf"
+--
+2.10.2
+
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
index 115f558..8616154 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
@@ -22,6 +22,7 @@ DEPENDS = "expat freetype zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://revert-static-pkgconfig.patch \
+ file://0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch \
"
SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c"
SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292"
--
2.10.2
^ permalink raw reply related
* [PATCH 1/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
From: Petter Mabäcker @ 2016-12-11 9:07 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481411836.git.petter@technux.se>
Due to the problem fixed in
'56c677a multilib: Move redefinition of STAGING_DIR_KERNEL'
STAGING_KERNEL_DIR must be redefined for lib32 in multilib.bbclass.
However this redefinition expanded STAGING_KERNEL_DIR to an absolute
path. This unconsciously added the TMPDIR path in the sstate object,
causing packages depended on STAGING_KERNEL_DIR being rebuild if the
TMPDIR was changed.
Solve this by forcing the unexpanded TMPDIR variable to remain in the
beginning of STAGING_DIR_KERNEL (as default). Since TMPDIR is included in
BB_HASHBASE_WHITELIST, the sstate object will not be depended on the
expanded path anymore.
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
meta/classes/multilib.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index d5a3128..eba666d 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -4,7 +4,9 @@ python multilib_virtclass_handler () {
if cls != "multilib" or not variant:
return
- e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True))
+ localdata = bb.data.createCopy(e.data)
+ localdata.delVar('TMPDIR')
+ e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR', True))
# There should only be one kernel in multilib configs
# We also skip multilib setup for module packages.
--
1.9.1
^ permalink raw reply related
* [PATCH 0/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
From: Petter Mabäcker @ 2016-12-11 9:07 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 36e178a62f04e7f2611b26964efe46b9af97189a:
linux-yocto: Update genericx86* SRCREVs for linux-yocto 4.8 (2016-12-09 08:54:07 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/staging_dir_kernel_fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/staging_dir_kernel_fix
Petter Mabäcker (1):
multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
meta/classes/multilib.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply
* Re: [PATCH] edgerouter.conf: enable generation of wic.bmap
From: Christopher Larson @ 2016-12-11 0:40 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1sqeW4cxaj1yK_TbpyyZriuL3z3N4QY=nrpy4JV=tNRPCQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1714 bytes --]
On Sat, Dec 10, 2016 at 1:57 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Sat, Dec 10, 2016 at 10:40 AM, Christopher Larson
> <clarson@kergoth.com> wrote:
> >
> > On Fri, Dec 9, 2016 at 10:46 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
> > wrote:
> >>
> >> Enabled generation of block map(bmap) files for wic images
> >> built for edgerouter machine. This should simplify flashing
> >> images with bmaptool.
> >>
> >> [YOCTO #10621]
> >>
> >> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> >
> >
> > I think this is more of a distro decision than machine, whether they
> want to
> > support use of bmaptool for their users/customers. It’d be nice if it was
> > easier to control compression from the distro, too. For example, if we
> want
> > to distribute wic.bz2+wic.bmap in our installers, it’d be nice to be
> able to
> > switch to that for all machines that use wic. I’m not sure how best to
> pull
> > that off, however. Something to think about for the future.
>
> I think thats a good point, however, distro should be able to define
> something like
> if machine is capable of supporting feature X then lets enable it. I
> dont think we
> should add machine knowledge into distros either.
Agreed. We do that already with features variables, but there’s no
equivalent for IMAGE_FSTYPES, of course. Presumably IMAGE_FSTYPES_append =
“ ${@‘wic.bmap’ if ‘${USING_WIC}’ else ‘’}” or so would get part of the way
there. Replacing wic with wic.bz2 or vice versa would be slightly more
complex.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2372 bytes --]
^ permalink raw reply
* Re: can "IMAGE_INSTALL ?= ..." not be written in a more obvious way?
From: Khem Raj @ 2016-12-10 21:15 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: OE Core mailing list
In-Reply-To: <alpine.LFD.2.20.1612100630310.23762@localhost.localdomain>
On Sat, Dec 10, 2016 at 3:40 AM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> i've nattered about this before but not sure i ever got an answer --
> here's the last bit of core-image.bbclass:
>
> CORE_IMAGE_BASE_INSTALL = '\
> packagegroup-core-boot \
> packagegroup-base-extended \
> \
> ${CORE_IMAGE_EXTRA_INSTALL} \
> '
>
> CORE_IMAGE_EXTRA_INSTALL ?= ""
>
> IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
>
> the first time i saw that (long ago), it took me a few looks to figure
> out what was happening. can this not be written in a more obvious way:
>
> CORE_IMAGE_BASE_INSTALL = '\
> packagegroup-core-boot \
> packagegroup-base-extended \
> '
>
> CORE_IMAGE_EXTRA_INSTALL ?= ""
>
> IMAGE_INSTALL ?= " \
> ${CORE_IMAGE_BASE_INSTALL} \
> ${CORE_IMAGE_EXTRA_INSTALL} \
> "
>
> is that not equivalent, or am i missing something? it's certainly
> clearer as to what's happening if people are perusing the code.
They are same AFAICT, dont feel strongly about readability but feel
free to send a patch
^ permalink raw reply
* Re: [PATCH] edgerouter.conf: enable generation of wic.bmap
From: Khem Raj @ 2016-12-10 20:57 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CABcZANk5QnzFAWwAjbaHAQvCw=XXViOnh5jg=cvRiD_B=mEpKA@mail.gmail.com>
On Sat, Dec 10, 2016 at 10:40 AM, Christopher Larson
<clarson@kergoth.com> wrote:
>
> On Fri, Dec 9, 2016 at 10:46 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
> wrote:
>>
>> Enabled generation of block map(bmap) files for wic images
>> built for edgerouter machine. This should simplify flashing
>> images with bmaptool.
>>
>> [YOCTO #10621]
>>
>> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>
>
> I think this is more of a distro decision than machine, whether they want to
> support use of bmaptool for their users/customers. It’d be nice if it was
> easier to control compression from the distro, too. For example, if we want
> to distribute wic.bz2+wic.bmap in our installers, it’d be nice to be able to
> switch to that for all machines that use wic. I’m not sure how best to pull
> that off, however. Something to think about for the future.
I think thats a good point, however, distro should be able to define
something like
if machine is capable of supporting feature X then lets enable it. I
dont think we
should add machine knowledge into distros either.
> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH] edgerouter.conf: enable generation of wic.bmap
From: Christopher Larson @ 2016-12-10 18:40 UTC (permalink / raw)
To: Ed Bartosh; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1481305586-11873-1-git-send-email-ed.bartosh@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
On Fri, Dec 9, 2016 at 10:46 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
wrote:
> Enabled generation of block map(bmap) files for wic images
> built for edgerouter machine. This should simplify flashing
> images with bmaptool.
>
> [YOCTO #10621]
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>
I think this is more of a distro decision than machine, whether they want
to support use of bmaptool for their users/customers. It’d be nice if it
was easier to control compression from the distro, too. For example, if we
want to distribute wic.bz2+wic.bmap in our installers, it’d be nice to be
able to switch to that for all machines that use wic. I’m not sure how best
to pull that off, however. Something to think about for the future.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1424 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox