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

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

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pau.espin@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

[PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pau.espin@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

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

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pau.espin@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

Re: [PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Pau Espin Pedrol]

[-- Attachment #1: Type: text/plain, Size: 4013 bytes --]

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.shar@gmail.com
http://blog.espeweb.net

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

> Signed-off-by: Pau Espin Pedrol <pau.espin@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
>
>

[-- Attachment #2: Type: text/html, Size: 5540 bytes --]

Re: [PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Khem Raj]

On Fri, Jul 24, 2015 at 7:02 AM, Pau Espin Pedrol <pau.espin@aweurope.be> wrote:
> Signed-off-by: Pau Espin Pedrol <pau.espin@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 ?

Re: [PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Tanu Kaskinen]

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

Re: [PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Pau Espin Pedrol]

[-- Attachment #1: Type: text/plain, Size: 2905 bytes --]

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.shar@gmail.com
http://blog.espeweb.net

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

> On Fri, Jul 24, 2015 at 7:02 AM, Pau Espin Pedrol <pau.espin@aweurope.be>
> wrote:
> > Signed-off-by: Pau Espin Pedrol <pau.espin@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
>

[-- Attachment #2: Type: text/html, Size: 4358 bytes --]

Re: [PATCH v3 2/3] systemd.bbclass: Use systemd_system_unitdir

[Pau Espin Pedrol]

[-- Attachment #1: Type: text/plain, Size: 2841 bytes --]

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.shar@gmail.com
http://blog.espeweb.net

2015-07-25 9:29 GMT+02:00 Tanu Kaskinen <tanu.kaskinen@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
>
>
>

[-- Attachment #2: Type: text/html, Size: 4117 bytes --]