From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] fs: build host-mkpasswd when BR2_ROOTFS_USERS_TABLES is used
Date: Tue, 21 Jul 2015 18:45:57 +0200 [thread overview]
Message-ID: <20150721164557.GA4831@free.fr> (raw)
In-Reply-To: <1437492967-6594-1-git-send-email-thomas.petazzoni@free-electrons.com>
Thomas, All,
On 2015-07-21 17:36 +0200, Thomas Petazzoni spake thusly:
> The code in fs/common.mk properly triggers the build of host-mkpasswd
> when at least one package specifies a <pkg>_USERS variable. However,
> when no selected package specifies a <pkg>_USERS variable but the user
> uses a custom users table through BR2_ROOTFS_USERS_TABLES, then we
> forget to build host-mkpasswd, leading to build failures if you don't
> have mkpasswd installed in your machine.
>
> This commit fixes that by taking into account both the package users
> table and the custom users table when deciding to depend or not on
> host-mkpasswd.
>
> Reported-by: Auke Willem Oosterhoff <oosterhoff@baopt.nl>
> Cc: Auke Willem Oosterhoff <oosterhoff@baopt.nl>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> fs/common.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/common.mk b/fs/common.mk
> index 4387d06..ad1bcf3 100644
> --- a/fs/common.mk
> +++ b/fs/common.mk
> @@ -41,7 +41,7 @@ define ROOTFS_TARGET_INTERNAL
>
> # extra deps
> ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \
> - $$(if $$(PACKAGES_USERS),host-mkpasswd)
> + $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd)
>
> ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
> ROOTFS_$(2)_COMPRESS_EXT = .gz
> --
> 2.4.6
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2015-07-21 16:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 15:36 [Buildroot] [PATCH] fs: build host-mkpasswd when BR2_ROOTFS_USERS_TABLES is used Thomas Petazzoni
2015-07-21 16:45 ` Yann E. MORIN [this message]
2015-07-21 21:17 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150721164557.GA4831@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox