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

login
register
mail settings
Submitter Anders Darander
Date Jan. 19, 2012, 7:53 p.m.
Message ID <ba787e718994267f09ff11b8b4122d536175bffc.1327002701.git.anders@chargestorm.se>
Download mbox | patch
Permalink /patch/19799/
State Superseded, archived
Headers show

Comments

Anders Darander - Jan. 19, 2012, 7:53 p.m.
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(-)
Koen Kooi - Jan. 19, 2012, 10:03 p.m.
-----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-----
Otavio Salvador - Jan. 20, 2012, 3:33 a.m.
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.
Koen Kooi - Jan. 20, 2012, 7:30 a.m.
-----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-----
Anders Darander - Jan. 20, 2012, 8:01 a.m.
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
Koen Kooi - Jan. 20, 2012, 11:30 a.m.
-----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-----
Anders Darander - Jan. 20, 2012, 12:19 p.m.
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

Patch

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 \