[OE-core] [PATCH v2] init-install-efi.sh: fix gummiboot entry installation
After selecting the "install" gummiboot option of a Live image we are seeing boot failure resulting from the gummiboot entries not being installed correctly. This seems to be a problem in this init-install-efi.sh script where it incorrectly installs the gummiboot entries into the root filesystem, not the boot partition. We fix it by installing the entries in the boot partition. Signed-off-by: Reinette Chatre Acked-by: Darren Hart --- Hi, Is it perhaps possible to backport this into dizzy release? Thank you very much v2: now with an ack from Darren meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 89d0750..329586d 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -199,11 +199,11 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then fi if [ -d /run/media/$1/loader ]; then -GUMMIBOOT_CFGS="/tgt_root/loader/entries/*.conf" +GUMMIBOOT_CFGS="/boot/loader/entries/*.conf" # copy config files for gummiboot -cp -dr /run/media/$1/loader /tgt_root +cp -dr /run/media/$1/loader /boot # delete the install entry -rm -f /tgt_root/loader/entries/install.conf +rm -f /boot/loader/entries/install.conf # delete the initrd lines sed -i "/initrd /d" $GUMMIBOOT_CFGS # delete any LABEL= strings -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perf: fix build breakage on kernels after 4.1
A recent commit fixed perf build failures with a change that duplicates
a fix that can be found in kernels after 4.1. Unfortunately there is a
conflict between these two fixes and we see perf build failures when
building perf in kernels that contain the fix already. The problem is
that the fix from the recipe modifies the location of .config-detected
to $(OUTPUT).config-detected. In a 4.2 kernel the location will be
changed to $(OUTPUT)$(OUTPUT).config-detected.
We change the recipe to require a space in the pattern to only change
kernel sources that do not already place file in $(OUTPUT).
The recent commit that introduced the build failure is:
commit ea9016b60b47138bc58d84a06954b44527b20a19
Author: Richard Purdie
Date: Sat Jul 25 14:37:58 2015 +0100
perf: Fix config file conflict with 4.1 kernels
If you setup mutlitlibs and then:
bitbake perf libb32-perf
bitbake perf libb32-perf -c cleansstate
bitbake perf libb32-perf
you will see races where the two builds get confused about which
directory
they should be using and they corrupt each other.
The issue is that .config-detected is created in ${S}, not $(OUTPUT).
We can fix this by moving the file to $(OUTPUT).
[YCOTO #8043]
(From OE-Core rev: 00608cb586e8d2a2075117e710113c471448)
(From OE-Core rev: 57df1ebd910e42af47a0039830a60f41a3bd29b6)
Signed-off-by: Richard Purdie
The commit in the kernel source that fixes the problem from kernel side is:
commit 642273795fa81da11290ffa90bce6ff242f2a7bb
Author: Aaro Koskinen
Date: Wed Jul 1 14:54:42 2015 +0300
perf tools: Create config.detected into OUTPUT directory
Create config.detected into OUTPUT directory instead of source
directory.
This fixes parallel builds that share the same source directory.
Signed-off-by: Aaro Koskinen
Acked-by: Jiri Olsa
Cc: Paul Mackerras
Cc: Peter Zijlstra
Link:
http://lkml.kernel.org/r/1435751683-18500-1-git-send-email-aaro.koski...@nokia.com
Signed-off-by: Arnaldo Carvalho de Melo
Signed-off-by: Reinette Chatre
---
meta/recipes-kernel/perf/perf.bb | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index f8e80d0..e7ddfff 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -134,6 +134,7 @@ do_configure_prepend () {
# config/Makefile.
#
# Also need to relocate .config-detected to $(OUTPUT)/config-detected
+# for kernel sources that do not already do this
# as two builds (e.g. perf and lib32-perf from mutlilib can conflict
# with each other if its in the shared source directory
#
@@ -141,15 +142,15 @@ do_configure_prepend () {
# Match $(prefix)/$(lib) and $(prefix)/lib
sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
-e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \
- -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
+ -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/perf/config/Makefile
fi
if [ -e "${S}/tools/perf/Makefile.perf" ]; then
-sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
+sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/perf/Makefile.perf
fi
if [ -e "${S}/tools/build/Makefile.build" ]; then
-sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
+sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/build/Makefile.build
fi
--
2.4.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xf86-video-intel: enable xvmc feature by default and fix dependency
XvMC extends the X Video extension (Xv) and enables hardware rendered
motion compensation support. In a test build enabling this feature
increased the size of the xf86-video-intel package from 1386841 to
1847154 bytes.
When we enable the xvmc feature in xf86-video-intel we see the
following QA issue reported:
QA Issue: xf86-video-intel rdepends on xcb-util, but it isn't
a build dependency?
We fix this by ensuring the build dependencies are set correctly when
the xvmc feature is enabled.
Signed-off-by: Reinette Chatre
---
meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
index 26b68b4..d041877 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] =
"00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf
DEPENDS += "virtual/libx11 drm libpciaccess pixman"
-PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'dri dri1 dri2', '', d)}"
+PACKAGECONFIG ??= "xvmc sna udev ${@bb.utils.contains('DISTRO_FEATURES',
'opengl', 'dri dri1 dri2', '', d)}"
PACKAGECONFIG[dri] = "--enable-dri,--disable-dri"
PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto"
@@ -27,7 +27,7 @@ PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
-PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
+PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util"
PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr
libxdamage libxfixes libxcursor libxtst libxext libxrender"
# --enable-kms-only option is required by ROOTLESS_X
--
2.4.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: fix tmpfiles location when multilib in use
Systemd's configuration files for creation, deletion and cleaning
of volatile and temporary files are installed in /usr/lib even when
multilib is in use (when /usr/lib64 is available). In this check the
systemd.conf file will not be found if libdir is /usr/lib64 so we fix the
path to match this file's installation path to look for it in
${exec_prefix}/lib
Signed-off-by: Reinette Chatre
---
meta/recipes-core/systemd/systemd_225.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_225.bb
b/meta/recipes-core/systemd/systemd_225.bb
index 4a19ff4..be0cc45 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -189,8 +189,8 @@ do_install() {
sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/'
${D}${sysconfdir}/systemd/journald.conf
# this file is needed to exist if networkd is disabled but timesyncd is
still in use since timesyncd checks it
# for existence else it fails
- if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
- ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+ if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
+ ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
fi
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON
${D}${systemd_unitdir}/systemd-sysv-install
}
--
2.4.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][fido] systemd: fix tmpfiles location when multilib in use
Systemd's configuration files for creation, deletion and cleaning
of volatile and temporary files are installed in /usr/lib even when
multilib is in use (when /usr/lib64 is available). In this check the
systemd.conf file will not be found if libdir is /usr/lib64 so we fix the
path to match this file's installation path to look for it in
${exec_prefix}/lib
(From OE-Core rev: c1ef36c2b3e3876cc166a9a5e153fc6f23b42b92)
Signed-off-by: Reinette Chatre
Signed-off-by: Richard Purdie
---
Hi Joshua,
This is a backport of systemd fix that was recently merged to master. This
fixes broken timesynd in fido images built with multilib. Could you please
consider it for fido?
Thank you very much
Reinette
meta/recipes-core/systemd/systemd_219.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_219.bb
b/meta/recipes-core/systemd/systemd_219.bb
index b972dd4..2f12284 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -181,8 +181,8 @@ do_install() {
sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/'
${D}${sysconfdir}/systemd/journald.conf
# this file is needed to exist if networkd is disabled but timesyncd is
still in use since timesyncd checks it
# for existence else it fails
- if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
- ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+ if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
+ ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
fi
}
--
2.4.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: replace ${exec_prefix}/lib with ${nonarch_libdir}
In meta/conf/bitbake.conf there is:
export nonarch_libdir = "${exec_prefix}/lib"
We can thus replace the uses of ${exec_prefix}/lib with ${nonarch_libdir}
Suggested-by: Ross Burton
Signed-off-by: Reinette Chatre
---
meta/recipes-core/systemd/systemd_225.bb | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_225.bb
b/meta/recipes-core/systemd/systemd_225.bb
index ef8d297..b15d993 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -189,8 +189,8 @@ do_install() {
sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/'
${D}${sysconfdir}/systemd/journald.conf
# this file is needed to exist if networkd is disabled but timesyncd is
still in use since timesyncd checks it
# for existence else it fails
- if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
- ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
+ if [ -s ${D}${nonarch_libdir}/tmpfiles.d/systemd.conf ]; then
+ ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${nonarch_libdir}/tmpfiles.d/systemd.conf', d)}
fi
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON
${D}${systemd_unitdir}/systemd-sysv-install
}
@@ -246,9 +246,9 @@ FILES_${PN}-vconsole-setup =
"${rootlibexecdir}/systemd/systemd-vconsole-setup \
RDEPENDS_${PN}-kernel-install += "bash"
FILES_${PN}-kernel-install = "${bindir}/kernel-install \
${sysconfdir}/kernel/ \
- ${exec_prefix}/lib/kernel \
+ ${nonarch_libdir}/kernel \
"
-FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
+FILES_${PN}-rpm-macros = "${nonarch_libdir}/rpm \
"
FILES_${PN}-xorg-xinitrc = "${sysconfdir}/X11/xinit/xinitrc.d/*"
@@ -256,7 +256,7 @@ FILES_${PN}-xorg-xinitrc =
"${sysconfdir}/X11/xinit/xinitrc.d/*"
FILES_${PN}-zsh = "${datadir}/zsh/site-functions"
FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
- ${exec_prefix}/lib/binfmt.d \
+ ${nonarch_libdir}/binfmt.d \
${rootlibexecdir}/systemd/systemd-binfmt \
${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \
${systemd_unitdir}/system/systemd-binfmt.service"
@@ -298,11 +298,11 @@ FILES_${PN} = " ${base_bindir}/* \
${bindir}/timedatectl \
${bindir}/bootctl \
${bindir}/kernel-install \
-${exec_prefix}/lib/tmpfiles.d/*.conf \
-${exec_prefix}/lib/systemd \
-${exec_prefix}/lib/modules-load.d \
-${exec_prefix}/lib/sysctl.d \
-${exec_prefix}/lib/sysusers.d \
+${nonarch_libdir}/tmpfiles.d/*.conf \
+${nonarch_libdir}/systemd \
+${nonarch_libdir}/modules-load.d \
+${nonarch_libdir}/sysctl.d \
+${nonarch_libdir}/sysusers.d \
${localstatedir} \
${nonarch_base_libdir}/udev/rules.d/70-uaccess.rules \
${nonarch_base_libdir}/udev/rules.d/71-seat.rules \
--
2.4.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][krogoth] binutils: advance SRCREV to obtain versioned symbols
Libraries needing versioned symbols, for example mysql, are not
supported by current version of binutils in krogoth.
When mysql library from MariaDB is compiled with the current
version of binutils we encounter errors at runtime as seen
below where php linked to mysql tries to run:
php: relocation error: php: symbol mysql_server_init, version
libmysqlclient_16 not defined in file libmysqlclient.so.18
with link time reference
Above error appears even though symbols exist in library:
245: 0001ecc0 0 FUNCGLOBAL DEFAULT 13
mysql_server_init@@libmysqlclient_16
279: 0001ecc0 297 FUNCGLOBAL DEFAULT 13
mysql_server_init@@libmysqlclient_18
The problem results from a bug in binutils that has already been
fixed upstream as well as on the 2.26 and 2.27 branches. We advance
the SRCREV on the 2.26 branch used in krogoth release to pick up the fix.
Details about bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19698
Signed-off-by: Reinette Chatre
---
Hi Armin,
This is not a backport of a fix on master since binutils recipe in master
builds from binutils v2.27 branch that already contains this fix.
Please do consider it for the krogoth stable branch.
Thank you
Reinette
meta/recipes-devtools/binutils/binutils-2.26.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/binutils/binutils-2.26.inc
b/meta/recipes-devtools/binutils/binutils-2.26.inc
index 703eac2..06ce245 100644
--- a/meta/recipes-devtools/binutils/binutils-2.26.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.26.inc
@@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}"
UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)"
-SRCREV = "71fa566a9cf2597b60a58c1d7c148bab637454a6"
+SRCREV = "544ddf9322b1b83982e5cb84a54d084ee7e718ea"
SRC_URI = "\
git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git
\
file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
