* [PATCH] busybox: conditional inclusion of login utilities
@ 2017-01-26 16:45 David Vincent
2017-01-26 16:55 ` Christopher Larson
0 siblings, 1 reply; 6+ messages in thread
From: David Vincent @ 2017-01-26 16:45 UTC (permalink / raw)
To: openembedded-core
If busybox is not selected as login manager, do not include the fragment
containing the corresponding utilities.
Signed-off-by: David Vincent <freesilicon@gmail.com>
---
meta/recipes-core/busybox/busybox_1.24.1.bb | 2 +-
meta/recipes-core/busybox/busybox_git.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index afb69d13e6..7d994dc10d 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -25,7 +25,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://run-ptest \
file://inetd.conf \
file://inetd \
- file://login-utilities.cfg \
+ ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-RUNTIME_login_manager') == 'busybox')]} \
file://recognize_connmand.patch \
file://busybox-cross-menuconfig.patch \
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index c2ee3e6c4b..4213ef4b1e 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -31,7 +31,7 @@ SRC_URI = "git://busybox.net/busybox.git \
file://run-ptest \
file://inetd.conf \
file://inetd \
- file://login-utilities.cfg \
+ ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-RUNTIME_login_manager') == 'busybox')]} \
file://recognize_connmand.patch \
file://busybox-cross-menuconfig.patch \
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] busybox: conditional inclusion of login utilities
2017-01-26 16:45 [PATCH] busybox: conditional inclusion of login utilities David Vincent
@ 2017-01-26 16:55 ` Christopher Larson
2017-01-27 8:13 ` David Vincent
0 siblings, 1 reply; 6+ messages in thread
From: Christopher Larson @ 2017-01-26 16:55 UTC (permalink / raw)
To: David Vincent; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 862 bytes --]
On Thu, Jan 26, 2017 at 9:45 AM, David Vincent <freesilicon@gmail.com>
wrote:
> diff --git a/meta/recipes-core/busybox/busybox_git.bb
> b/meta/recipes-core/busybox/busybox_git.bb
> index c2ee3e6c4b..4213ef4b1e 100644
> --- a/meta/recipes-core/busybox/busybox_git.bb
> +++ b/meta/recipes-core/busybox/busybox_git.bb
> @@ -31,7 +31,7 @@ SRC_URI = "git://busybox.net/busybox.git \
> file://run-ptest \
> file://inetd.conf \
> file://inetd \
> - file://login-utilities.cfg \
> + ${@["", "file://login-utilities.cfg"][
> (d.getVar('VIRTUAL-RUNTIME_login_manager') == 'busybox')]} \
> file://recognize
>
Question, why not use ${PN} here?
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1789 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] busybox: conditional inclusion of login utilities
@ 2017-03-06 8:31 David Vincent
2017-03-06 12:48 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: David Vincent @ 2017-03-06 8:31 UTC (permalink / raw)
To: openembedded-core
Ping
---------- Forwarded Message ----------
Subject: [PATCH] busybox: conditional inclusion of login utilities
Date: jeudi 26 janvier 2017, 17:45:18 CET
From: David Vincent <freesilicon@gmail.com>
To: openembedded-core@lists.openembedded.org
CC: David Vincent <freesilicon@gmail.com>
If busybox is not selected as login manager, do not include the fragment
containing the corresponding utilities.
Signed-off-by: David Vincent <freesilicon@gmail.com>
---
meta/recipes-core/busybox/busybox_1.24.1.bb | 2 +-
meta/recipes-core/busybox/busybox_git.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/
busybox/busybox_1.24.1.bb
index afb69d13e6..7d994dc10d 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -25,7 +25,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-$
{PV}.tar.bz2;name=tarball \
file://run-ptest \
file://inetd.conf \
file://inetd \
- file://login-utilities.cfg \
+ ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-
RUNTIME_login_manager') == 'busybox')]} \
file://recognize_connmand.patch \
file://busybox-cross-menuconfig.patch \
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-
and.patch \
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/
busybox/busybox_git.bb
index c2ee3e6c4b..4213ef4b1e 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -31,7 +31,7 @@ SRC_URI = "git://busybox.net/busybox.git \
file://run-ptest \
file://inetd.conf \
file://inetd \
- file://login-utilities.cfg \
+ ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-
RUNTIME_login_manager') == 'busybox')]} \
file://recognize_connmand.patch \
file://busybox-cross-menuconfig.patch \
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-
and.patch \
--
2.11.0
-----------------------------------------
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] busybox: conditional inclusion of login utilities
2017-03-06 8:31 David Vincent
@ 2017-03-06 12:48 ` Burton, Ross
2017-03-06 13:32 ` David Vincent
0 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2017-03-06 12:48 UTC (permalink / raw)
To: David Vincent; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
On 6 March 2017 at 08:31, David Vincent <freesilicon@gmail.com> wrote:
> + ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-
> RUNTIME_login_manager') == 'busybox')]} \
>
VIRTUAL_RUNTIME can be set per-image, so you can't do this.
Ross
[-- Attachment #2: Type: text/html, Size: 727 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] busybox: conditional inclusion of login utilities
2017-03-06 12:48 ` Burton, Ross
@ 2017-03-06 13:32 ` David Vincent
0 siblings, 0 replies; 6+ messages in thread
From: David Vincent @ 2017-03-06 13:32 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On lundi 6 mars 2017 13:48:22 CET Burton, Ross wrote:
> On 6 March 2017 at 08:31, David Vincent <freesilicon@gmail.com> wrote:
> > + ${@["", "file://login-utilities.cfg"][(d.getVar('VIRTUAL-
> > RUNTIME_login_manager') == 'busybox')]} \
>
> VIRTUAL_RUNTIME can be set per-image, so you can't do this.
>
> Ross
I just copied the lines already present in the recipe (and I also forgot to
modify the git version on a side note) :
${@[””, "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) ==
'busybox')]} \
${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) ==
'busybox-mdev')]} \
So, what should be the proper way to conditionally include these fragments ?
I don't know for init and dev managers, but for login-utilities, my use case
is that I don't want busybox to provide adduser/addgroup/... if I already have
these provided by another package (e.g. Shadow).
David
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-06 13:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-26 16:45 [PATCH] busybox: conditional inclusion of login utilities David Vincent
2017-01-26 16:55 ` Christopher Larson
2017-01-27 8:13 ` David Vincent
-- strict thread matches above, loose matches on Subject: below --
2017-03-06 8:31 David Vincent
2017-03-06 12:48 ` Burton, Ross
2017-03-06 13:32 ` David Vincent
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox