* [PATCH 0/1] systemd: fix do_install failure in case of multilib
@ 2015-02-10 9:14 Chen Qi
2015-02-10 9:14 ` [PATCH 1/1] " Chen Qi
0 siblings, 1 reply; 4+ messages in thread
From: Chen Qi @ 2015-02-10 9:14 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 234b4feef24ffe0cea9b6d88d9c51a05ee63db9e:
linux-yocto/3.14: fix qemumips build error (2015-02-08 08:00:04 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-multilib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-multilib
Chen Qi (1):
systemd: fix do_install failure in case of multilib
meta/recipes-core/systemd/systemd_216.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] systemd: fix do_install failure in case of multilib
2015-02-10 9:14 [PATCH 0/1] systemd: fix do_install failure in case of multilib Chen Qi
@ 2015-02-10 9:14 ` Chen Qi
2015-02-10 12:37 ` Burton, Ross
0 siblings, 1 reply; 4+ messages in thread
From: Chen Qi @ 2015-02-10 9:14 UTC (permalink / raw)
To: openembedded-core
Instead of using ${libdir}, we should use ${prefix}${nonarch_base_libdir},
so that we don't get error like below at do_install time.
| sed: can't read /home/chenqi/poky/build-systemd/tmp/work/core2-64-poky-linux/systemd/1_216+gitAUTOINC+5d0ae62c66-r0/image/usr/lib64/tmpfiles.d/systemd.conf: No such file or directory
| WARNING: exit code 2 from a shell command.
| ERROR: Function failed: do_install (log file is located at /home/chenqi/poky/build-systemd/tmp/work/core2-64-poky-linux/systemd/1_216+gitAUTOINC+5d0ae62c66-r0/temp/log.do_install.327)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-core/systemd/systemd_216.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index 569e88c..f675c6a 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -158,7 +158,7 @@ do_install() {
sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service
# 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
- ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+ ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}
}
do_install_ptest () {
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] systemd: fix do_install failure in case of multilib
2015-02-10 9:14 ` [PATCH 1/1] " Chen Qi
@ 2015-02-10 12:37 ` Burton, Ross
2015-02-11 1:46 ` ChenQi
0 siblings, 1 reply; 4+ messages in thread
From: Burton, Ross @ 2015-02-10 12:37 UTC (permalink / raw)
To: Chen Qi; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
On 10 February 2015 at 09:14, Chen Qi <Qi.Chen@windriver.com> wrote:
> - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e
> "\$ad /run/systemd/netif/links 0755 root root -"
> ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
> + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e
> "\$ad /run/systemd/netif/links 0755 root root -"
> ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}
>
systemd.bb has a few variables that mirror the variabes used in the systemd
build system, rootprefix/rootlibdir/rootlibexecdir. Would using one of
those match the variables used in the makefile to install these files to
avoid this sort of thing happening again?
Ross
[-- Attachment #2: Type: text/html, Size: 1240 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] systemd: fix do_install failure in case of multilib
2015-02-10 12:37 ` Burton, Ross
@ 2015-02-11 1:46 ` ChenQi
0 siblings, 0 replies; 4+ messages in thread
From: ChenQi @ 2015-02-11 1:46 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
On 02/10/2015 08:37 PM, Burton, Ross wrote:
>
> On 10 February 2015 at 09:14, Chen Qi <Qi.Chen@windriver.com
> <mailto:Qi.Chen@windriver.com>> wrote:
>
> - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i
> -e "\$ad /run/systemd/netif/links 0755 root root -"
> ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
> + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed
> -i -e "\$ad /run/systemd/netif/links 0755 root root -"
> ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}
>
>
> systemd.bb <http://systemd.bb> has a few variables that mirror the
> variabes used in the systemd build system,
> rootprefix/rootlibdir/rootlibexecdir. Would using one of those match
> the variables used in the makefile to install these files to avoid
> this sort of thing happening again?
>
> Ross
Hmm... I don't quite get you. But this do_install error was introduced
into OE by a recent commit.
commit 2a675bc63b22724f12e6ed6ff58d0f1d1e0d3b29
Date: Thu Jan 29 12:44:20 2015 -0800
systemd: Backports fixes to 216
Fix systemd-timesyncd assertion
when networkd is disabled then we now do not
create /run/systemd/netif/links but timesyncd needs it. So lets
manually create this file when networkd is disabled so timesyncd
can still function
When enabling systemd-timesyncd we need systemd-timesync user
Backport patches to enable timesyncd when resolved and networkd
are disabled
replace the resolv.conf symlinink patch with a proper backport
Best Regards,
Chen Qi
[-- Attachment #2: Type: text/html, Size: 3076 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-11 1:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-10 9:14 [PATCH 0/1] systemd: fix do_install failure in case of multilib Chen Qi
2015-02-10 9:14 ` [PATCH 1/1] " Chen Qi
2015-02-10 12:37 ` Burton, Ross
2015-02-11 1:46 ` ChenQi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.