from:"Pau Espin Pedrol"

[OE-core] [PATCH] site: Remove sctp related configs

2020-01-14 Thread Pau Espin Pedrol

They are preventing autotools from checking netinet/sctp.h existence
successfuly which in turn makes configure.ac files with lines similar to
this to fail, even if DEPENDS="lksctp-tools" and netinet/sctp.h is
clearly available under recipe-sysroot/:
AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found))

This is the case for new libosmo-netif versionsi (meta-telephony branch
laforge/nightly), which expects netinet/sctp.h to be available if default
flag --enable-libsctp is used.

Without this patch, do_configure will fail unless following line is used
in the recipe:
CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'libsctp', 
'ac_cv_header_netinet_sctp_h=yes', '',d)}"

So removing ac_cv_header_netinet_sctp_h would be enough, but I couldn't
find any good information on why the other 2 variables were set in site
config files, hence no good reason to keep them.

Signed-off-by: Pau Espin Pedrol 
---
 meta/site/arm-common  | 3 ---
 meta/site/ix86-common | 3 ---
 meta/site/nios2-linux | 3 ---
 meta/site/powerpc32-linux | 4 
 meta/site/sh-common   | 4 
 5 files changed, 17 deletions(-)

diff --git a/meta/site/arm-common b/meta/site/arm-common
index 198c98c6a7..8c37f3fc24 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -4,9 +4,6 @@ 
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_sl
 ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 # bash
 ac_cv_c_long_double=${ac_cv_c_long_double=yes}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index c5e354c073..a2384372db 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -27,10 +27,7 @@ 
ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
 ac_cv_va_val_copy=${ac_cv_va_val_copy=yes}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 ac_cv_path_ESD_CONFIG=no
 lf_cv_sane_realloc=yes
diff --git a/meta/site/nios2-linux b/meta/site/nios2-linux
index 67a3fc8a75..8ac198a0cd 100644
--- a/meta/site/nios2-linux
+++ b/meta/site/nios2-linux
@@ -2,9 +2,6 @@ 
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_sl
 ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index f37e915cb3..172a06cc46 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -39,10 +39,6 @@ 
cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
-
 # ssh
 ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
 ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 97c96934d7..6bda1c237c 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -31,10 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
-
 # ssh
 ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
 ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
-- 
2.24.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] site: Remove sctp related configs

2020-01-14 Thread Pau Espin Pedrol

They are preventing autotools from checking netinet/sctp.h existence
successfuly which in turn makes configure.ac files with lines similar to
this to fail, even if DEPENDS="lksctp-tools" and netinet/sctp.h is
clearly available under recipe-sysroot/:
AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found))

This is the case for new libosmo-netif versionsi (meta-telephony branch
laforge/nightly), which expects netinet/sctp.h to be available if default
flag --enable-libsctp is used.

Without this patch, do_configure will fail unless following line is used
in the recipe:
CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'libsctp', 
'ac_cv_header_netinet_sctp_h=yes', '',d)}"

So removing ac_cv_header_netinet_sctp_h would be enough, but I couldn't
find any good information on why the other 2 variables were set in site
config files, hence no good reason to keep them.
---
 meta/site/arm-common  | 3 ---
 meta/site/ix86-common | 3 ---
 meta/site/nios2-linux | 3 ---
 meta/site/powerpc32-linux | 4 
 meta/site/sh-common   | 4 
 5 files changed, 17 deletions(-)

diff --git a/meta/site/arm-common b/meta/site/arm-common
index 198c98c6a7..8c37f3fc24 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -4,9 +4,6 @@ 
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_sl
 ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 # bash
 ac_cv_c_long_double=${ac_cv_c_long_double=yes}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index c5e354c073..a2384372db 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -27,10 +27,7 @@ 
ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
 ac_cv_va_val_copy=${ac_cv_va_val_copy=yes}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 ac_cv_path_ESD_CONFIG=no
 lf_cv_sane_realloc=yes
diff --git a/meta/site/nios2-linux b/meta/site/nios2-linux
index 67a3fc8a75..8ac198a0cd 100644
--- a/meta/site/nios2-linux
+++ b/meta/site/nios2-linux
@@ -2,9 +2,6 @@ 
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_sl
 ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
 
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index f37e915cb3..172a06cc46 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -39,10 +39,6 @@ 
cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
-
 # ssh
 ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
 ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 97c96934d7..6bda1c237c 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -31,10 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 # apache
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 
-ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
-ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
-ac_cv_sctp=${ac_cv_sctp=no}
-
 # ssh
 ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
 ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
-- 
2.24.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [RFC] iptables: add systemd helper unit to load/restore rules

2016-10-03 Thread Pau Espin Pedrol

Hi,

can you please use ${systemd_system_unitdir} instead of
${systemd_unitdir}/system?
Pau Espin Pedrol


2016-09-08 13:29 GMT+02:00 Jack Mitchell <m...@embed.me.uk>:
> From: Jack Mitchell <j...@embed.me.uk>
>
> there is currently no way to automatically load iptable rules
> in OE. Add a systemd unit file to automatically load rules on
> network connection. This is cribbed from the way ArchLinux
> handles iptables with some minor modifications for OE. New rules
> can be generated using 'iptables-save > iptables.rules'
> ---
>  .../iptables/iptables/iptables.rules |  0
>  .../iptables/iptables/iptables.service   | 13 +
>  meta/recipes-extended/iptables/iptables_1.6.0.bb | 20 
> ++--
>  3 files changed, 31 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-extended/iptables/iptables/iptables.rules
>  create mode 100644 meta/recipes-extended/iptables/iptables/iptables.service
>
> diff --git a/meta/recipes-extended/iptables/iptables/iptables.rules 
> b/meta/recipes-extended/iptables/iptables/iptables.rules
> new file mode 100644
> index 000..e69de29
> diff --git a/meta/recipes-extended/iptables/iptables/iptables.service 
> b/meta/recipes-extended/iptables/iptables/iptables.service
> new file mode 100644
> index 000..041316e
> --- /dev/null
> +++ b/meta/recipes-extended/iptables/iptables/iptables.service
> @@ -0,0 +1,13 @@
> +[Unit]
> +Description=Packet Filtering Framework
> +Before=network-pre.target
> +Wants=network-pre.target
> +
> +[Service]
> +Type=oneshot
> +ExecStart=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
> +ExecReload=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
> +RemainAfterExit=yes
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-extended/iptables/iptables_1.6.0.bb 
> b/meta/recipes-extended/iptables/iptables_1.6.0.bb
> index fbbe418..65430a1 100644
> --- a/meta/recipes-extended/iptables/iptables_1.6.0.bb
> +++ b/meta/recipes-extended/iptables/iptables_1.6.0.bb
> @@ -22,13 +22,16 @@ SRC_URI = 
> "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
> file://types.h-add-defines-that-are-required-for-if_packet.patch \
> 
> file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
> 
> file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch 
> \
> -  "
> +   file://iptables.service \
> +   file://iptables.rules \
> +"
> +
>  SRC_URI_append_libc-musl = " file://0001-fix-build-with-musl.patch"
>
>  SRC_URI[md5sum] = "27ba3451cb622467fc9267a176f19a31"
>  SRC_URI[sha256sum] = 
> "4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60"
>
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig systemd
>
>  EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
> "
> @@ -48,3 +51,16 @@ do_configure_prepend() {
> # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive.
> rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4
>  }
> +
> +do_install_append() {
> +
> +install -d ${D}${sysconfdir}/iptables
> +install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables
> +
> +install -d ${D}${systemd_unitdir}/system
> +install -m 0644 ${WORKDIR}/iptables.service 
> ${D}${systemd_unitdir}/system
> +
> +   sed -i -e 's,@SBINDIR@,${sbindir},g' 
> ${D}${systemd_unitdir}/system/iptables.service
> +}
> +
> +SYSTEMD_SERVICE_${PN} = "iptables.service"
> --
> 2.9.3
>
> --
> ___
> 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 3/3] pulseaudio: fix to manage user services corretly

2016-09-09 Thread Pau Espin Pedrol

Hi,

I think I didn't express myself correctly. Please note I did the
longer investigations quite a while ago and I'm mainly talking from
memory, so I may be wrong in some of the assumptions.

>From systemd.bbclass, you can see this:
if service.find('.socket') != -1:
# for *.socket add *.service and *@.service
service_base = service.replace('.socket', '')
systemd_add_files_and_parse(pkg_systemd, path,
service_base + '.service', keys)
systemd_add_files_and_parse(pkg_systemd, path,
service_base + '@.service', keys)

So, for installation purposes, no .service is required in
SYSTEMD_USER_SERVICE. Setting it .socket should also install (but not
enable) the .service file together with the .socket one into the
image, as actually the .socket one usually depends on the .service
file at runtime.

That being said, of course it's not the same behavior if you add only
one of them, the other or both:
1- Adding only .service -> It will install + enable the .service
2- Adding only the .socket -> It will install both. It will enable .socket
3- Adding .service + .socket -> It will install both. It will enable both.

Usually, you want either only the .service to be enabled (1, which
will start it automatically at startup of user session), or only the
.socket enabled (2, which will start only the socket at startup of
user session, and only start pulseaudio process when required by some
pulseaudio client). The third case, that is, installing + enabling
both is usually not a good idea, at least it makes no sense to me.

So, we should consider only "1" or "2". I would personally go for 2nd
option, and probably disable pulseaudio own autospawn system as
explained by Tanu. This way we don't start pulseaudio unless when it's
actually needed.

That is:
+SYSTEMD_PACKAGES = "${PN}-server"
+SYSTEMD_USER_SERVICE_${PN}-server = "pulseaudio.socket"

And by the way, you  should be able to remove
"${systemd_user_unitdir}/*" from FILES_${PN}-server as it should be
handled automatically by systemd.bbclass. If that's not the case, then
probably there's some error in systemd.bbclass you should look into.

Hope I explained myself better now. Regards!

2016-09-08 13:22 GMT+02:00 Tanu Kaskinen <ta...@iki.fi>:
> On Thu, 2016-09-08 at 14:34 +0800, ChenQi wrote:
>> On 09/07/2016 06:29 PM, Pau Espin Pedrol wrote:
>> >
>> >
>> >
>> > Pau Espin Pedrol
>> >
>> > 2016-09-07 11:22 GMT+02:00 Chen Qi <qi.c...@windriver.com
>> > <mailto:qi.c...@windriver.com>>:
>> >
>> > Make use of the new SYSTEMD_USER_SERVICE variable added in
>> > systemd.bbclass
>> > to manage user services in pulseaudio-server package.
>> >
>> > Signed-off-by: Chen Qi <qi.c...@windriver.com
>> > <mailto:qi.c...@windriver.com>>
>> > ---
>> >  meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
>> > b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
>> > index 6ed79ef..f3754d7 100644
>> > --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
>> > +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
>> > @@ -124,8 +124,8 @@ FILES_${PN}-conf = "${sysconfdir}"
>> >  FILES_${PN}-bin +=
>> > "${sysconfdir}/default/volatiles/volatiles.04_pulse"
>> >  FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-*
>> > ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules
>> > */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*"
>> >
>> > -#SYSTEMD_PACKAGES = "${PN}-server"
>> > -SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service"
>> > +SYSTEMD_PACKAGES = "${PN}-server"
>> > +SYSTEMD_USER_SERVICE_${PN}-server = "pulseaudio.service
>> > pulseaudio.socket"
>> >
>> > I think specifying "pulseaudio.socket" for
>> > SYSTEMD_USER_SERVICE_${PN}-server should be enough, systemd.bbclass is
>> > going to add the .service file afair.
>>
>> Add both:
>> chenqi@pek-hostel-deb01:~/poky/build-systemd [1] $ ls
>> tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/etc/systemd/user
>> default.target.wants  sockets.target.wants
>>
>> Add pulseaudio.socket:
>> chenqi@pek-hostel-deb01:~/poky/build-systemd [1] $ ls
>> tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/etc/systemd/user
>> sockets.target.wants

Re: [OE-core] [PATCH 2/3] systemd.bbclass: add support to manage user services

2016-09-09 Thread Pau Espin Pedrol

Hi,

Pau Espin Pedrol

2016-09-08 4:33 GMT+02:00 ChenQi <qi.c...@windriver.com>:

> On 09/07/2016 08:14 PM, Pau Espin Pedrol wrote:
>
>
> 2016-09-07 11:22 GMT+02:00 Chen Qi <qi.c...@windriver.com>:
>
>> Add new variable SYSTEMD_USER_SERVICE and SYSTEM_USER_AUTO_ENABLE
>> to manage user services. Their usage is like SYSTEMD_SERVICE and
>> SYSTEMD_AUTO_ENABLE.
>>
>> [YOCTO #7800]
>>
>> Signed-off-by: Chen Qi <qi.c...@windriver.com>
>> ---
>>  meta/classes/systemd.bbclass | 17 +
>>  1 file changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
>> index db7873f..78cec97 100644
>> --- a/meta/classes/systemd.bbclass
>> +++ b/meta/classes/systemd.bbclass
>> @@ -7,6 +7,7 @@ SYSTEMD_PACKAGES_class-nativesdk ?= ""
>>
>>  # Whether to enable or disable the services on installation.
>>  SYSTEMD_AUTO_ENABLE ??= "enable"
>> +SYSTEMD_USER_AUTO_ENABLE ??= "enable"
>>
>>  # This class will be included in any recipe that supports systemd init
>> scripts,
>>  # even if systemd is not in DISTRO_FEATURES.  As such don't make any
>> changes
>> @@ -30,10 +31,14 @@ fi
>>
>>  if type systemctl >/dev/null 2>/dev/null; then
>> systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
>> +       systemctl $OPTS --global ${SYSTEMD_USER_AUTO_ENABLE}
>> ${SYSTEMD_USER_SERVICE}
>>
>
> I'm not sure having these 2 systemctl being executed together everytime is
> a good idea. What if a recipe has a user service and no system service?
>
>
> Hi Pau Espin Pedrol,
>
> Thanks for your review.
>
> The postinstall script runs successfully with expected result at rootfs
> time. But your question reminds me of the situation of the on-target
> install/remove situation. I think I'll need to make a new patch to make
> sure things work in both situations.
>
> The key point here is that 'systemctl' at rootfs time is a shell script
> written by ourselves and 'systemctl' on target is that provided by systemd.
>

Yes, I was unaware of the existance of that OE script when I worked on
this. Why are we using that script at build time instead of using systemd's
systemctl? Any good reason for that? git log only shows it was imported
from another repo a while ago.


>
> We are calling the first one with an empty system service? Or we are may
> be enabling a systemd system service which should not be enabled according
> to the recipe? I have the feeling this kind of cases are not being catch in
> here and other pkg scripts in this commit.
>
> It is far from perfect, but in case you didn't, you may want to have a
> look at my initial/previous commit to try to fix the issue:
> https://www.mail-archive.com/openembedded-devel@lists.
> openembedded.org/msg42187.html
>
>
>>
>> if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
>> systemctl restart ${SYSTEMD_SERVICE}
>> fi
>> +   if [ -z "$D" -a "${SYSTEMD_USER_AUTO_ENABLE}" = "enable" ]; then
>> +   systemctl --global restart ${SYSTEMD_USER_SERVICE}
>> +   fi
>>  fi
>>  }
>>
>> @@ -47,9 +52,11 @@ fi
>>  if type systemctl >/dev/null 2>/dev/null; then
>> if [ -z "$D" ]; then
>> systemctl stop ${SYSTEMD_SERVICE}
>> +   systemctl --global stop ${SYSTEMD_USER_SERVICE}
>>
>
> I think this is not gonna work, you cannot call --global with stop afair.
> I'm not sure which is the good solution for this though, but you should
> ideally go through all systemd user sessions and call "systemctl --user
> stop". No idea if that's actually easily feasible.
>
>
> The service is enabled and started with '--global' option, and stopping it
> with '--global' option seems reasonable to me. If there's some special
> case, let's look into it then.
>
>

