[meta-oe][PATCH v4 0/2] systemd: package split

[meta-oe][PATCH v4 0/2] systemd: package split

[Anders Darander]

At least while using rpm-packaging, the systemd package (rpm) got a dependency
on python, as systemd-analyze needs this (in the shebang). When trying to
create a small image using systemd, this isn't always desirable. Thus the
splitting of systemd-analyze to a separate package.


Conditionally RRECOMMENDS kbd and kbd-consolefonts: if the machine in
question do not have keyboards, there is no need for kbd and
kbd-consolefonts. To not make systemd machine dependent, we introduce a
DISTRO_FEATURE keyboard for systems that want kbd* installed.

The first patch should be fine for pulling. 

The 2nd patch needs coordination with other layers, e.g. angstrom, to not
remove the RRECOMMENDS on kbd* from their packages. However, using a positive
DISTRO_FEATURE is more natural, than a negative one, i.e. nokeyboard.

All patches has been verified on a few internal arm-based machines, with a
custom distro.


------------------------------------
v4: * Remove patch for cairo, as cairo is now a bbappend to oe-core version.
      The oe-core version already had the desired functionality.
    * Change the conditionally RRECOMMENDS on kbd* in systemd, to depend 
      on DISTRO_FEATURES instead of MACHINE_FEATURES.

v3: * Set PACKAGE_ARCH for systemd, as its RRECOMMENDS now depends on
    MACHINE_FEATURES. 

v2: * The SRC_URI update has been applied to master.

    * Let systemd-analyze RDEPENDS on python-dbus, and RRECOMMENDS
      python-pycairo. 

    * Add a patch to conditionally enable/disable x11 support when buildling
      cairo. 
    
    * Add patch which makes the systemd's RRECOMMENDS on kbd and
      kbd-consolefonts conditional on the keyboard MACHINE_FEATURES.

The following changes since commit 3767262f9e626c49638dc886adbdf58b167de61c:

  In LICENSE "&&" should be replaced with "&" (2012-01-16 22:29:22 +0100)

are available in the git repository at:
  git://github.com/darander/meta-oe systemd-move
  https://github.com/darander/meta-oe/tree/systemd-move

Anders Darander (2):
  systemd: split out systemd-analyze
  systemd: conditionally RRECOMMENDS kbd*

 meta-oe/recipes-core/systemd/systemd_git.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

-- 
1.7.8.3

[meta-oe][PATCH v4 1/2] systemd: split out systemd-analyze

[Anders Darander]

Split systemd-analyze to a separate package, to remove the implicit
dependency on python. (At least the rpm-packaging backend created a
run-time dependency on python).

Add an RDEPENDS_${PN}-analyze on python-dbus, as this is required for
systemd-analyze to work.

Add an RRECOMMENDS_${PN}-analyze on python-pycairo, as the plot command
in systemd-analyze requires this package.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index bdaaf16..0fa61a7 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r7"
+PR = "r8"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -57,11 +57,15 @@ do_install() {
 	ln -s ${base_bindir}/systemd ${D}/init
 }
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+RDEPENDS_${PN}-analyze = "python-dbus"
+RRECOMMENDS_${PN}-analyze = "python-pycairo"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
-- 
1.7.8.3

Re: [meta-oe][PATCH v4 1/2] systemd: split out systemd-analyze

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, Jan 19, 2012 at 17:53, Anders Darander <anders@chargestorm.se>wrote:

