Patchwork [meta-oe,v2,3/3] systemd: conditionally RRECOMMENDS kbd*

login
register
mail settings
Submitter Anders Darander
Date Jan. 10, 2012, 9 a.m.
Message ID <6382f565655efb9aec552453275832a351bc7467.1326185831.git.anders@chargestorm.se>
Download mbox | patch
Permalink /patch/18897/
State Superseded
Headers show

Comments

Anders Darander - Jan. 10, 2012, 9 a.m.
If the machine lacks keyboard support, there is no need for kbd*-packages.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Otavio Salvador - Jan. 10, 2012, 11:19 a.m.
NACK!

If you use MACHINE_FEATURES it needs to set PACKAGE_ARCH to machine too.

On Tue, Jan 10, 2012 at 07:00, Anders Darander <anders@chargestorm.se>wrote:

> If the machine lacks keyboard support, there is no need for kbd*-packages.
>
> 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.bbb/meta-oe/recipes-core/systemd/
> systemd_git.bb
> index 0fa61a7..7af8357 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("MACHINE_FEATURES", "keyboard",
> "kbd kbd-consolefonts", "", d)} \
>                       systemd-serialgetty \
>                       util-linux-agetty \
>                       util-linux-swaponoff \
> --
> 1.7.8.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Anders Darander - Jan. 10, 2012, 11:50 a.m.
* Otavio Salvador <otavio@ossystems.com.br> [120110 12:20]:

> NACK!

> If you use MACHINE_FEATURES it needs to set PACKAGE_ARCH to machine too.

Thanks for noticing!

I've just submitted a v3, hopefully I've set the PACKAGE_ARCH in a
correct way. (I tried to grep through meta-oe to see how PACKAGE_ARCH is
set).

Please, let me know if I should have set PACKAGE_ARCH to something else,
or in some other way.

Cheers,
Anders

> On Tue, Jan 10, 2012 at 07:00, Anders Darander <anders@chargestorm.se>wrote:

> > If the machine lacks keyboard support, there is no need for kbd*-packages.

> > 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.bbb/meta-oe/recipes-core/systemd/
> > systemd_git.bb
> > index 0fa61a7..7af8357 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("MACHINE_FEATURES", "keyboard",
> > "kbd kbd-consolefonts", "", d)} \
> >                       systemd-serialgetty \
> >                       util-linux-agetty \
> >                       util-linux-swaponoff \

Patch

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 0fa61a7..7af8357 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("MACHINE_FEATURES", "keyboard", "kbd kbd-consolefonts", "", d)} \
                       systemd-serialgetty \
                       util-linux-agetty \
                       util-linux-swaponoff \