Did you try running it in a running image? As in taking the ipkg, and
reinstalling it live in the image with systemd's systemctl. I bet you will
get an error from systemctl for both "--gobal restart" and "--global stop".
At least it used to be like that afair.



> Best Regards,
> Chen Qi
>
>
>
>
>> fi
>>
>> systemctl $OPTS disable ${SYSTEMD_SERVICE}
>> +   systemctl $OPTS --global disable ${SYSTEMD_USER_SERVICE}
>>  fi
>>  }
>>
>> @@ -139,12 +146,14 @@ python systemd_populate_packages() {
>>  def systemd_check_services():
>>  se

Re: [OE-core] [PATCH 2/3] systemd.bbclass: add support to manage user services

2016-09-07 Thread Pau Espin Pedrol

2016-09-07 11:22 GMT+02:00 Chen Qi :

> Add new variable SYSTEMD_USER_SERVICE and SYSTEM_USER_AUTO_ENABLE
> to manage user services. Their usage is like SYSTEMD_SERVICE and
> SYSTEMD_AUTO_ENABLE.
>
> [YOCTO #7800]
>
> Signed-off-by: Chen Qi 
> ---
>  meta/classes/systemd.bbclass | 17 +
>  1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
> index db7873f..78cec97 100644
> --- a/meta/classes/systemd.bbclass
> +++ b/meta/classes/systemd.bbclass
> @@ -7,6 +7,7 @@ SYSTEMD_PACKAGES_class-nativesdk ?= ""
>
>  # Whether to enable or disable the services on installation.
>  SYSTEMD_AUTO_ENABLE ??= "enable"
> +SYSTEMD_USER_AUTO_ENABLE ??= "enable"
>
>  # This class will be included in any recipe that supports systemd init
> scripts,
>  # even if systemd is not in DISTRO_FEATURES.  As such don't make any
> changes
> @@ -30,10 +31,14 @@ fi
>
>  if type systemctl >/dev/null 2>/dev/null; then
> systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
> +   systemctl $OPTS --global ${SYSTEMD_USER_AUTO_ENABLE}
> ${SYSTEMD_USER_SERVICE}
>

I'm not sure having these 2 systemctl being executed together everytime is
a good idea. What if a recipe has a user service and no system service? We
are calling the first one with an empty system service? Or we are may be
enabling a systemd system service which should not be enabled according to
the recipe? I have the feeling this kind of cases are not being catch in
here and other pkg scripts in this commit.

It is far from perfect, but in case you didn't, you may want to have a look
at my initial/previous commit to try to fix the issue:
https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg42187.html


>
> if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
> systemctl restart ${SYSTEMD_SERVICE}
> fi
> +   if [ -z "$D" -a "${SYSTEMD_USER_AUTO_ENABLE}" = "enable" ]; then
> +   systemctl --global restart ${SYSTEMD_USER_SERVICE}
> +   fi
>  fi
>  }
>
> @@ -47,9 +52,11 @@ fi
>  if type systemctl >/dev/null 2>/dev/null; then
> if [ -z "$D" ]; then
> systemctl stop ${SYSTEMD_SERVICE}
> +   systemctl --global stop ${SYSTEMD_USER_SERVICE}
>

I think this is not gonna work, you cannot call --global with stop afair.
I'm not sure which is the good solution for this though, but you should
ideally go through all systemd user sessions and call "systemctl --user
stop". No idea if that's actually easily feasible.


> fi
>
> systemctl $OPTS disable ${SYSTEMD_SERVICE}
> +   systemctl $OPTS --global disable ${SYSTEMD_USER_SERVICE}
>  fi
>  }
>
> @@ -139,12 +146,14 @@ python systemd_populate_packages() {
>  def systemd_check_services():
>  searchpaths = [oe.path.join(d.getVar("sysconfdir", True),
> "systemd", "system"),]
>  searchpaths.append(d.getVar("systemd_system_unitdir", True))
> +searchpaths.append(oe.path.join(d.getVar("sysconfdir", True),
> "systemd", "user"))
> +searchpaths.append(d.getVar("systemd_user_unitdir", True))
>  systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
>
>  keys = 'Also'
>  # scan for all in SYSTEMD_SERVICE[]
>  for pkg_systemd in systemd_packages.split():
> -for service in get_package_var(d, 'SYSTEMD_SERVICE',
> pkg_systemd).split():
> +for service in (get_package_var(d, 'SYSTEMD_SERVICE',
> pkg_systemd) + get_package_var(d, 'SYSTEMD_USER_SERVICE',
> pkg_systemd)).split():
>  path_found = ''
>
>  # Deal with adding, for example, 'ifplugd@eth0.service'
> from
> @@ -165,14 +174,14 @@ python systemd_populate_packages() {
>  if path_found != '':
>  systemd_add_files_and_parse(pkg_systemd, path_found,
> service, keys)
>  else:
> -raise bb.build.FuncFailed("SYSTEMD_SERVICE_%s value
> %s does not exist" % \
> -(pkg_systemd, service))
> +raise bb.build.FuncFailed("SYSTEMD_SERVICE_%s or
> SYSTEMD_USER_SERVICE_%s value %s does not exist" % \
> +(pkg_systemd, pkg_systemd, service))
>
>  # Run all modifications once when creating package
>  if os.path.exists(d.getVar("D", True)):
>  for pkg in d.getVar('SYSTEMD_PACKAGES', True).split():
>  systemd_check_package(pkg)
> -if d.getVar('SYSTEMD_SERVICE_' + pkg, True):
> +if d.getVar('SYSTEMD_SERVICE_' + pkg, True) or
> d.getVar('SYSTEMD_USER_SERVICE_' + pkg, True):
>  systemd_generate_package_scripts(pkg)
>  systemd_check_services()
>  }
> --
> 1.9.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
>

Re: [OE-core] [PATCH 3/3] pulseaudio: fix to manage user services corretly

2016-09-07 Thread Pau Espin Pedrol

Pau Espin Pedrol

2016-09-07 11:22 GMT+02:00 Chen Qi <qi.c...@windriver.com>:

> Make use of the new SYSTEMD_USER_SERVICE variable added in systemd.bbclass
> to manage user services in pulseaudio-server package.
>
> Signed-off-by: Chen Qi <qi.c...@windriver.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 6ed79ef..f3754d7 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -124,8 +124,8 @@ FILES_${PN}-conf = "${sysconfdir}"
>  FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
>  FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-*
> ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules
> */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*"
>
> -#SYSTEMD_PACKAGES = "${PN}-server"
> -SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service"
> +SYSTEMD_PACKAGES = "${PN}-server"
> +SYSTEMD_USER_SERVICE_${PN}-server = "pulseaudio.service
> pulseaudio.socket"
>
> I think specifying "pulseaudio.socket" for SYSTEMD_USER_SERVICE_${PN}-server
should be enough, systemd.bbclass is going to add the .service file afair.


>  FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so"
>
> --
> 1.9.1
>
> --
> ___
> 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 00/42] General cleanage of systemd unitdir vars

2016-06-18 Thread Pau Espin Pedrol

Hi,

I sent this series of patches around 3 months ago and got no aswer at all,
so just wondering if is it gonna ever be reviewed/merged.

I know maintainers are currently kind of overwhelmed with the big amount of
patches received every day, but I'd like to know if it makes sense for me
to spend more time on this.

Pau Espin Pedrol

2016-03-13 20:12 GMT+01:00 Pau Espin Pedrol <pespin.s...@gmail.com>:

> * These series of patches aim at improving the usage of some systemd
> related variables
>   in several recipes from oe-core. Main aim is to change those recipes to
> use
>   'systemd_system_unitdir' instead of the old 'systemd_unitdir/system'
> variable,
>   which will be marked as deprecated instead of being removed as is may
> still be
>   used in other oe layers. To mark it as deprecated, a comment is added in
> bitbake.conf,
>   but better ideas regarding this are welcome.
>
> * Few recipes have also been changed to use the 'systemd_user_unitdir'
> variable for
>   their systemd user services.
>
> The following changes since commit
> 4be0e15f74cff85edca9de55248939fb438f30ae:
>
>   oeqa/selftest/recipetool: Fix test_recipetool_create_simple (2016-03-13
> 18:15:41 +)
>
> are available in the git repository at:
>
>   git://github.com/pespin/openembedded-core systemd-var-fixes
>   https://github.com/pespin/openembedded-core/tree/systemd-var-fixes
>
> Pau Espin Pedrol (42):
>   rootfs-postcommands: Fix usage of systemd unitdir vars
>   acpid: Fix usage of systemd unitdir vars
>   apmd: Fix usage of systemd unitdir vars
>   avahi: Fix usage of systemd unitdir vars
>   bind: Fix usage of systemd unitdir vars
>   connman: Fix usage of systemd unitdir vars
>   dhcp: Fix usage of systemd unitdir vars
>   neard: Fix usage of systemd unitdir vars
>   nfs-utils: Fix usage of systemd unitdir vars
>   openssh: Fix usage of systemd unitdir vars
>   portmap: Fix usage of systemd unitdir vars
>   ppp: Fix usage of systemd unitdir vars
>   wpa-supplicant: Fix usage of systemd unitdir vars
>   busybox: Fix usage of systemd unitdir vars
>   dropbear: Fix usage of systemd unitdir vars
>   glibc-package: Fix usage of systemd unitdir vars
>   systemd-compat-units: Fix usage of systemd unitdir vars
>   systemd-serialgetty: Fix usage of systemd unitdir vars
>   systemd: Fix usage of systemd unitdir vars
>   util-linux: Fix usage of systemd unitdir vars
>   volatile-binds: Fix usage of systemd unitdir vars
>   distcc: Fix usage of systemd unitdir vars
>   run-postints: Fix usage of systemd unitdir vars
>   tcf-agent: Fix usage of systemd unitdir vars
>   at: Fix usage of systemd unitdir vars
>   cronie: Fix usage of systemd unitdir vars
>   lighttpd: Fix usage of systemd unitdir vars
>   rpcbind: Fix usage of systemd unitdir vars
>   sysstat: Fix usage of systemd unitdir vars
>   xinetd: Fix usage of systemd unitdir vars
>   xserver-nodm-init: Fix usage of systemd unitdir vars
>   oprofileui-server: Fix usage of systemd unitdir vars
>   consolekit: Fix usage of systemd unitdir vars
>   alsa-utils: Fix usage of systemd unitdir vars
>   ofono: Fix usage of systemd unitdir vars
>   bluez5: Fix usage of systemd unitdir vars
>   avahi-ui: Fix usage of systemd unitdir vars
>   opkg: Fix usage of systemd unitdir vars
>   dpkg: Fix usage of systemd unitdir vars
>   systemd.bbclass: Remove user services too if systemd is not enabled
>   systemd: Remove usage of systemd_unitdir
>   bitbake.conf: Mark systemd_unitdir as deprecated to avoid future use
>
>  meta/classes/rootfs-postcommands.bbclass   |  4 +-
>  meta/classes/systemd.bbclass   | 19 --
>  meta/conf/bitbake.conf |  3 +
>  meta/recipes-bsp/acpid/acpid.inc   |  6 +-
>  meta/recipes-bsp/apmd/apmd_3.2.2-15.bb |  6 +-
>  meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb |  8 +--
>  meta/recipes-connectivity/avahi/avahi.inc  |  2 +-
>  meta/recipes-connectivity/bind/bind_9.10.3-P3.bb   |  6 +-
>  meta/recipes-connectivity/bluez5/bluez5.inc|  4 +-
>  meta/recipes-connectivity/connman/connman.inc  |  6 +-
>  meta/recipes-connectivity/dhcp/dhcp.inc| 16 ++---
>  meta/recipes-connectivity/neard/neard_0.15.bb  |  2 +-
>  .../nfs-utils/nfs-utils_1.3.3.bb   | 20 +++---
>  meta/recipes-connectivity/ofono/ofono.inc  |  4 +-
>  meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 12 ++--
>  meta/recipes-connectivity/portmap/portmap_6.0.bb   |  6 +-
>  meta/recipes-connectivity/ppp/ppp_2.4.7.bb |  8 +--
>  .../wpa-supplicant/wpa-supplicant_2.5.bb   |  4 +-
>  meta/recipes-core/busybox/busybox.inc  | 12 ++--
>  meta/recipes-core/dropbear/d

Re: [OE-core] [PATCH v2] mdadm: add systemd support

2016-04-29 Thread Pau Espin Pedrol

2016-04-27 10:34 GMT+02:00 Li Xin <lixin.f...@cn.fujitsu.com>:

> +   ${D}${systemd_unitdir}/system/mdadm.service


Hi, could you please use "${D}${systemd_system_unitdir}/mdadm.service"
instead of "${D}${systemd_unitdir}/system/mdadm.service" in here?

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 36/42] bluez5: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc 
b/meta/recipes-connectivity/bluez5/bluez5.inc
index ff2bdcb..504c320 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -69,14 +69,14 @@ ALLOW_EMPTY_libasound-module-bluez = "1"
 PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex 
${PN}-noinst-tools"
 
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ 
${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ 
${nonarch_base_libdir}/udev/ ${systemd_system_unitdir}/ ${datadir}/dbus-1"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
 "
 
 FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
-${exec_prefix}/lib/systemd/user/obex.service \
+${systemd_user_unitdir}/obex.service \
 ${datadir}/dbus-1/services/org.bluez.obex.service \
"
 SYSTEMD_SERVICE_${PN}-obex = "obex.service"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 35/42] ofono: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/ofono/ofono.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc 
b/meta/recipes-connectivity/ofono/ofono.inc
index c415a39..5e40c6c 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -16,7 +16,7 @@ PACKAGECONFIG ??= "\
 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
 "
-PACKAGECONFIG[systemd] = 
"--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
+PACKAGECONFIG[systemd] = 
"--with-systemdunitdir=${systemd_system_unitdir}/,--with-systemdunitdir="
 PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}"
 
 EXTRA_OECONF += "--enable-test"
@@ -32,6 +32,6 @@ PACKAGES =+ "${PN}-tests"
 
 RDEPENDS_${PN} += "dbus"
 
-FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
+FILES_${PN} += "${base_libdir}/udev ${systemd_system_unitdir}"
 FILES_${PN}-tests = "${libdir}/${BPN}/test"
 RDEPENDS_${PN}-tests = "python python-pygobject python-dbus"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 39/42] dpkg: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