> Split systemd-analyze to a separate package, to remove the implicit
> dependency on python. (At least the rpm-packaging backend created a
> run-time dependency on python).
>
> Add an RDEPENDS_${PN}-analyze on python-dbus, as this is required for
> systemd-analyze to work.
>
> Add an RRECOMMENDS_${PN}-analyze on python-pycairo, as the plot command
> in systemd-analyze requires this package.
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
>  meta-oe/recipes-core/systemd/systemd_git.bb |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-core/systemd/systemd_git.bbb/meta-oe/recipes-core/systemd/
> systemd_git.bb
> index bdaaf16..0fa61a7 100644
> --- a/meta-oe/recipes-core/systemd/systemd_git.bb
> +++ b/meta-oe/recipes-core/systemd/systemd_git.bb
> @@ -14,7 +14,7 @@ inherit gitpkgv
>  PKGV = "v${GITPKGVTAG}"
>
>  PV = "git"
> -PR = "r7"
> +PR = "r8"
>
>  inherit useradd pkgconfig autotools vala perlnative
>
> @@ -57,11 +57,15 @@ do_install() {
>        ln -s ${base_bindir}/systemd ${D}/init
>  }
>
> -PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
> +PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
>
>  USERADD_PACKAGES = "${PN}"
>  GROUPADD_PARAM_${PN} = "-r lock"
>
> +FILES_${PN}-analyze = "${bindir}/systemd-analyze"
> +RDEPENDS_${PN}-analyze = "python-dbus"
> +RRECOMMENDS_${PN}-analyze = "python-pycairo"
> +
>  FILES_${PN}-initramfs = "/init"
>  RDEPENDS_${PN}-initramfs = "${PN}"
>
> --
> 1.7.8.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

[meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Anders Darander]

Let the distro define a keyboard distro feature, to conditionally include
kbd*. (Headless distros might not want to RRECOMMENDS kbd*).

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 0fa61a7..363fb05 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r8"
+PR = "r9"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 # of blacklist support, so use proper modprobe from module-init-tools
 # And pull in the kernel modules mentioned in INSTALL
 # swapon -p is also not supported by busybox
-RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
+RRECOMMENDS_${PN} += "${@base_contains("DISTRO_FEATURES", "keyboard", "kbd kbd-consolefonts", "", d)} \
                       systemd-serialgetty \
                       util-linux-agetty \
                       util-linux-swaponoff \
-- 
1.7.8.3

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 19-01-12 20:53, Anders Darander schreef:
> Let the distro define a keyboard distro feature, to conditionally
> include kbd*. (Headless distros might not want to RRECOMMENDS kbd*).

DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk8Ykz0ACgkQMkyGM64RGpGTVwCeNx5RLmgei+P22TvnVav0FEGI
Z1wAnAolSXV5em2PN1rLn4PKosx0BAsO
=JYUg
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Otavio Salvador]

On Thu, Jan 19, 2012 at 20:03, Koen Kooi <koen@dominion.thruhere.net> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 19-01-12 20:53, Anders Darander schreef:
> > Let the distro define a keyboard distro feature, to conditionally
> > include kbd*. (Headless distros might not want to RRECOMMENDS kbd*).
>
> DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK it.
>

What would be your suggestion for this then? I see no other alternative
then distro feature.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-01-12 04:33, Otavio Salvador schreef:
> On Thu, Jan 19, 2012 at 20:03, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
> 
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> Op 19-01-12 20:53, Anders Darander schreef:
>>> Let the distro define a keyboard distro feature, to conditionally 
>>> include kbd*. (Headless distros might not want to RRECOMMENDS kbd*).
>> 
>> DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK it.
>> 
> 
> What would be your suggestion for this then? I see no other alternative 
> then distro feature.

See what needs kbd and split it out, like we did with vconsole. Actually...
git grep implies that vconsole is the bit that needs kbd :)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk8ZGAoACgkQMkyGM64RGpECJwCgi/yMgovhSMHJQnKmuzJR5xfn
YZQAn2ck7oLsFxPphCh2ijCalBdWcIK+
=BSEa
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Anders Darander]

On Fri, Jan 20, 2012 at 08:30, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 20-01-12 04:33, Otavio Salvador schreef:
>> On Thu, Jan 19, 2012 at 20:03, Koen Kooi <koen@dominion.thruhere.net>
>> wrote:
>>> Op 19-01-12 20:53, Anders Darander schreef:
>>>> Let the distro define a keyboard distro feature, to conditionally
>>>> include kbd*. (Headless distros might not want to RRECOMMENDS kbd*).
>>>
>>> DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK it.
>>>
>>
>> What would be your suggestion for this then? I see no other alternative
>> then distro feature.
>
> See what needs kbd and split it out, like we did with vconsole. Actually...
> git grep implies that vconsole is the bit that needs kbd :)

