aboutsummaryrefslogtreecommitdiff
path: root/fs/common.mk
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-21 17:36:07 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-21 23:12:52 +0200
commit95bd0ad351fe03450f28699f80434539f3764438 (patch)
tree977a0b04b011920d1b6b480b9a17d1be105185a9 /fs/common.mk
parent2d84e1cc4aa7c552e310f3d44f7a557bc5fe8f8f (diff)
downloadbuildroot-95bd0ad351fe03450f28699f80434539f3764438.tar.gz
buildroot-95bd0ad351fe03450f28699f80434539f3764438.tar.bz2
fs: build host-mkpasswd when BR2_ROOTFS_USERS_TABLES is used
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>
Diffstat (limited to 'fs/common.mk')
-rw-r--r--fs/common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/common.mk b/fs/common.mk
index 4387d069a1..ad1bcf3034 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