* SYSTEMD_UNITDIR var is not present in the file, it can be safely removed

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc 
b/meta/recipes-devtools/dpkg/dpkg.inc
index 3d9e7e3..1f7f5d1 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -52,13 +52,12 @@ do_install_append () {
fi
 
if 
${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dpkg-configure.service 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dpkg-configure.service 
${D}${systemd_system_unitdir}/
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@BINDIR@,${bindir},g' \
-   -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
-   ${D}${systemd_unitdir}/system/dpkg-configure.service
+   ${D}${systemd_system_unitdir}/dpkg-configure.service
fi
 }
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 40/42] systemd.bbclass: Remove user services too if systemd is not enabled

2016-03-13 Thread Pau Espin Pedrol

* Also change naming related to unitdir, as it's quite misleading because
  in here we are removing more stuff (parent directory) than just unitdir.

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/classes/systemd.bbclass | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index db7873f..9574cbd 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -179,17 +179,24 @@ python systemd_populate_packages() {
 
 PACKAGESPLITFUNCS_prepend = "systemd_populate_packages "
 
-python rm_systemd_unitdir (){
+python rm_systemd_dir (){
 import shutil
 if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
-systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True))
-if os.path.exists(systemd_unitdir):
-shutil.rmtree(systemd_unitdir)
-systemd_libdir = os.path.dirname(systemd_unitdir)
+systemd_system_dir = oe.path.join(d.getVar("D", True), 
d.getVar('nonarch_base_libdir', True), 'systemd')
+if os.path.exists(systemd_system_dir):
+shutil.rmtree(systemd_system_dir)
+systemd_libdir = os.path.dirname(systemd_system_dir)
+if (os.path.exists(systemd_libdir) and not os.listdir(systemd_libdir)):
+os.rmdir(systemd_libdir)
+
+systemd_user_dir = oe.path.join(d.getVar("D", True), 
d.getVar('nonarch_libdir', True), 'systemd')
+if os.path.exists(systemd_user_dir):
+shutil.rmtree(systemd_user_dir)
+systemd_libdir = os.path.dirname(systemd_user_dir)
 if (os.path.exists(systemd_libdir) and not os.listdir(systemd_libdir)):
 os.rmdir(systemd_libdir)
 }
-do_install[postfuncs] += "rm_systemd_unitdir "
+do_install[postfuncs] += "rm_systemd_dir "
 
 python rm_sysvinit_initddir (){
 import shutil
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 37/42] avahi-ui: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb 
b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 3966b4c..0ab1e38 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -41,11 +41,9 @@ RDEPENDS_python-avahi = "python-core python-dbus"
 do_install_append () {
rm ${D}${sysconfdir} -rf
rm ${D}${base_libdir} -rf
-   rm ${D}${systemd_unitdir} -rf
-   # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
-   # but not ${base_libdir} here. And the /lib may not exist
-   # whithout systemd.
-   [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
+   rm ${D}${systemd_system_unitdir} -rf
+   rm ${D}${nonarch_base_libdir}/systemd -rf
+   [ ! -d ${D}${nonarch_base_libdir} ] || rmdir ${D}${nonarch_base_libdir} 
--ignore-fail-on-non-empty
rm ${D}${bindir}/avahi-b*
rm ${D}${bindir}/avahi-p*
rm ${D}${bindir}/avahi-r*
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 38/42] opkg: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

* SYSTEMD_UNITDIR var is not present in the file, it can be safely removed

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-devtools/opkg/opkg_0.3.1.bb | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg_0.3.1.bb 
b/meta/recipes-devtools/opkg/opkg_0.3.1.bb
index 577f495..f1bc8ae 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.1.bb
@@ -48,13 +48,12 @@ do_install_append () {
install -d ${D}${OPKGLIBDIR}/opkg
 
if 
${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/opkg-configure.service 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/opkg-configure.service 
${D}${systemd_system_unitdir}/
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@BINDIR@,${bindir},g' \
-   -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
-   ${D}${systemd_unitdir}/system/opkg-configure.service
+   ${D}${systemd_system_unitdir}/opkg-configure.service
fi
 }
 
@@ -68,7 +67,7 @@ RPROVIDES_${PN} = "opkg-collateral"
 PACKAGES =+ "libopkg"
 
 FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
-FILES_${PN} += "${systemd_unitdir}/system/"
+FILES_${PN} += "${systemd_system_unitdir}/"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 41/42] systemd: Remove usage of systemd_unitdir

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/systemd/systemd_229.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_229.bb 
b/meta/recipes-core/systemd/systemd_229.bb
index fcb22a3..f422d15 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -260,7 +260,7 @@ do_install() {
echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/resolv.conf' 
>>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
echo 'f /run/resolv.conf 0644 root root' 
>>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
fi
-   install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON 
${D}${systemd_unitdir}/systemd-sysv-install
+   install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON 
${D}${nonarch_base_libdir}/systemd/systemd-sysv-install
 }
 
 do_install_ptest () {
@@ -411,7 +411,7 @@ FILES_${PN} = " ${base_bindir}/* \
 ${sysconfdir}/init.d/README \
 ${sysconfdir}/resolv.conf \
 ${rootlibexecdir}/systemd/* \
-${systemd_unitdir}/* \
+${nonarch_base_libdir}/systemd/* \
 ${base_libdir}/security/*.so \
 ${libdir}/libnss_* \
 /cgroup \
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 42/42] bitbake.conf: Mark systemd_unitdir as deprecated to avoid future use

2016-03-13 Thread Pau Espin Pedrol

* This var is not used anymore in oe-core, but it may still be used in
  some other layers. Let's leave it there for some more time to avoid
  crashes.

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/conf/bitbake.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7ed5ffb..7eeac94 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -32,7 +32,10 @@ export datadir = "${prefix}/share"
 export infodir = "${datadir}/info"
 export mandir = "${datadir}/man"
 export docdir = "${datadir}/doc"
+
+# systemd_unitdir is DEPRECATED, don't use it:
 export systemd_unitdir = "${nonarch_base_libdir}/systemd"
+
 export systemd_system_unitdir = "${nonarch_base_libdir}/systemd/system"
 export nonarch_libdir = "${exec_prefix}/lib"
 export systemd_user_unitdir = "${nonarch_libdir}/systemd/user"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 31/42] xserver-nodm-init: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb 
b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index b68d40e..650ebe0 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -25,14 +25,14 @@ do_install() {
 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
 install -d ${D}${sysconfdir}/default
 install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${WORKDIR}/xserver-nodm.service 
${D}${systemd_unitdir}/system
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 ${WORKDIR}/xserver-nodm.service 
${D}${systemd_system_unitdir}
 if [ "${ROOTLESS_X}" = "1" ] ; then
 sed -i 's!^HOME=.*!HOME=/home/xuser!' 
${D}${sysconfdir}/default/xserver-nodm
-sed -i 's!^User=.*!User=xuser!' 
${D}${systemd_unitdir}/system/xserver-nodm.service
+sed -i 's!^User=.*!User=xuser!' 
${D}${systemd_system_unitdir}/xserver-nodm.service
 else
 sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' 
${D}${sysconfdir}/default/xserver-nodm
-sed -i '/^User=/d' 
${D}${systemd_unitdir}/system/xserver-nodm.service
+sed -i '/^User=/d' 
${D}${systemd_system_unitdir}/xserver-nodm.service
 fi
 fi
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 32/42] oprofileui-server: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-kernel/oprofile/oprofileui-server_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb 
b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index cc3477b..e1a153b 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -19,10 +19,10 @@ do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init 
${D}${sysconfdir}/init.d/oprofileui-server
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/oprofileui-server.service 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/oprofileui-server.service 
${D}${systemd_system_unitdir}/
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-   -e 's,@BINDIR@,${bindir},g' 
${D}${systemd_unitdir}/system/oprofileui-server.service
+   -e 's,@BINDIR@,${bindir},g' 
${D}${systemd_system_unitdir}/oprofileui-server.service
 }
 
 inherit update-rc.d systemd
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 33/42] consolekit: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-support/consolekit/consolekit_0.4.6.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb 
b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 2974e36..1ae054c 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -28,10 +28,10 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'pam', 'pam', '', d)}
 
 PACKAGECONFIG[pam] = "--enable-pam-module 
--with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
 PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit"
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir="
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir="
 
 FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
-${libdir}/ConsoleKit  ${systemd_unitdir} ${base_libdir} \
+${libdir}/ConsoleKit  ${systemd_system_unitdir} ${base_libdir} 
\
 ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*"
 
 PACKAGES =+ "pam-plugin-ck-connector"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 34/42] alsa-utils: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb 
b/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
index af40488..49068f5 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
@@ -62,7 +62,7 @@ FILES_alsa-utils-midi= "${bindir}/aplaymidi 
${bindir}/arecordmidi ${bind
 FILES_alsa-utils-aconnect= "${bindir}/aconnect"
 FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
 FILES_alsa-utils-iecset  = "${bindir}/iecset"
-FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d 
*/*/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa 
${datadir}/alsa/init/"
+FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d 
*/*/udev/rules.d ${systemd_system_unitdir} ${localstatedir}/lib/alsa 
${datadir}/alsa/init/"
 FILES_alsa-utils-aseqdump= "${bindir}/aseqdump"
 FILES_alsa-utils-alsaloop= "${bindir}/alsaloop"
 FILES_alsa-utils-alsaucm = "${bindir}/alsaucm"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 24/42] tcf-agent: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb 
b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index ab2fcd7..5438d62 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -45,8 +45,8 @@ do_install() {
oe_runmake install INSTALLROOT=${D}
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/tcf-agent.init 
${D}${sysconfdir}/init.d/tcf-agent
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/tcf-agent.service 
${D}${systemd_unitdir}/system
-   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/tcf-agent.service
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/tcf-agent.service 
${D}${systemd_system_unitdir}
+   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_system_unitdir}/tcf-agent.service
 }
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 29/42] sysstat: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/sysstat/sysstat.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/sysstat/sysstat.inc 
b/meta/recipes-extended/sysstat/sysstat.inc
index c353291..9e0e0cb 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -36,9 +36,9 @@ do_install() {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system
-   sed -i -e 's#@LIBDIR@#${libdir}#g' 
${D}${systemd_unitdir}/system/sysstat.service
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir}
+   sed -i -e 's#@LIBDIR@#${libdir}#g' 
${D}${systemd_system_unitdir}/sysstat.service
 }
 
 pkg_postinst_${PN} () {
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 21/42] volatile-binds: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/volatile-binds/volatile-binds.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb 
b/meta/recipes-core/volatile-binds/volatile-binds.bb
index fee7275..e5fec95 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -32,7 +32,7 @@ def volatile_systemd_services(d):
 
 SYSTEMD_SERVICE_${PN} = "${@volatile_systemd_services(d)}"
 
-FILES_${PN} += "${systemd_unitdir}/system/*.service"
+FILES_${PN} += "${systemd_system_unitdir}/*.service"
 
 do_compile () {
 while read spec mountpoint; do
@@ -63,9 +63,9 @@ do_install () {
 install -d ${D}${base_sbindir}
 install -m 0755 mount-copybind ${D}${base_sbindir}/
 
-install -d ${D}${systemd_unitdir}/system
+install -d ${D}${systemd_system_unitdir}
 for service in ${SYSTEMD_SERVICE_volatile-binds}; do
-install -m 0644 $service ${D}${systemd_unitdir}/system/
+install -m 0644 $service ${D}${systemd_system_unitdir}/
 done
 }
 do_install[dirs] = "${WORKDIR}"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 26/42] cronie: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/cronie/cronie_1.5.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/cronie/cronie_1.5.0.bb 
b/meta/recipes-extended/cronie/cronie_1.5.0.bb
index 697501a..54eabf3 100644
--- a/meta/recipes-extended/cronie/cronie_1.5.0.bb
+++ b/meta/recipes-extended/cronie/cronie_1.5.0.bb
@@ -48,11 +48,11 @@ do_install_append () {
install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond
 
# install systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
   -e 's,@SBINDIR@,${sbindir},g' \
-  ${D}${systemd_unitdir}/system/crond.service
+  ${D}${systemd_system_unitdir}/crond.service
 
# below are necessary for a complete cron environment
install -d ${D}${localstatedir}/spool/cron
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 27/42] lighttpd: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
index a407d03..ca88b75 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
@@ -54,12 +54,12 @@ do_install_append() {
install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_system_unitdir}
sed -i -e 's,@SBINDIR@,${sbindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@BASE_BINDIR@,${base_bindir},g' \
-   ${D}${systemd_unitdir}/system/lighttpd.service
+   ${D}${systemd_system_unitdir}/lighttpd.service
#For FHS compliance, create symbolic links to /var/log and /var/tmp for 
logs and temporary data
ln -sf ${localstatedir}/log ${D}/www/logs
ln -sf ${localstatedir}/tmp ${D}/www/var
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 22/42] distcc: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-devtools/distcc/distcc_3.1.bb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb 
b/meta/recipes-devtools/distcc/distcc_3.1.bb
index f8879c8..e7b9e26 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -48,9 +48,9 @@ do_install_append() {
 install -d ${D}${sysconfdir}/default
 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
-install -d ${D}${systemd_unitdir}/system/
-install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system
-sed -i -e 's,@BINDIR@,${bindir},g' 
${D}${systemd_unitdir}/system/distcc.service
+install -d ${D}${systemd_system_unitdir}/
+install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_system_unitdir}
+sed -i -e 's,@BINDIR@,${bindir},g' 
${D}${systemd_system_unitdir}/distcc.service
 ${DESKTOPINSTALL}
 }
 DESKTOPINSTALL = ""
@@ -65,7 +65,7 @@ FILES_${PN} = " ${sysconfdir} \
 ${bindir}/lsdistcc \
${bindir}/distccd \
${bindir}/distccmon-text \
-   ${systemd_unitdir}/system/distcc.service"
+   ${systemd_system_unitdir}/distcc.service"
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
${datadir}/distcc"
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 25/42] at: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/at/at_3.1.18.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/at/at_3.1.18.bb 
b/meta/recipes-extended/at/at_3.1.18.bb
index e83ea32..d7f99c5 100644
--- a/meta/recipes-extended/at/at_3.1.18.bb
+++ b/meta/recipes-extended/at/at_3.1.18.bb
@@ -59,9 +59,9 @@ do_install () {
install -m 0755${WORKDIR}/atd.init  
${D}${sysconfdir}/init.d/atd
 
# install systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
-   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/atd.service
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir}
+   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_system_unitdir}/atd.service
 
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = 
"pam" ]; then
install -D -m 0644 ${WORKDIR}/${BP}/pam.conf 
${D}${sysconfdir}/pam.d/atd
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 23/42] run-postints: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb 
b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
index 11c94e5..4860d9c 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
@@ -33,13 +33,13 @@ do_install() {
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/run-postinsts.init 
${D}${sysconfdir}/init.d/run-postinsts
 
-   install -d ${D}${systemd_unitdir}/system/
-   install -m 0644 ${WORKDIR}/run-postinsts.service 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}/
+   install -m 0644 ${WORKDIR}/run-postinsts.service 
${D}${systemd_system_unitdir}/
 
sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \
-e 's:#SBINDIR#:${sbindir}:g' \
-e 's:#BASE_BINDIR#:${base_bindir}:g' \
-e 's:#LOCALSTATEDIR#:${localstatedir}:g' \
${D}${sbindir}/run-postinsts \
-   ${D}${systemd_unitdir}/system/run-postinsts.service
+   ${D}${systemd_system_unitdir}/run-postinsts.service
 }
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 28/42] rpcbind: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index c19a197..0afec6d 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -47,7 +47,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / 
\
--shell /bin/false --user-group rpc"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)}"
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/, \
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir}/, \
   --without-systemdsystemunitdir, \
   systemd \
 "
@@ -64,10 +64,10 @@ do_install_append () {
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
 
install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_system_unitdir}
sed -i -e 's,@SBINDIR@,${sbindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-   ${D}${systemd_unitdir}/system/rpcbind.service
+   ${D}${systemd_system_unitdir}/rpcbind.service
 }
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 30/42] xinetd: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb 
b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 6bfaabe..98d66d3 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -67,11 +67,11 @@ do_install() {
install -m 664 ${S}/contrib/xinetd.d/* ${D}${sysconfdir}/xinetd.d
 
# Install systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
   -e 's,@SBINDIR@,${sbindir},g' \
-  ${D}${systemd_unitdir}/system/xinetd.service
+  ${D}${systemd_system_unitdir}/xinetd.service
 }
 
 CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 17/42] systemd-compat-units: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/systemd/systemd-compat-units.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb 
b/meta/recipes-core/systemd/systemd-compat-units.bb
index 0b8ff09..9ff3237 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -34,7 +34,7 @@ pkg_postinst_${PN} () {
fi
 
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
-   if [ \( -e $i -o $i.sh \) -a ! \( -e 
$D${sysconfdir}/systemd/system/$i.service -o  -e 
$D${systemd_unitdir}/system/$i.service \) ] ; then
+   if [ \( -e $i -o $i.sh \) -a ! \( -e 
$D${sysconfdir}/systemd/system/$i.service -o  -e 
$D${systemd_system_unitdir}/$i.service \) ] ; then
echo -n "$i: " ; systemctl ${OPTS} mask $i.service
fi
done ; echo
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 18/42] systemd-serialgetty: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/systemd/systemd-serialgetty.bb | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb 
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 768b130..b57f0f3 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -13,10 +13,10 @@ S = "${WORKDIR}"
 do_install() {
if [ ! -z "${SERIAL_CONSOLES}" ] ; then
default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
-   install -d ${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}/
install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
-   install -m 0644 ${WORKDIR}/serial-getty@.service 
${D}${systemd_unitdir}/system/
-   sed -i -e s/\@BAUDRATE\@/$default_baudrate/g 
${D}${systemd_unitdir}/system/serial-getty@.service
+   install -m 0644 ${WORKDIR}/serial-getty@.service 
${D}${systemd_system_unitdir}/
+   sed -i -e s/\@BAUDRATE\@/$default_baudrate/g 
${D}${systemd_system_unitdir}/serial-getty@.service
 
tmp="${SERIAL_CONSOLES}"
for entry in $tmp ; do
@@ -24,14 +24,14 @@ do_install() {
ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 
's/\;.*//'`
if [ "$baudrate" = "$default_baudrate" ] ; then
# enable the service
-   ln -sf 
${systemd_unitdir}/system/serial-getty@.service \
+   ln -sf 
${systemd_system_unitdir}/serial-getty@.service \

${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service
else
# install custom service file for the 
non-default baudrate
-   install -m 0644 
${WORKDIR}/serial-getty@.service 
${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
-   sed -i -e s/\@BAUDRATE\@/$baudrate/g 
${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
+   install -m 0644 
${WORKDIR}/serial-getty@.service 
${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
+   sed -i -e s/\@BAUDRATE\@/$baudrate/g 
${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
# enable the service
-   ln -sf 
${systemd_unitdir}/system/serial-getty$baudrate@.service \
+   ln -sf 
${systemd_system_unitdir}/serial-getty$baudrate@.service \

${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service
fi
done
@@ -41,7 +41,7 @@ do_install() {
 RDEPENDS_${PN} = "systemd"
 
 # This is a machine specific file
-FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
+FILES_${PN} = "${systemd_system_unitdir}/*.service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # As this package is tied to systemd, only build it when we're also building 
systemd.
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 10/42] openssh: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb 
b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index 3b5e28a..103f751 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
@@ -114,14 +114,14 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
 
-   install -d ${D}${systemd_unitdir}/system
-   install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
-   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_unitdir}/system
-   install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
+   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_system_unitdir}
+   install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
-e 's,@BINDIR@,${bindir},g' \
-   ${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/*.service
+   ${D}${systemd_system_unitdir}/sshd.socket 
${D}${systemd_system_unitdir}/*.service
 }
 
 do_install_ptest () {
@@ -134,7 +134,7 @@ ALLOW_EMPTY_${PN} = "1"
 PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc 
${PN}-sftp-server"
 FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
-FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd 
${systemd_unitdir}/system"
+FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd 
${systemd_system_unitdir}"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config 
${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd 
${sysconfdir}/pam.d/sshd"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 20/42] util-linux: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc 
b/meta/recipes-core/util-linux/util-linux.inc
index 08ca040..f3c5685 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -54,7 +54,7 @@ PACKAGECONFIG_class-target ?= 
"${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'p
 PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su 
--disable-runuser, libpam,"
 
 # Respect the systemd feature for uuidd
-PACKAGECONFIG[systemd] = "--with-systemd 
--with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd 
--without-systemdsystemunitdir,systemd"
+PACKAGECONFIG[systemd] = "--with-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir}/, --without-systemd 
--without-systemdsystemunitdir,systemd"
 
 # Build setpriv requires libcap-ng
 PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng,"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 16/42] glibc-package: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc 
b/meta/recipes-core/glibc/glibc-package.inc
index bad6424..e2644a9 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -49,7 +49,7 @@ FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
 FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
 FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a 
${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
 FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
-FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd 
${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
+FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd 
${systemd_system_unitdir}/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
   ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd 
${localstatedir}/db/nscd"
 FILES_${PN}-mtrace = "${bindir}/mtrace"
 FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
@@ -117,8 +117,8 @@ do_install_append () {
install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf
sed -i "s%daemon%start-stop-daemon --start --exec%g" 
${D}${sysconfdir}/init.d/nscd
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_system_unitdir}/
 
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', 
d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 14/42] busybox: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/busybox/busybox.inc | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index 5e91a26..bd8c6aa 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -24,7 +24,7 @@ EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 
ARCH=${TARGET_ARCH} CROSS_COMPILE=${
 PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev 
${PN}-hwclock"
 
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* 
${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* 
${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog"
+FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* 
${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* 
${systemd_system_unitdir}/syslog.service ${sysconfdir}/default/busybox-syslog"
 FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf 
${sysconfdir}/mdev/*"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
@@ -294,19 +294,19 @@ do_install () {
 
 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
 if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
-install -d ${D}${systemd_unitdir}/system
+install -d ${D}${systemd_system_unitdir}
 sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-syslog.service.in \
-   > ${D}${systemd_unitdir}/system/busybox-syslog.service
+   > ${D}${systemd_system_unitdir}/busybox-syslog.service
 if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default 
${D}${sysconfdir}/default/busybox-syslog
 fi
-ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
+ln -sf /dev/null ${D}${systemd_system_unitdir}/syslog.service
 fi
 if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
-install -d ${D}${systemd_unitdir}/system
+install -d ${D}${systemd_system_unitdir}
 sed 's,@base_sbindir@,${base_sbindir},g' < 
${WORKDIR}/busybox-klogd.service.in \
-   > ${D}${systemd_unitdir}/system/busybox-klogd.service
+   > ${D}${systemd_system_unitdir}/busybox-klogd.service
 fi
 fi
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 19/42] systemd: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/systemd/systemd_229.bb | 68 
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_229.bb 
b/meta/recipes-core/systemd/systemd_229.bb
index ae88c89..fcb22a3 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -203,7 +203,7 @@ do_install() {
autotools_do_install
install -d ${D}/${base_sbindir}
# Provided by a separate recipe
-   rm ${D}${systemd_unitdir}/system/serial-getty* -f
+   rm ${D}${systemd_system_unitdir}/serial-getty* -f
 
# Provide support for initramfs
[ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
@@ -231,19 +231,19 @@ do_install() {
 # Delete journal README, as log can be symlinked inside volatile.
 rm -f ${D}/${localstatedir}/log/README
 
-   install -d ${D}${systemd_unitdir}/system/graphical.target.wants
-   install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
-   install -d ${D}${systemd_unitdir}/system/poweroff.target.wants
-   install -d ${D}${systemd_unitdir}/system/reboot.target.wants
-   install -d ${D}${systemd_unitdir}/system/rescue.target.wants
+   install -d ${D}${systemd_system_unitdir}/graphical.target.wants
+   install -d ${D}${systemd_system_unitdir}/multi-user.target.wants
+   install -d ${D}${systemd_system_unitdir}/poweroff.target.wants
+   install -d ${D}${systemd_system_unitdir}/reboot.target.wants
+   install -d ${D}${systemd_system_unitdir}/rescue.target.wants
 
# Create symlinks for systemd-update-utmp-runlevel.service
if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; 
then
-   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service
-   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service
-   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service
-   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service
-   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service
+   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_system_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
+   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_system_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
+   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_system_unitdir}/poweroff.target.wants/systemd-update-utmp-runlevel.service
+   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_system_unitdir}/reboot.target.wants/systemd-update-utmp-runlevel.service
+   ln -sf ../systemd-update-utmp-runlevel.service 
${D}${systemd_system_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
fi
 
# Enable journal to forward message to syslog daemon
@@ -318,8 +318,8 @@ FILES_${PN}-ptest += "${libdir}/udev/rules.d"
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup 
\
-  
${systemd_unitdir}/system/systemd-vconsole-setup.service \
-  
${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
+  
${systemd_system_unitdir}/systemd-vconsole-setup.service \
+  
${systemd_system_unitdir}/sysinit.target.wants/systemd-vconsole-setup.service"
 
 RDEPENDS_${PN}-kernel-install += "bash"
 FILES_${PN}-kernel-install = "${bindir}/kernel-install \
@@ -336,8 +336,8 @@ FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions"
 FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
   ${exec_prefix}/lib/binfmt.d \
   ${rootlibexecdir}/systemd/systemd-binfmt \
-  ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \
-  ${systemd_unitdir}/system/systemd-binfmt.service"
+  ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \
+  ${systemd_system_unitdir}/systemd-binfmt.service"
 RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
 
 RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
@@ -355,34 +355,34 @@ FILES_${PN}-extra-utils = "\

[OE-core] [PATCH 08/42] neard: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/neard/neard_0.15.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb 
b/meta/recipes-connectivity/neard/neard_0.15.bb
index 93bddb3..be593fb 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -21,7 +21,7 @@ inherit autotools pkgconfig systemd update-rc.d bluetooth
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)}"
 
-PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_unitdir}/system/ 
--with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir}/ 
--with-systemduserunitdir=${systemd_user_unitdir}/,--disable-systemd"
 
 EXTRA_OECONF += "--enable-tools"
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 15/42] dropbear: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/dropbear/dropbear.inc | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/dropbear/dropbear.inc 
b/meta/recipes-core/dropbear/dropbear.inc
index 1dce2a5..a34125c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -76,14 +76,14 @@ do_install() {
fi
 
# deal with systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dropbearkey.service 
${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dropbear@.service 
${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dropbearkey.service 
${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dropbear@.service 
${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@BINDIR@,${bindir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
-   ${D}${systemd_unitdir}/system/dropbear.socket 
${D}${systemd_unitdir}/system/*.service
+   ${D}${systemd_system_unitdir}/dropbear.socket 
${D}${systemd_system_unitdir}/*.service
 }
 
 inherit update-alternatives
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 12/42] ppp: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb 
b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index 4437b5c..5dab247 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -70,17 +70,17 @@ do_install_append () {
install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts
install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir}
sed -i -e 's,@SBINDIR@,${sbindir},g' \
-  ${D}${systemd_unitdir}/system/ppp@.service
+  ${D}${systemd_system_unitdir}/ppp@.service
rm -rf ${D}/${mandir}/man8/man8
chmod u+s ${D}${sbindir}/pppd
 }
 
 CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets 
${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
 PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn 
${PN}-password ${PN}-l2tp ${PN}-tools"
-FILES_${PN}= "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd 
${systemd_unitdir}/system/ppp@.service"
+FILES_${PN}= "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd 
${systemd_system_unitdir}/ppp@.service"
 FILES_${PN}-oa   = "${libdir}/pppd/${PV}/pppoatm.so"
 FILES_${PN}-oe   = "${sbindir}/pppoe-discovery 
${libdir}/pppd/${PV}/rp-pppoe.so"
 FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so 
${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/42] nfs-utils: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 .../nfs-utils/nfs-utils_1.3.3.bb | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
index a6268f3..c89fe3d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb
@@ -86,11 +86,11 @@ FILES_${PN}-client = "${base_sbindir}/*mount.nfs* 
${sbindir}/*statd \
  ${sysconfdir}/nfs-utils.conf \
  ${sysconfdir}/nfsmount.conf \
  ${sysconfdir}/init.d/nfscommon \
- ${systemd_unitdir}/system/nfs-statd.service"
+ ${systemd_system_unitdir}/nfs-statd.service"
 FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
 RDEPENDS_${PN}-stats = "python"
 
-FILES_${PN} += "${systemd_unitdir}"
+FILES_${PN} += "${systemd_system_unitdir}"
 
 do_configure_prepend() {
 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
@@ -114,19 +114,19 @@ do_install_append () {
install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir}
install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir}
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/nfs-server.service 
${D}${systemd_unitdir}/system/
-   install -m 0644 ${WORKDIR}/nfs-mountd.service 
${D}${systemd_unitdir}/system/
-   install -m 0644 ${WORKDIR}/nfs-statd.service 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/nfs-server.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${WORKDIR}/nfs-mountd.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${WORKDIR}/nfs-statd.service 
${D}${systemd_system_unitdir}/
sed -i -e 's,@SBINDIR@,${sbindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-   ${D}${systemd_unitdir}/system/*.service
+   ${D}${systemd_system_unitdir}/*.service
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
install -d ${D}${sysconfdir}/modules-load.d
echo "nfsd" > ${D}${sysconfdir}/modules-load.d/nfsd.conf
-   install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount 
${D}${systemd_unitdir}/system/
-   install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
-   ln -sf ../proc-fs-nfsd.mount 
${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount
+   install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount 
${D}${systemd_system_unitdir}/
+   install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/
+   ln -sf ../proc-fs-nfsd.mount 
${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount
fi
 
# kernel code as of 3.8 hard-codes this path as a default
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/42] portmap: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/portmap/portmap_6.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb 
b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 999b4a9..e1d3f1e 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -29,7 +29,7 @@ do_install() {
 install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
 oe_runmake install DESTDIR=${D}
 
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
-sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' 
${D}${systemd_unitdir}/system/portmap.service
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_system_unitdir}
+sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' 
${D}${systemd_system_unitdir}/portmap.service
 }
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 13/42] wpa-supplicant: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb 
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb
index 935c8af..16ad53b 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb
@@ -91,8 +91,8 @@ do_install () {
install -m 644 ${S}/wpa_supplicant/dbus/*.service 
${D}/${datadir}/dbus-1/system-services
 
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
-   install -d ${D}/${systemd_unitdir}/system
-   install -m 644 ${S}/wpa_supplicant/systemd/*.service 
${D}/${systemd_unitdir}/system
+   install -d ${D}/${systemd_system_unitdir}
+   install -m 644 ${S}/wpa_supplicant/systemd/*.service 
${D}/${systemd_system_unitdir}
fi
 
install -d ${D}/etc/default/volatiles
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/42] dhcp: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc 
b/meta/recipes-connectivity/dhcp/dhcp.inc
index 9c4233b..c57eb03 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -62,14 +62,14 @@ do_install_append () {
install -m 0755 ${S}/client/scripts/linux 
${D}${base_sbindir}/dhclient-script
 
# Install systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/dhcrelay.service 
${D}${systemd_unitdir}/system
-   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/dhcpd*.service 
${D}${systemd_unitdir}/system/dhcrelay.service
-   sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' 
${D}${systemd_unitdir}/system/dhcpd*.service
-   sed -i -e 's,@base_bindir@,${base_bindir},g' 
${D}${systemd_unitdir}/system/dhcpd*.service
-   sed -i -e 's,@localstatedir@,${localstatedir},g' 
${D}${systemd_unitdir}/system/dhcpd*.service
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/dhcrelay.service 
${D}${systemd_system_unitdir}
+   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_system_unitdir}/dhcpd*.service 
${D}${systemd_system_unitdir}/dhcrelay.service
+   sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' 
${D}${systemd_system_unitdir}/dhcpd*.service
+   sed -i -e 's,@base_bindir@,${base_bindir},g' 
${D}${systemd_system_unitdir}/dhcpd*.service
+   sed -i -e 's,@localstatedir@,${localstatedir},g' 
${D}${systemd_system_unitdir}/dhcpd*.service
 }
 
 PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay 
dhcp-omshell"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/42] bind: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/bind/bind_9.10.3-P3.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb 
b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
index da414c0..d6309f6 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
@@ -83,11 +83,11 @@ do_install_append() {
install -d ${D}${localstatedir}/cache/bind
install -d ${D}${sbindir}
install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/named.service ${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
   -e 's,@SBINDIR@,${sbindir},g' \
-  ${D}${systemd_unitdir}/system/named.service
+  ${D}${systemd_system_unitdir}/named.service
 
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/42] connman: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/connman/connman.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc 
b/meta/recipes-connectivity/connman/connman.inc
index c375251..539df7e 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -43,7 +43,7 @@ PACKAGECONFIG ??= "wispr \
 # local.conf or distro config
 # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
 
-PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ 
--with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' 
--with-tmpfilesdir=''"
+PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/ 
--with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' 
--with-tmpfilesdir=''"
 PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, 
wpa-supplicant"
 PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, 
${BLUEZ}"
 PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
@@ -169,13 +169,13 @@ VPN technogies are implemented using plug-ins."
 FILES_${PN}-vpn += "${sbindir}/connman-vpnd \
 ${sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf \
 ${datadir}/dbus-1/system-services/net.connman.vpn.service \
-${systemd_unitdir}/system/connman-vpn.service"
+${systemd_system_unitdir}/connman-vpn.service"
 
 SUMMARY_${PN}-wait-online = "A program that will return once ConnMan has 
connected to a network"
 DESCRIPTION_${PN}-wait-online = "A service that can be enabled so that \
 the system waits until a network connection is established."
 FILES_${PN}-wait-online += "${sbindir}/connmand-wait-online \
-
${systemd_unitdir}/system/connman-wait-online.service"
+
${systemd_system_unitdir}/connman-wait-online.service"
 
 SUMMARY_${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN"
 DESCRIPTION_${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses 
openvpn client \
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/42] avahi: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc 
b/meta/recipes-connectivity/avahi/avahi.inc
index 81aad79..aaccb75 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -56,7 +56,7 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
 
 # The distro choice determines what init scripts are installed
 EXTRA_OECONF_SYSVINIT = 
"${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
-EXTRA_OECONF_SYSTEMD = 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
+EXTRA_OECONF_SYSTEMD = 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_system_unitdir}/','--without-systemdsystemunitdir',d)}"
 
 AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 01/42] rootfs-postcommands: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/classes/rootfs-postcommands.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/rootfs-postcommands.bbclass 
b/meta/classes/rootfs-postcommands.bbclass
index e184667..d65e639 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -153,8 +153,8 @@ postinst_enable_logging () {
 # Modify systemd default target
 #
 set_systemd_default_target () {
-   if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e 
${IMAGE_ROOTFS}${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ]; then
-   ln -sf ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} 
${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
+   if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e 
${IMAGE_ROOTFS}${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} ]; then
+   ln -sf ${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} 
${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
fi
 }
 
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 00/42] General cleanage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

* These series of patches aim at improving the usage of some systemd related 
variables
  in several recipes from oe-core. Main aim is to change those recipes to use
  'systemd_system_unitdir' instead of the old 'systemd_unitdir/system' variable,
  which will be marked as deprecated instead of being removed as is may still be
  used in other oe layers. To mark it as deprecated, a comment is added in 
bitbake.conf,
  but better ideas regarding this are welcome.

* Few recipes have also been changed to use the 'systemd_user_unitdir' variable 
for
  their systemd user services.

The following changes since commit 4be0e15f74cff85edca9de55248939fb438f30ae:

  oeqa/selftest/recipetool: Fix test_recipetool_create_simple (2016-03-13 
18:15:41 +)

are available in the git repository at:

  git://github.com/pespin/openembedded-core systemd-var-fixes
  https://github.com/pespin/openembedded-core/tree/systemd-var-fixes

Pau Espin Pedrol (42):
  rootfs-postcommands: Fix usage of systemd unitdir vars
  acpid: Fix usage of systemd unitdir vars
  apmd: Fix usage of systemd unitdir vars
  avahi: Fix usage of systemd unitdir vars
  bind: Fix usage of systemd unitdir vars
  connman: Fix usage of systemd unitdir vars
  dhcp: Fix usage of systemd unitdir vars
  neard: Fix usage of systemd unitdir vars
  nfs-utils: Fix usage of systemd unitdir vars
  openssh: Fix usage of systemd unitdir vars
  portmap: Fix usage of systemd unitdir vars
  ppp: Fix usage of systemd unitdir vars
  wpa-supplicant: Fix usage of systemd unitdir vars
  busybox: Fix usage of systemd unitdir vars
  dropbear: Fix usage of systemd unitdir vars
  glibc-package: Fix usage of systemd unitdir vars
  systemd-compat-units: Fix usage of systemd unitdir vars
  systemd-serialgetty: Fix usage of systemd unitdir vars
  systemd: Fix usage of systemd unitdir vars
  util-linux: Fix usage of systemd unitdir vars
  volatile-binds: Fix usage of systemd unitdir vars
  distcc: Fix usage of systemd unitdir vars
  run-postints: Fix usage of systemd unitdir vars
  tcf-agent: Fix usage of systemd unitdir vars
  at: Fix usage of systemd unitdir vars
  cronie: Fix usage of systemd unitdir vars
  lighttpd: Fix usage of systemd unitdir vars
  rpcbind: Fix usage of systemd unitdir vars
  sysstat: Fix usage of systemd unitdir vars
  xinetd: Fix usage of systemd unitdir vars
  xserver-nodm-init: Fix usage of systemd unitdir vars
  oprofileui-server: Fix usage of systemd unitdir vars
  consolekit: Fix usage of systemd unitdir vars
  alsa-utils: Fix usage of systemd unitdir vars
  ofono: Fix usage of systemd unitdir vars
  bluez5: Fix usage of systemd unitdir vars
  avahi-ui: Fix usage of systemd unitdir vars
  opkg: Fix usage of systemd unitdir vars
  dpkg: Fix usage of systemd unitdir vars
  systemd.bbclass: Remove user services too if systemd is not enabled
  systemd: Remove usage of systemd_unitdir
  bitbake.conf: Mark systemd_unitdir as deprecated to avoid future use

 meta/classes/rootfs-postcommands.bbclass   |  4 +-
 meta/classes/systemd.bbclass   | 19 --
 meta/conf/bitbake.conf |  3 +
 meta/recipes-bsp/acpid/acpid.inc   |  6 +-
 meta/recipes-bsp/apmd/apmd_3.2.2-15.bb |  6 +-
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb |  8 +--
 meta/recipes-connectivity/avahi/avahi.inc  |  2 +-
 meta/recipes-connectivity/bind/bind_9.10.3-P3.bb   |  6 +-
 meta/recipes-connectivity/bluez5/bluez5.inc|  4 +-
 meta/recipes-connectivity/connman/connman.inc  |  6 +-
 meta/recipes-connectivity/dhcp/dhcp.inc| 16 ++---
 meta/recipes-connectivity/neard/neard_0.15.bb  |  2 +-
 .../nfs-utils/nfs-utils_1.3.3.bb   | 20 +++---
 meta/recipes-connectivity/ofono/ofono.inc  |  4 +-
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 12 ++--
 meta/recipes-connectivity/portmap/portmap_6.0.bb   |  6 +-
 meta/recipes-connectivity/ppp/ppp_2.4.7.bb |  8 +--
 .../wpa-supplicant/wpa-supplicant_2.5.bb   |  4 +-
 meta/recipes-core/busybox/busybox.inc  | 12 ++--
 meta/recipes-core/dropbear/dropbear.inc| 10 +--
 meta/recipes-core/glibc/glibc-package.inc  |  6 +-
 meta/recipes-core/systemd/systemd-compat-units.bb  |  2 +-
 meta/recipes-core/systemd/systemd-serialgetty.bb   | 16 ++---
 meta/recipes-core/systemd/systemd_229.bb   | 72 +++---
 meta/recipes-core/util-linux/util-linux.inc|  2 +-
 meta/recipes-core/volatile-binds/volatile-binds.bb |  6 +-
 meta/recipes-devtools/distcc/distcc_3.1.bb |  8 +--
 meta/recipes-devtools/dpkg/dpkg.inc|  7 +--
 meta/recipes-devtools/opkg/opkg_0.3.1.bb   |  9 ++-
 .../run-postinsts/run-postinsts_1.0.bb |  6 +-
 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb   |  6 +-
 meta/recipes-extended/at/at_3.1.18.bb  |  6 +-
 meta/recipes-extended/cronie/cronie_1.5.0.bb   |  6 +-
 meta/recipes-extended

[OE-core] [PATCH 03/42] apmd: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb 
b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index 4ff6ad0..e66a553 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
@@ -72,10 +72,10 @@ do_install() {
sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' 
${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd
chmod 755 ${D}${sysconfdir}/init.d/apmd
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-   -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/apmd.service
+   -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_system_unitdir}/apmd.service
 }
 
 PACKAGES =+ "libapm apm"
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/42] acpid: Fix usage of systemd unitdir vars

2016-03-13 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-bsp/acpid/acpid.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 12ec19b..181f448 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -24,7 +24,7 @@ do_install_append () {
install -d ${D}${sysconfdir}/acpi
install -d ${D}${sysconfdir}/acpi/events
 
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_unitdir}/system
-   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/acpid.service
+   install -d ${D}${systemd_system_unitdir}
+   install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_system_unitdir}
+   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_system_unitdir}/acpid.service
 }
-- 
2.7.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] mdadm: Add systemd support

2016-02-04 Thread Pau Espin Pedrol

Please use ${systemd_system_unitdir} instead of ${systemd_unitdir}/system

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2016-02-02 3:22 GMT+01:00 Li Xin <lixin.f...@cn.fujitsu.com>:

> Add mdadm.service to support systemd systems and add configuration
> file.
>
> Signed-off-by: Li Xin <lixin.f...@cn.fujitsu.com>
> ---
>  meta/recipes-extended/mdadm/files/mdadm.service | 13 +
>  meta/recipes-extended/mdadm/mdadm_3.3.4.bb  | 12 +++-
>  2 files changed, 24 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-extended/mdadm/files/mdadm.service
>
> diff --git a/meta/recipes-extended/mdadm/files/mdadm.service
> b/meta/recipes-extended/mdadm/files/mdadm.service
> new file mode 100644
> index 000..3664ceb
> --- /dev/null
> +++ b/meta/recipes-extended/mdadm/files/mdadm.service
> @@ -0,0 +1,13 @@
> +[Unit]
> +Description=Software RAID monitoring and management
> +After=syslog.target
> +ConditionPathExists=@sysconfdir@/mdadm.conf
> +
> +[Service]
> +Type=forking
> +PIDFile=@localstatedir@/run/mdadm/mdadm.pid
> +EnvironmentFile=-@sysconfdir@/sysconfig/mdmonitor
> +ExecStart=@basesbindir@/mdadm --monitor --scan -f
> --pid-file=@localstatedir@/run/mdadm/mdadm.pid
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
> b/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
> index 1198167..e27f384 100644
> --- a/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
> +++ b/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
> @@ -14,13 +14,14 @@ SRC_URI =
> "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
> file://mdadm-3.3.2_x32_abi_time_t.patch \
> file://0001-Fix-typo-in-comparision.patch \
> file://run-ptest \
> +   file://mdadm.service \
>   "
>  SRC_URI[md5sum] = "7ca8b114710f98f53f20c5787b674a09"
>  SRC_URI[sha256sum] =
> "8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68"
>
>  CFLAGS += "-fno-strict-aliasing"
>
> -inherit autotools-brokensep
> +inherit autotools-brokensep systemd
>
>  EXTRA_OEMAKE = "CHECK_RUN_DIR=0"
>  # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's
> asm/types.h
> @@ -38,8 +39,17 @@ do_compile() {
>  do_install() {
> export STRIP=""
> autotools_do_install
> +install -d ${D}/${sysconfdir}/
> +install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/
> +install -d ${D}${systemd_unitdir}/system
> +install -m 644 ${WORKDIR}/mdadm.service
> ${D}${systemd_unitdir}/system/
> +sed -i -e 's,@basesbindir@,${base_sbindir},g' \
> +   -e 's,@localstatedir@,${localstatedir},g' \
> +   -e 's,@sysconfdir@,${sysconfdir},g' \
> +   ${D}${systemd_unitdir}/system/mdadm.service
>  }
>
> +SYSTEMD_SERVICE_${PN} = "mdadm.service"
>  FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
>
>  inherit ptest
> --
> 1.8.4.2
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] iptables: Add systemd support

2016-02-04 Thread Pau Espin Pedrol

Please use ${systemd_system_unitdir} instead of ${systemd_unitdir}/system

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2016-02-02 5:19 GMT+01:00 Li Xin <lixin.f...@cn.fujitsu.com>:

> Add iptables.service & ip6tables.service to support systemd systems.
>
> Signed-off-by: Li Xin <lixin.f...@cn.fujitsu.com>
> ---
>  .../iptables/iptables/ip6tables.service | 17
> +
>  .../recipes-extended/iptables/iptables/iptables.service | 17
> +
>  meta/recipes-extended/iptables/iptables_1.4.21.bb   | 16
> +++-
>  3 files changed, 49 insertions(+), 1 deletion(-)
>  create mode 100644
> meta/recipes-extended/iptables/iptables/ip6tables.service
>  create mode 100644
> meta/recipes-extended/iptables/iptables/iptables.service
>
> diff --git a/meta/recipes-extended/iptables/iptables/ip6tables.service
> b/meta/recipes-extended/iptables/iptables/ip6tables.service
> new file mode 100644
> index 000..148a1b9
> --- /dev/null
> +++ b/meta/recipes-extended/iptables/iptables/ip6tables.service
> @@ -0,0 +1,17 @@
> +[Unit]
> +Description=IPv6 firewall with ip6tables
> +After=syslog.target
> +ConditionPathExists=/etc/default/iptables
> +
> +[Service]
> +Type=oneshot
> +RemainAfterExit=yes
> +ExecStart=/usr/libexec/iptables/ip6tables.init start
> +ExecStop=/usr/libexec/iptables/ip6tables.init stop
> +Environment=BOOTUP=serial
> +Environment=CONSOLETYPE=serial
> +StandardOutput=syslog
> +StandardError=syslog
> +
> +[Install]
> +WantedBy=basic.target
> diff --git a/meta/recipes-extended/iptables/iptables/iptables.service
> b/meta/recipes-extended/iptables/iptables/iptables.service
> new file mode 100644
> index 000..9745c71
> --- /dev/null
> +++ b/meta/recipes-extended/iptables/iptables/iptables.service
> @@ -0,0 +1,17 @@
> +[Unit]
> +Description=IPv4 firewall with iptables
> +After=syslog.target
> +ConditionPathExists=/etc/default/iptables
> +
> +[Service]
> +Type=oneshot
> +RemainAfterExit=yes
> +ExecStart=/usr/libexec/iptables/iptables.init start
> +ExecStop=/usr/libexec/iptables/iptables.init stop
> +Environment=BOOTUP=serial
> +Environment=CONSOLETYPE=serial
> +StandardOutput=syslog
> +StandardError=syslog
> +
> +[Install]
> +WantedBy=basic.target
> diff --git a/meta/recipes-extended/iptables/iptables_1.4.21.bb
> b/meta/recipes-extended/iptables/iptables_1.4.21.bb
> index deea5e5..84c95ea 100644
> --- a/meta/recipes-extended/iptables/iptables_1.4.21.bb
> +++ b/meta/recipes-extended/iptables/iptables_1.4.21.bb
> @@ -24,12 +24,14 @@ SRC_URI = "
> http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
>
> file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
> file://0001-fix-build-with-musl.patch \
>
> file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
> \
> +   file://iptables.service \
> +   file://ip6tables.service \
>"
>
>  SRC_URI[md5sum] = "536d048c8e8eeebcd9757d0863ebb0c0"
>  SRC_URI[sha256sum] =
> "52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0"
>
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig systemd
>
>  EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
> "
> @@ -46,3 +48,15 @@ do_configure_prepend() {
> # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive.
> rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4
> ltversion.m4
>  }
> +
> +do_install_append() {
> +install -d ${D}${systemd_unitdir}/system
> +install -m 0644 ${WORKDIR}/ip6tables.service
> ${D}${systemd_unitdir}/system/
> +install -m 0644 ${WORKDIR}/iptables.service
> ${D}${systemd_unitdir}/system/
> +sed -i -e "s,/usr/libexec/iptables,${libexecdir},g" \
> +   ${D}${systemd_unitdir}/system/iptables.service
> +sed -i -e "s,/usr/libexec/iptables,${libexecdir},g" \
> +   ${D}${systemd_unitdir}/system/ip6tables.service
> +}
> +
> +SYSTEMD_SERVICE_${PN} = "iptables.service ip6tables.service"
> --
> 1.8.4.2
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] [v2] watchdog: enable systemd support

2016-02-02 Thread Pau Espin Pedrol

Hi,
Please could you use ${systemd_system_unitdir} instead of
${systemd_unitdir}/system ?

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2016-01-25 3:48 GMT+01:00 <rongqing...@windriver.com>:

> From: Roy Li <rongqing...@windriver.com>
>
> 1. inherit systemd, and add two unit files which are from Fedora 23
> 2. auto load soft dog kernel module
>
> Signed-off-by: Roy Li <rongqing...@windriver.com>
> ---
>  .../watchdog/watchdog/watchdog-ping.service | 12 
>  .../recipes-extended/watchdog/watchdog/watchdog.service | 12 
>  meta/recipes-extended/watchdog/watchdog_5.14.bb | 17
> -
>  3 files changed, 40 insertions(+), 1 deletion(-)
>  create mode 100644
> meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
>  create mode 100644
> meta/recipes-extended/watchdog/watchdog/watchdog.service
>
> diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
> b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
> new file mode 100644
> index 000..fce6e12
> --- /dev/null
> +++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
> @@ -0,0 +1,12 @@
> +[Unit]
> +Description=watchdog daemon for use with ping test / network dependency
> +After=network.target
> +Conflicts=watchdog.service
> +
> +[Service]
> +Type=forking
> +ExecStart=@SBINDIR@/watchdog
> +ControlGroup=cpu:/
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service
> b/meta/recipes-extended/watchdog/watchdog/watchdog.service
> new file mode 100644
> index 000..f945bc9
> --- /dev/null
> +++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service
> @@ -0,0 +1,12 @@
> +[Unit]
> +Description=watchdog daemon
> +# man systemd.special
> +# auto added After=basic.target
> +
> +[Service]
> +Type=forking
> +ExecStart=@SBINDIR@/watchdog
> +ControlGroup=cpu:/
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb
> b/meta/recipes-extended/watchdog/watchdog_5.14.bb
> index fc717bc..9e21075 100644
> --- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
> +++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
> @@ -14,6 +14,8 @@ SRC_URI =
> "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
>file://watchdog-init.patch \
>file://watchdog-conf.patch \
>
>  file://0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch \
> +  file://watchdog-ping.service \
> +  file://watchdog.service \
>  "
>
>  SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
> @@ -23,7 +25,7 @@ UPSTREAM_CHECK_URI = "
> http://sourceforge.net/projects/watchdog/files/watchdog/;
>  UPSTREAM_CHECK_REGEX = "/watchdog/(?P(\d+[\.\-_]*)+)/"
>
>  inherit autotools
> -inherit update-rc.d
> +inherit update-rc.d systemd
>
>  DEPENDS_append_libc-musl = " libtirpc "
>  CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc "
> @@ -34,6 +36,19 @@ INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ."
>
>  RRECOMMENDS_${PN} = "kernel-module-softdog"
>
> +
> +SYSTEMD_SERVICE_${PN} = "watchdog.service"
> +
>  do_install_append() {
> install -D ${S}/redhat/watchdog.init
> ${D}/${sysconfdir}/init.d/watchdog.sh
> +   install -d ${D}${systemd_unitdir}/system
> +   install -m 0644 ${WORKDIR}/watchdog*.service
> ${D}${systemd_unitdir}/system
> +
> +   if
> ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> +   install -d ${D}${sysconfdir}/modules-load.d
> +   echo "softdog" >
> ${D}${sysconfdir}/modules-load.d/softdog.conf
> +   sed -i -e 's,@SBINDIR@,${sbindir},g'
> ${D}${systemd_unitdir}/system/*.service
> +   fi
>  }
> +
> +FILES_${PN} += "${systemd_unitdir}/system/*"
> --
> 1.9.1
>
> --
> ___
> 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 3/4] lib/oe/rootfs: Use list_pkgs() instead of list()

2016-01-09 Thread Pau Espin Pedrol

Hi,

I don't have the env to test the patch anymore.

However, I have a question on this patch. I inline the comment in the code
here, below the related lines:

2016-01-07 21:07 GMT+01:00 :

> From: Mariano Lopez 
>
> This patch changes the use list_pkgs() instead of list()
> from class RpmPkgsList. The change is in two functions,
> image_list_installed_packages from rootfs.py and
> sdk_list_installed_packages from sdk.py.
>
> With this change the functions calling the functions
> listed above, must format the output as they required.
> The formatting can be done using format_pkg_list() from
> oe.utils.
>
> The classes calling the afected functions are changed too
> with this patch, to keep the same functionality using the
> new data structure.
>
> [YOCTO #7427]
>
> Signed-off-by: Mariano Lopez 
> ---
>  meta/classes/buildhistory.bbclass| 11 +++
>  meta/classes/license.bbclass |  8 ++--
>  meta/classes/populate_sdk_base.bbclass   |  8 ++--
>  meta/classes/rootfs-postcommands.bbclass |  5 +++--
>  meta/lib/oe/package_manager.py   | 18 ++
>  meta/lib/oe/rootfs.py|  8 
>  meta/lib/oe/sdk.py   |  8 
>  7 files changed, 40 insertions(+), 26 deletions(-)
>
> diff --git a/meta/classes/buildhistory.bbclass
> b/meta/classes/buildhistory.bbclass
> index 4153e58..a2f8ac7 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -337,18 +337,21 @@ def write_pkghistory(pkginfo, d):
>  def buildhistory_list_installed(d, rootfs_type="image"):
>  from oe.rootfs import image_list_installed_packages
>  from oe.sdk import sdk_list_installed_packages
> +from oe.utils import format_pkg_list
>
>  process_list = [('file', 'bh_installed_pkgs.txt'),\
>  ('deps', 'bh_installed_pkgs_deps.txt')]
>
> +if rootfs_type == "image":
> +pkgs = image_list_installed_packages(d)
> +else:
> +pkgs = sdk_list_installed_packages(d, rootfs_type == "sdk_target")
> +
>  for output_type, output_file in process_list:
>  output_file_full = os.path.join(d.getVar('WORKDIR', True),
> output_file)
>
>  with open(output_file_full, 'w') as output:
> -if rootfs_type == "image":
> -output.write(image_list_installed_packages(d,
> output_type))
> -else:
> -output.write(sdk_list_installed_packages(d, rootfs_type
> == "sdk_target", output_type))
> +output.write(format_pkg_list(pkgs, output_type))
>
>  python buildhistory_list_installed_image() {
>  buildhistory_list_installed(d)
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index 6651d55..fed42ca 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -21,8 +21,12 @@ python write_package_manifest() {
>  license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}')
>  bb.utils.mkdirhier(license_image_dir)
>  from oe.rootfs import image_list_installed_packages
> +from oe.utils import format_pkg_list
> +
> +pkgs = image_list_installed_packages(d)
> +output = format_pkg_list(pkgs)
>  open(os.path.join(license_image_dir, 'package.manifest'),
> -'w+').write(image_list_installed_packages(d))
> +'w+').write(output)
>  }
>
>  python write_deploy_manifest() {
> @@ -38,7 +42,7 @@ python license_create_manifest() {
>  return 0
>
>  pkg_dic = {}
> -for pkg in image_list_installed_packages(d).splitlines():
> +for pkg in sorted(image_list_installed_packages(d)):
>  pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True),
>  'runtime-reverse', pkg)
>  pkg_name = os.path.basename(os.readlink(pkg_info))
> diff --git a/meta/classes/populate_sdk_base.bbclass
> b/meta/classes/populate_sdk_base.bbclass
> index 23dc115..26e06a5 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -62,20 +62,24 @@ SDK_TARGET_MANIFEST =
> "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"
>  SDK_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"
>  python write_target_sdk_manifest () {
>  from oe.sdk import sdk_list_installed_packages
> +from oe.utils import format_pkg_list
>  sdkmanifestdir = os.path.dirname(d.getVar("SDK_TARGET_MANIFEST",
> True))
> +pkgs = sdk_list_installed_packages(d, True)
>  if not os.path.exists(sdkmanifestdir):
>  bb.utils.mkdirhier(sdkmanifestdir)
>  with open(d.getVar('SDK_TARGET_MANIFEST', True), 'w') as output:
> -output.write(sdk_list_installed_packages(d, True, 'ver'))
> +output.write(format_pkg_list(pkgs, 'ver'))
>  }
>
>  python write_host_sdk_manifest () {
>  from oe.sdk import sdk_list_installed_packages
> +from oe.utils

Re: [OE-core] [PATCH] weston-init: add a native systemd unit file

2015-12-01 Thread Pau Espin Pedrol

Hi,

Better use "${systemd_system_unitdir}" instead of
"${systemd_unitdir}/system".

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2015-11-30 18:41 GMT+01:00 Alexander Kanavin <
alexander.kana...@linux.intel.com>:

> Previously weston was started by systemd via a classic init script
>
> [YOCTO #5582]
>
> Signed-off-by: Alexander Kanavin <alexander.kana...@linux.intel.com>
> ---
>  meta/recipes-graphics/wayland/weston-init.bb | 13
> ++---
>  meta/recipes-graphics/wayland/weston-init/weston.service | 15
> +++
>  2 files changed, 25 insertions(+), 3 deletions(-)
>  create mode 100644
> meta/recipes-graphics/wayland/weston-init/weston.service
>
> diff --git a/meta/recipes-graphics/wayland/weston-init.bb
> b/meta/recipes-graphics/wayland/weston-init.bb
> index fc2e4f8..35fd055 100644
> --- a/meta/recipes-graphics/wayland/weston-init.bb
> +++ b/meta/recipes-graphics/wayland/weston-init.bb
> @@ -1,17 +1,22 @@
> -SUMMARY = "Startup script for the Weston Wayland compositor"
> +SUMMARY = "Startup script and systemd unit file for the Weston Wayland
> compositor"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM =
> "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
>
> -SRC_URI = "file://init"
> +SRC_URI = "file://init \
> +   file://weston.service"
>
>  S = "${WORKDIR}"
>
>  do_install() {
> install -d ${D}/${sysconfdir}/init.d
> install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
> +
> +install -d ${D}${systemd_unitdir}/system
> +install -m0644 ${WORKDIR}/weston.service
> ${D}${systemd_unitdir}/system
>  }
>
> -inherit allarch update-rc.d distro_features_check
> +inherit allarch update-rc.d distro_features_check systemd
> +
>  # rdepends on weston which depends on virtual/egl
>  REQUIRED_DISTRO_FEATURES = "opengl"
>
> @@ -19,3 +24,5 @@ RDEPENDS_${PN} = "weston kbd"
>
>  INITSCRIPT_NAME = "weston"
>  INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +
> +SYSTEMD_SERVICE_${PN} = "weston.service"
> diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service
> b/meta/recipes-graphics/wayland/weston-init/weston.service
> new file mode 100644
> index 000..4f1f7ff
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston-init/weston.service
> @@ -0,0 +1,15 @@
> +[Unit]
> +Description=Weston Wayland compositor startup
> +RequiresMountsFor=/run
> +
> +[Service]
> +User=root
> +EnvironmentFile=-/etc/default/weston
> +Environment="XDG_RUNTIME_DIR=/run/user/root"
> +ExecStartPre=/bin/mkdir -p /run/user/root
> +ExecStartPre=/bin/chmod 0700 /run/user/root
> +ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS
> +
> +[Install]
> +WantedBy=multi-user.target
> +
> --
> 2.6.2
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] weston-init: add a native systemd unit file

2015-12-01 Thread Pau Espin Pedrol

2015-12-01 15:00 GMT+01:00 Alexander Kanavin <
alexander.kana...@linux.intel.com>:

> +   install -d ${D}${systemd_unitdir}/system
> +   install -m0644 ${WORKDIR}/weston.service
> ${D}${systemd_system_unitdir}
>

Sorry to be picky, but you only changed
"systemd_unitdir/system"->"systemd_system_unitdir" in one of the two lines
containing it! ;)

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3 1/2] dbus: add user sessions support

2015-09-15 Thread Pau Espin Pedrol

Hi,

I agree with Tanu. +1 enabling for user-session by default if systemd is
used.

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2015-09-15 13:36 GMT+02:00 Tanu Kaskinen <ta...@iki.fi>:

> On Mon, 2015-09-14 at 12:41 +0200, Andrew Shadura wrote:
> > ---
> >  meta/recipes-core/dbus/dbus_1.10.0.bb | 5 -
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb
> b/meta/recipes-core/dbus/dbus_1.10.0.bb
> > index 31cbef0..e099f4b 100644
> > --- a/meta/recipes-core/dbus/dbus_1.10.0.bb
> > +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
> > @@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
> > ${datadir}/dbus-1/session.conf \
> > ${datadir}/dbus-1/system.d \
> > ${datadir}/dbus-1/system.conf \
> > -   ${systemd_unitdir}/system/"
> > +   ${systemd_system_unitdir} \
> > +   ${systemd_user_unitdir} \
> > +"
> >  FILES_${PN}-lib = "${libdir}/lib*.so.*"
> >  RRECOMMENDS_${PN}-lib = "${PN}"
> >  FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool
> ${bindir}/dbus-test-tool"
> > @@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = ""
> >  PACKAGECONFIG[systemd] =
> "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
> >  PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x
> --disable-x11-autolaunch, virtual/libx11 libsm"
> >  PACKAGECONFIG[apparmor] =
> "--enable-apparmor,--disable-apparmor,libapparmor"
> > +PACKAGECONFIG[user-session] =
> "--enable-user-session,--disable-user-session"
>
> I think user-session should be enabled by default when systemd is in
> DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their
> systemd integration only if dbus is compiled with --enable-user
> -session.
>
> --
> Tanu
> --
> ___
> 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] [oe-core][PATCH v4 2/3] systemd.bbclass: Use systemd_system_unitdir

2015-07-30 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/classes/systemd.bbclass | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index cfe1eb5..46e72c7 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -136,8 +136,7 @@ python systemd_populate_packages() {
 # Check service-files and call systemd_add_files_and_parse for each entry
 def systemd_check_services():
 searchpaths = [oe.path.join(d.getVar(sysconfdir, True), systemd, 
system),]
-searchpaths.append(oe.path.join(d.getVar(nonarch_base_libdir, True), 
systemd, system))
-searchpaths.append(oe.path.join(d.getVar(exec_prefix, True), 
d.getVar(nonarch_base_libdir, True), systemd, system))
+searchpaths.append(d.getVar(systemd_system_unitdir, True))
 systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
 
 keys = 'Also'
@@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
 not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) 
and \
 os.path.exists(sysv_initddir):
-systemd_unitdir = oe.path.join(d.getVar(D, True), 
d.getVar('systemd_unitdir', True), system)
+systemd_system_unitdir = oe.path.join(d.getVar(D, True), 
d.getVar('systemd_system_unitdir', True))
 
-# If systemd_unitdir contains anything, delete sysv_initddir
-if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)):
+# If systemd_system_unitdir contains anything, delete sysv_initddir
+if (os.path.exists(systemd_system_unitdir) and 
os.listdir(systemd_system_unitdir)):
 shutil.rmtree(sysv_initddir)
 }
 do_install[postfuncs] += rm_sysvinit_initddir 
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v4 3/3] pulseaudio: Add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-30 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc 
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 1a9d33a..3389ec9 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -35,7 +35,10 @@ EXTRA_OECONF = \
 PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 
'${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)}
+   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
+   
+
 PACKAGECONFIG[bluez4] = --enable-bluez4,--disable-bluez4,bluez4 sbc
 PACKAGECONFIG[bluez5] = --enable-bluez5,--disable-bluez5,bluez5 sbc
 PACKAGECONFIG[ofono] = 
--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono
@@ -94,7 +97,7 @@ FILES_${PN}-dbg += ${libexecdir}/pulse/.debug \
 FILES_${PN}-dev += ${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala 
${libdir}/cmake   
 FILES_${PN}-conf = ${sysconfdir}
 FILES_${PN}-bin += ${sysconfdir}/default/volatiles/volatiles.04_pulse
-FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules
+FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules ${systemd_user_unitdir}/*
 
 #SYSTEMD_PACKAGES = ${PN}-server
 SYSTEMD_SERVICE_${PN}-server = pulseaudio.service
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v4 1/3] bitbake.conf: Add nonarch_libdir and base systemd vars on it

2015-07-30 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/conf/bitbake.conf | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 730ab80..21f1698 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -32,7 +32,10 @@ export datadir = ${prefix}/share
 export infodir = ${datadir}/info
 export mandir = ${datadir}/man
 export docdir = ${datadir}/doc
-export systemd_unitdir = /lib/systemd
+export systemd_unitdir = ${nonarch_base_libdir}/systemd
+export systemd_system_unitdir = ${nonarch_base_libdir}/systemd/system
+export nonarch_libdir = ${exec_prefix}/lib
+export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
 
 # Architecture dependent paths
 export bindir = ${exec_prefix}/bin
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

2015-07-27 Thread Pau Espin Pedrol

Hi Khem,

This series of patches have as an objective to improve systemd support in
OE, specifically improve support for user services.

If you want more information, you can follow the discussion from last patch
version I sent and also the yocto bug report:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=7801
http://patches.openembedded.org/patch/97291/



Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2015-07-25 3:26 GMT+02:00 Khem Raj raj.k...@gmail.com:

 On Fri, Jul 24, 2015 at 7:02 AM, Pau Espin Pedrol pau.es...@aweurope.be
 wrote:
  Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
  ---
   meta/classes/systemd.bbclass | 9 -
   1 file changed, 4 insertions(+), 5 deletions(-)
 
  diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
  index cfe1eb5..46e72c7 100644
  --- a/meta/classes/systemd.bbclass
  +++ b/meta/classes/systemd.bbclass
  @@ -136,8 +136,7 @@ python systemd_populate_packages() {
   # Check service-files and call systemd_add_files_and_parse for each
 entry
   def systemd_check_services():
   searchpaths = [oe.path.join(d.getVar(sysconfdir, True),
 systemd, system),]
  -searchpaths.append(oe.path.join(d.getVar(nonarch_base_libdir,
 True), systemd, system))
  -searchpaths.append(oe.path.join(d.getVar(exec_prefix, True),
 d.getVar(nonarch_base_libdir, True), systemd, system))
  +searchpaths.append(d.getVar(systemd_system_unitdir, True))
   systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
 
   keys = 'Also'
  @@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
   if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d)
 and \
   not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True,
 False, d) and \
   os.path.exists(sysv_initddir):
  -systemd_unitdir = oe.path.join(d.getVar(D, True),
 d.getVar('systemd_unitdir', True), system)
  +systemd_system_unitdir = oe.path.join(d.getVar(D, True),
 d.getVar('systemd_system_unitdir', True))
 
  -# If systemd_unitdir contains anything, delete sysv_initddir
  -if (os.path.exists(systemd_unitdir) and
 os.listdir(systemd_unitdir)):
  +# If systemd_system_unitdir contains anything, delete
 sysv_initddir
  +if (os.path.exists(systemd_system_unitdir) and
 os.listdir(systemd_system_unitdir)):
   shutil.rmtree(sysv_initddir)
   }
   do_install[postfuncs] += rm_sysvinit_initddir 

 what does this patch solve ?
 --
 ___
 Openembedded-core mailing list
 Openembedded-core@lists.openembedded.org
 http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

2015-07-27 Thread Pau Espin Pedrol

OK Tanu,

I will try to do some tests and prepare new patches during the following
days.

Thanks for reviewing,

Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2015-07-25 9:29 GMT+02:00 Tanu Kaskinen tanu.kaski...@linux.intel.com:

 On Fri, 2015-07-24 at 17:10 +0200, Pau Espin Pedrol wrote:
  Hi,
 
  actually this breaks build of systemd.bb itself, because it installs
  its system recipes using paths from Makefile.am:
  userunitdir=$(prefix)/lib/systemd/user
  systemunitdir=$(rootprefix)/lib/systemd/system
 
  And in the recipe for systemd_219.bb we have:
  # Helper variables to clarify locations.  This mirrors the
  logic in systemd's
  # build system.
  rootprefix ?= ${base_prefix}
  rootlibdir ?= ${base_libdir}
  rootlibexecdir = ${rootprefix}/lib
 
 
  So, that means it installs its own services into /lib, not /usr/lib.
  The changes done in systemd.bbclass in this patch remove the search
  path of /lib, allowing only ${system_system_unitdir} which is
  /usr/lib/systemd/system.
 
 
  I tried changing rootprefix to use ${prefix} but then I get other
  problems:
  ERROR: QA Issue: systemd: Files/directories were installed but
  not shipped
/usr/bin/udevadm
/usr/bin/journalctl
/usr/bin/loginctl
/usr/bin/machinectl
/usr/bin/systemctl
/usr/lib/udev/.debug
/usr/lib/udev/.debug/cdrom_id
/usr/lib/udev/.debug/collect
/usr/lib/udev/.debug/ata_id
/usr/lib/udev/.debug/v4l_id
/usr/lib/udev/.debug/mtd_probe
/usr/lib/udev/.debug/scsi_id
/usr/lib/udev/.debug/accelerometer
/usr/lib/udev/rules.d/70-uaccess.rules
/usr/lib/udev/rules.d/73-seat-late.rules
/usr/lib/udev/rules.d/71-seat.rules
/usr/lib/udev/rules.d/99-systemd.rules
 
 
  Which at the end makes me think... is it really a good idea to set
  systemd_unitdir and system_system_unitdir to use ${nonarch_libdir}?
  I think we should be better using ${nonarch_base_libdir} for those, as
  systemd guys themselves make distinction between both (prefix vs
  rootprefix).

 I agree. ${nonarch_base_libdir} seems to be definitely the right place
 to put system service files. This may change if some day nobody will
 have a separate /usr partition any more (which is what the systemd
 developers are pushing for, AFAIK), but as long as we have to deal with
 systems with a separate /usr partition, I think using /lib is the only
 safe choice.

 --
 Tanu



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

2015-07-24 Thread Pau Espin Pedrol

Hi,

actually this breaks build of systemd.bb itself, because it installs its
system recipes using paths from Makefile.am:

 userunitdir=$(prefix)/lib/systemd/user
 systemunitdir=$(rootprefix)/lib/systemd/system


And in the recipe for systemd_219.bb we have:

 # Helper variables to clarify locations.  This mirrors the logic in
 systemd's
 # build system.
 rootprefix ?= ${base_prefix}
 rootlibdir ?= ${base_libdir}
 rootlibexecdir = ${rootprefix}/lib


So, that means it installs its own services into /lib, not /usr/lib. The
changes done in systemd.bbclass in this patch remove the search path of
/lib, allowing only ${system_system_unitdir} which is
/usr/lib/systemd/system.

I tried changing rootprefix to use ${prefix} but then I get other
problems:

 ERROR: QA Issue: systemd: Files/directories were installed but not shipped
   /usr/bin/udevadm
   /usr/bin/journalctl
   /usr/bin/loginctl
   /usr/bin/machinectl
   /usr/bin/systemctl
   /usr/lib/udev/.debug
   /usr/lib/udev/.debug/cdrom_id
   /usr/lib/udev/.debug/collect
   /usr/lib/udev/.debug/ata_id
   /usr/lib/udev/.debug/v4l_id
   /usr/lib/udev/.debug/mtd_probe
   /usr/lib/udev/.debug/scsi_id
   /usr/lib/udev/.debug/accelerometer
   /usr/lib/udev/rules.d/70-uaccess.rules
   /usr/lib/udev/rules.d/73-seat-late.rules
   /usr/lib/udev/rules.d/71-seat.rules
   /usr/lib/udev/rules.d/99-systemd.rules


Which at the end makes me think... is it really a good idea to set
systemd_unitdir and system_system_unitdir to use ${nonarch_libdir}? I
think we should be better using ${nonarch_base_libdir} for those, as
systemd guys themselves make distinction between both (prefix vs
rootprefix).

Any thoughts on this? I will redo the patches accordingly once I get some
more opinions.



Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net

2015-07-24 16:02 GMT+02:00 Pau Espin Pedrol pau.es...@aweurope.be:

 Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
 ---
  meta/classes/systemd.bbclass | 9 -
  1 file changed, 4 insertions(+), 5 deletions(-)

 diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
 index cfe1eb5..46e72c7 100644
 --- a/meta/classes/systemd.bbclass
 +++ b/meta/classes/systemd.bbclass
 @@ -136,8 +136,7 @@ python systemd_populate_packages() {
  # Check service-files and call systemd_add_files_and_parse for each
 entry
  def systemd_check_services():
  searchpaths = [oe.path.join(d.getVar(sysconfdir, True),
 systemd, system),]
 -searchpaths.append(oe.path.join(d.getVar(nonarch_base_libdir,
 True), systemd, system))
 -searchpaths.append(oe.path.join(d.getVar(exec_prefix, True),
 d.getVar(nonarch_base_libdir, True), systemd, system))
 +searchpaths.append(d.getVar(systemd_system_unitdir, True))
  systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)

  keys = 'Also'
 @@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
  if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d)
 and \
  not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False,
 d) and \
  os.path.exists(sysv_initddir):
 -systemd_unitdir = oe.path.join(d.getVar(D, True),
 d.getVar('systemd_unitdir', True), system)
 +systemd_system_unitdir = oe.path.join(d.getVar(D, True),
 d.getVar('systemd_system_unitdir', True))

 -# If systemd_unitdir contains anything, delete sysv_initddir
 -if (os.path.exists(systemd_unitdir) and
 os.listdir(systemd_unitdir)):
 +# If systemd_system_unitdir contains anything, delete
 sysv_initddir
 +if (os.path.exists(systemd_system_unitdir) and
 os.listdir(systemd_system_unitdir)):
  shutil.rmtree(sysv_initddir)
  }
  do_install[postfuncs] += rm_sysvinit_initddir 
 --
 1.9.1


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v3 1/3] bitbake.conf: Add nonarch_libdir and base systemd vars on it

2015-07-24 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/conf/bitbake.conf | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 730ab80..26c548c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -32,7 +32,10 @@ export datadir = ${prefix}/share
 export infodir = ${datadir}/info
 export mandir = ${datadir}/man
 export docdir = ${datadir}/doc
-export systemd_unitdir = /lib/systemd
+export nonarch_libdir = ${exec_prefix}/lib
+export systemd_unitdir = ${nonarch_libdir}/systemd
+export systemd_system_unitdir = ${nonarch_libdir}/systemd/system
+export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
 
 # Architecture dependent paths
 export bindir = ${exec_prefix}/bin
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

2015-07-24 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/classes/systemd.bbclass | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index cfe1eb5..46e72c7 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -136,8 +136,7 @@ python systemd_populate_packages() {
 # Check service-files and call systemd_add_files_and_parse for each entry
 def systemd_check_services():
 searchpaths = [oe.path.join(d.getVar(sysconfdir, True), systemd, 
system),]
-searchpaths.append(oe.path.join(d.getVar(nonarch_base_libdir, True), 
systemd, system))
-searchpaths.append(oe.path.join(d.getVar(exec_prefix, True), 
d.getVar(nonarch_base_libdir, True), systemd, system))
+searchpaths.append(d.getVar(systemd_system_unitdir, True))
 systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
 
 keys = 'Also'
@@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
 not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) 
and \
 os.path.exists(sysv_initddir):
-systemd_unitdir = oe.path.join(d.getVar(D, True), 
d.getVar('systemd_unitdir', True), system)
+systemd_system_unitdir = oe.path.join(d.getVar(D, True), 
d.getVar('systemd_system_unitdir', True))
 
-# If systemd_unitdir contains anything, delete sysv_initddir
-if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)):
+# If systemd_system_unitdir contains anything, delete sysv_initddir
+if (os.path.exists(systemd_system_unitdir) and 
os.listdir(systemd_system_unitdir)):
 shutil.rmtree(sysv_initddir)
 }
 do_install[postfuncs] += rm_sysvinit_initddir 
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v3 3/3] pulseaudio: Add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-24 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc 
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 1a9d33a..3389ec9 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -35,7 +35,10 @@ EXTRA_OECONF = \
 PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 
'${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)}
+   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
+   
+
 PACKAGECONFIG[bluez4] = --enable-bluez4,--disable-bluez4,bluez4 sbc
 PACKAGECONFIG[bluez5] = --enable-bluez5,--disable-bluez5,bluez5 sbc
 PACKAGECONFIG[ofono] = 
--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono
@@ -94,7 +97,7 @@ FILES_${PN}-dbg += ${libexecdir}/pulse/.debug \
 FILES_${PN}-dev += ${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala 
${libdir}/cmake   
 FILES_${PN}-conf = ${sysconfdir}
 FILES_${PN}-bin += ${sysconfdir}/default/volatiles/volatiles.04_pulse
-FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules
+FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules ${systemd_user_unitdir}/*
 
 #SYSTEMD_PACKAGES = ${PN}-server
 SYSTEMD_SERVICE_${PN}-server = pulseaudio.service
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] pulseaudio: add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-22 Thread Pau Espin Pedrol

Hi,

2015-07-16 20:44 GMT+02:00 Tanu Kaskinen tanu.kaski...@linux.intel.com:
 On Thu, 2015-07-16 at 11:21 -0700, Christopher Larson wrote:

 On Thu, Jul 16, 2015 at 11:13 AM, Tanu Kaskinen
 tanu.kaski...@linux.intel.com wrote:
 On Thu, 2015-07-16 at 07:56 -0700, Christopher Larson wrote:
 
  On Thu, Jul 16, 2015 at 3:19 AM, Tanu Kaskinen
  tanu.kaski...@linux.intel.com wrote:
  On Mon, 2015-07-13 at 09:22 -0700, Christopher
 Larson wrote:
  
   On Mon, Jul 13, 2015 at 9:17 AM, Pau Espin Pedrol
   pespin.s...@gmail.com wrote:
 
   So, pulseaudio is intended to be used as a
 systemd
  user
   service, not
   as a systemd system service, and that
 means it needs
  to end up
   in
   /usr/lib/systemd/user and not
  in /lib/systemd/system/.
  
   All these changes are part of my efforts
 to improve
  systemd
   user
   service support in OE, which is kind of
 bad nowadays
  imho.
  
   Fair enough, thanks for the clarification. Given
 that
  systemd user
   services require pam, and most embedded distros
 disable pam,
  I wonder
   if we shouldn’t have an option, at least for
 daemons in
  recipes that
   can handle it, to switch from user to system via a
  PACKAGECONFIG, and
   possibly default that for the non-pam case.. Hmm.
 
  Do you mean that there are many distros that have
 systemd but
  don't have
  pam, and that the lack of pam strongly suggests that
 the
  system won't
  have any regular users? If so, then your proposal
 sounds good.
 
  No, I mean that systemd user services require pam, as far as
 I know,
  because it’s a systemd pam plugin which actually starts and
 stops the
  user services. Without that hook, they won’t be run at all.


 OK, then it's less clear that services should be run in system
 mode by
 default when pam isn't present. If the lack of pam doesn't
 imply lack of
 regular users, at least pulseaudio should still run as a user
 service by
 default (but not started by systemd if pam isn't enabled).

 Running it as a user service by default when it’ll not actually ever
 be run, lacking a mechanism to run it, seems pretty pointless to me.
 If someone installs pulseaudio, presumably they want it to actually
 run.

 PulseAudio can run as a user service without being a *systemd* user
 service, and that's actually how it's commonly set up. PulseAudio is
 typically started on demand via its own autospawn feature. The autospawn
 feature will be replaced by systemd's socket activation in the future,
 but only on systems that use systemd (and pam).


The autospawning without using systemd is not affected by the
modification done in this patch afaik, because it is not enabling the
systemd user service, only installing the service file.

So, If you agree, I will create a patch for bitbake.conf to

1 - add:
export systemd_system_unitdir = ${nonarch_libdir}/systemd/system
export systemd_user_unitdir = ${nonarch_libdir}/systemd/user

2 - Also change systemd_unitdir to use nonarch_libdir.

3 - Then I will create v3 for this patch using systemd_user_unitdir.
Maybe also modify the recipe a bit to use systemd_system_unitdir for
the system service.


 --
 Tanu


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] pulseaudio: add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-13 Thread Pau Espin Pedrol

Hi,

I am not sure which is the behavior with those paths right now and how
it should be.

I just checked this:
http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Unit%20Load%20Path

So, it seems according to documentation that system services should be
installed under /usr/lib/systemd/system, but currently they are
installed in /lib/systemd/system in my generated image. Is that a
expected behaviour? Shouldn't we try to follow documentation? I see
that sometimes /lib/systemd/system path is appended to the dirs in
systemdsystemunitpath, but it's not stated in the documentation,
that's a bit strange.

For user services, /usr/lib/systemd/user is already being used as
stated in docs.

Now, when multilib comes in, I get lost. If I understand correctly,
with multilib enabled we have too /lib64 and /usr/lib64. Are then
systemd service files suppoused to be installed in /usr/lib/systemd/
or in /usr/lib64/systemd/ ? If I undersood correctly your comment you
meant they should still be going into /usr/lib/systemd right?

Now, talking about bitbake.conf. I see there's already a line with the
following:
export systemd_unitdir = /lib/systemd

So, apart from your nonarch issue, I think it would also be a good
idea to split systemd_unitdir into system and user, as done by
provided pc in systemd (src/core/systemd.pc.in):
1- If still want system services to be in /lib and user services to be
in /usr/lib:
export nonarch_libdir = ${prefix}/lib

export systemd_system_unitdir = ${nonarch_base_libdir}/systemd/system
export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
or
export systemd_system_unitdir = ${nonarch_base_libdir}/systemd
export systemd_user_unitdir = ${nonarch_libdir}/systemd


2- If you want both in /usr/lib:
export nonarch_libdir = ${prefix}/lib

export systemd_system_unitdir = ${nonarch_libdir}/systemd/system
export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
or
export systemd_system_unitdir = ${nonarch_libdir}/systemd
export systemd_user_unitdir = ${nonarch_libdir}/systemd


Pau


2015-07-11 0:36 GMT+02:00 Burton, Ross ross.bur...@intel.com:

 On 10 July 2015 at 15:04, Pau Espin Pedrol pau.es...@aweurope.be wrote:

 +FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-*
 ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules
 ${libdir}/systemd/user/*


 That's going to break in multiarch builds, ie systemd units go into
 $prefix/lib even if $libdir is $prefix/lib64.

 (looks like we should add nonarch_libdir to bitbake.conf to codify this)

 Ross

 --
 ___
 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 v2] pulseaudio: add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-13 Thread Pau Espin Pedrol

2015-07-13 17:51 GMT+02:00 Christopher Larson clar...@kergoth.com:

 On Mon, Jul 13, 2015 at 3:23 AM, Pau Espin Pedrol pespin.s...@gmail.com
 wrote:

 I am not sure which is the behavior with those paths right now and how
 it should be.

 I just checked this:

 http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Unit%20Load%20Path

 So, it seems according to documentation that system services should be
 installed under /usr/lib/systemd/system, but currently they are
 installed in /lib/systemd/system in my generated image. Is that a
 expected behaviour? Shouldn't we try to follow documentation? I see
 that sometimes /lib/systemd/system path is appended to the dirs in
 systemdsystemunitpath, but it's not stated in the documentation,
 that's a bit strange.


 Depends on the distro. Ubuntu, for example, uses /lib/systemd.


 For user services, /usr/lib/systemd/user is already being used as
 stated in docs.

 Now, when multilib comes in, I get lost. If I understand correctly,
 with multilib enabled we have too /lib64 and /usr/lib64. Are then
 systemd service files suppoused to be installed in /usr/lib/systemd/
 or in /usr/lib64/systemd/ ? If I undersood correctly your comment you
 meant they should still be going into /usr/lib/systemd right?


 Yes, we don’t want arch-independent files going into arch-specific dirs.

 Now, talking about bitbake.conf. I see there's already a line with the
 following:
 export systemd_unitdir = /lib/systemd

 So, apart from your nonarch issue, I think it would also be a good
 idea to split systemd_unitdir into system and user, as done by
 provided pc in systemd (src/core/systemd.pc.in):
 1- If still want system services to be in /lib and user services to be
 in /usr/lib:
 export nonarch_libdir = ${prefix}/lib

 export systemd_system_unitdir = ${nonarch_base_libdir}/systemd/system
 export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
 or
 export systemd_system_unitdir = ${nonarch_base_libdir}/systemd
 export systemd_user_unitdir = ${nonarch_libdir}/systemd


 2- If you want both in /usr/lib:
 export nonarch_libdir = ${prefix}/lib

 export systemd_system_unitdir = ${nonarch_libdir}/systemd/system
 export systemd_user_unitdir = ${nonarch_libdir}/systemd/user
 or
 export systemd_system_unitdir = ${nonarch_libdir}/systemd
 export systemd_user_unitdir = ${nonarch_libdir}/systemd


 I don’t really see why one would want some of their service files in one
 libdir and the rest in another. Is there a reason to not just obey
 systemd_unitdir in pulseaudio?

Because they are actually a different type of service files (system vs
user) and they are handled in a different way by systemd. For
instance, if you check the list of paths in which systemd looks for
services, you can see that for system services it actually checks
/lib/systemd/system, but it doesn't for user ones
(/usr/lib/systemd/user):


In systemd, src/shared/path-lookup.c:

/* For the user units we include share/ in the search
 * path in order to comply with the XDG basedir spec.
 * For the system stuff we avoid such nonsense. OTOH
 * we include /lib in the search path for the system
 * stuff but avoid it for user stuff. */

if (running_as == MANAGER_USER) {
if (personal)
unit_path = user_dirs(generator,
generator_early, generator_late);
else
unit_path = strv_new(
/* If you modify this you also
want to modify
 * systemduserunitpath= in
systemd.pc.in, and
 * the arrays in user_dirs() above! */
STRV_IFNOTNULL(generator_early),
USER_CONFIG_UNIT_PATH,
/etc/systemd/user,
/run/systemd/user,
STRV_IFNOTNULL(generator),
/usr/local/lib/systemd/user,
/usr/local/share/systemd/user,
USER_DATA_UNIT_PATH,
/usr/lib/systemd/user,
/usr/share/systemd/user,
STRV_IFNOTNULL(generator_late),
NULL);
} else
unit_path = strv_new(
/* If you modify this you also want to modify
 * systemdsystemunitpath= in systemd.pc.in! */
STRV_IFNOTNULL(generator_early),
SYSTEM_CONFIG_UNIT_PATH,
/etc/systemd/system,
/run/systemd

[OE-core] [PATCH] pulseaudio: add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-10 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc 
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index b309d26..ca33324 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -35,7 +35,9 @@ EXTRA_OECONF = \
 PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 
'${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)}
+   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
+   
 PACKAGECONFIG[bluez4] = --enable-bluez4,--disable-bluez4,bluez4 sbc
 PACKAGECONFIG[bluez5] = --enable-bluez5,--disable-bluez5,bluez5 sbc
 PACKAGECONFIG[ofono] = 
--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] pulseaudio: add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES

2015-07-10 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc 
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index b309d26..5c37413 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -35,7 +35,9 @@ EXTRA_OECONF = \
 PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 
'${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)}
+   ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', 
d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
+   
 PACKAGECONFIG[bluez4] = --enable-bluez4,--disable-bluez4,bluez4 sbc
 PACKAGECONFIG[bluez5] = --enable-bluez5,--disable-bluez5,bluez5 sbc
 PACKAGECONFIG[ofono] = 
--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono
@@ -94,7 +96,7 @@ FILES_${PN}-dbg += ${libexecdir}/pulse/.debug \
 FILES_${PN}-dev += ${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala 
${libdir}/cmake   
 FILES_${PN}-conf = ${sysconfdir}
 FILES_${PN}-bin += ${sysconfdir}/default/volatiles/volatiles.04_pulse
-FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules
+FILES_${PN}-server = ${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} 
${bindir}/pactl */udev/rules.d/*.rules ${libdir}/systemd/user/*
 
 #SYSTEMD_PACKAGES = ${PN}-server
 SYSTEMD_SERVICE_${PN}-server = pulseaudio.service
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH][Daisy] mesa: Avoid leaving empty sysconfdir in mesa package

2015-06-08 Thread Pau Espin Pedrol

Signed-off-by: Pau Espin Pedrol pau.es...@aweurope.be
---
 meta/recipes-graphics/mesa/mesa.inc | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-graphics/mesa/mesa.inc 
b/meta/recipes-graphics/mesa/mesa.inc
index 96313b5..f88b2a4 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -99,6 +99,11 @@ do_install_append () {
 
 # it was packaged in libdricore9.1.3-1 and preventing upgrades when 
debian.bbclass was used 
 rm -f ${D}${sysconfdir}/drirc
+
+# /etc is sometimes left as an empty directory and it ends up into 'mesa' 
package, which is then a non-empty package
+if [ -d ${D}${sysconfdir} ]; then
+rmdir --ignore-fail-on-non-empty ${D}${sysconfdir}
+fi
 }
 
 # For the packages that make up the OpenGL interfaces, inject variables so that
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

74 matches

Mail list logo