From patchwork Tue Jul 21 15:36:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 498275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 1675214028E for ; Wed, 22 Jul 2015 01:36:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4556594437; Tue, 21 Jul 2015 15:36:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L52OVz0t8b0s; Tue, 21 Jul 2015 15:36:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 48CE1943D9; Tue, 21 Jul 2015 15:36:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2A4171C15EF for ; Tue, 21 Jul 2015 15:36:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 26890943D9 for ; Tue, 21 Jul 2015 15:36:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i1OuMm55Q0yo for ; Tue, 21 Jul 2015 15:36:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by hemlock.osuosl.org (Postfix) with ESMTP id F11C38AFC0 for ; Tue, 21 Jul 2015 15:36:16 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 19BBA243F; Tue, 21 Jul 2015 17:36:21 +0200 (CEST) Received: from localhost (ip-152.net-81-220-60.lyon.rev.numericable.fr [81.220.60.152]) by mail.free-electrons.com (Postfix) with ESMTPSA id D61641F41; Tue, 21 Jul 2015 17:36:20 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 21 Jul 2015 17:36:07 +0200 Message-Id: <1437492967-6594-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.4.6 Cc: Thomas Petazzoni , "Yann E. MORIN" , Auke Willem Oosterhoff Subject: [Buildroot] [PATCH] fs: build host-mkpasswd when BR2_ROOTFS_USERS_TABLES is used X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The code in fs/common.mk properly triggers the build of host-mkpasswd when at least one package specifies a _USERS variable. However, when no selected package specifies a _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 Cc: Auke Willem Oosterhoff Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni Acked-by: "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