Ah, so the RRECOMMENDS were never moved to the systemd-vconsole
package when it was split? If that's the only thing depending on kbd,
then sure, I'll get you a new patch moving the RRECOMMENDS on kbd* to
systemd-vconsole. Again, it'll take a few days before I get the time
to do it.

Cheers,
/Anders

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-01-12 09:01, Anders Darander schreef:
> On Fri, Jan 20, 2012 at 08:30, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> Op 20-01-12 04:33, Otavio Salvador schreef:
>>> On Thu, Jan 19, 2012 at 20:03, Koen Kooi
>>> <koen@dominion.thruhere.net> wrote:
>>>> Op 19-01-12 20:53, Anders Darander schreef:
>>>>> Let the distro define a keyboard distro feature, to
>>>>> conditionally include kbd*. (Headless distros might not want to
>>>>> RRECOMMENDS kbd*).
>>>> 
>>>> DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK
>>>> it.
>>>> 
>>> 
>>> What would be your suggestion for this then? I see no other
>>> alternative then distro feature.
>> 
>> See what needs kbd and split it out, like we did with vconsole.
>> Actually... git grep implies that vconsole is the bit that needs kbd
>> :)
> 
> Ah, so the RRECOMMENDS were never moved to the systemd-vconsole package
> when it was split? If that's the only thing depending on kbd, then sure,
> I'll get you a new patch moving the RRECOMMENDS on kbd* to 
> systemd-vconsole. Again, it'll take a few days before I get the time to
> do it.

r10 should fix the issue you were seeing, let me know if it needs other changes.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk8ZUFwACgkQMkyGM64RGpGmJQCeLArWlncBhmKtJuys+uU9wWvc
fBsAnjSVPp59H+xUJmEnc9rxMplHwZoR
=l4IL
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v4 2/2] systemd: conditionally RRECOMMENDS kbd*

[Anders Darander]

On Fri, Jan 20, 2012 at 12:30, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 20-01-12 09:01, Anders Darander schreef:
>> On Fri, Jan 20, 2012 at 08:30, Koen Kooi <koen@dominion.thruhere.net>
>> wrote:
>>> Op 20-01-12 04:33, Otavio Salvador schreef:
>>>> On Thu, Jan 19, 2012 at 20:03, Koen Kooi
>>>> <koen@dominion.thruhere.net> wrote:
>>>>> Op 19-01-12 20:53, Anders Darander schreef:
>>>>>> Let the distro define a keyboard distro feature, to
>>>>>> conditionally include kbd*. (Headless distros might not want to
>>>>>> RRECOMMENDS kbd*).
>>>>>
>>>>> DISTRO_FEATURES is the wrong thing for that, so I'm going to NAK
>>>>> it.
>>>>>
>>>>
>>>> What would be your suggestion for this then? I see no other
>>>> alternative then distro feature.
>>>
>>> See what needs kbd and split it out, like we did with vconsole.
>>> Actually... git grep implies that vconsole is the bit that needs kbd
>>> :)
>>
>> Ah, so the RRECOMMENDS were never moved to the systemd-vconsole package
>> when it was split? If that's the only thing depending on kbd, then sure,
>> I'll get you a new patch moving the RRECOMMENDS on kbd* to
>> systemd-vconsole. Again, it'll take a few days before I get the time to
>> do it.
>
> r10 should fix the issue you were seeing, let me know if it needs other changes.

Thanks!
I haven't tested it (I'll have to wait a few days to do that). But r10
looks fine and should solve the remaining problems.

I'll return with a few more tweaks when I've got a little more time again.

Cheers,
Anders