From patchwork Wed Jan 22 20:59:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 313416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D23CB2C00A8 for ; Thu, 23 Jan 2014 08:00:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0BA268BCE3; Wed, 22 Jan 2014 21:00:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YvD5x37PEekC; Wed, 22 Jan 2014 21:00:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C2A68BCE0; Wed, 22 Jan 2014 21:00:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0EA1D1CE8C7 for ; Wed, 22 Jan 2014 21:00:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D4E88B62D for ; Wed, 22 Jan 2014 21:00:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d590fnXF4u3z for ; Wed, 22 Jan 2014 21:00:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9C8D38B3E0 for ; Wed, 22 Jan 2014 21:00:04 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id w62so489637wes.41 for ; Wed, 22 Jan 2014 13:00:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MRkuefJRxNQYx3Cf2V42NM6e4gj84pdpeDrs7KjfoDs=; b=Vg0RP2mo1HsXk3hBj/8KPzMOxm9C75DkXoFCf7aeip4b/TDpIlvhmtN7qJUAUATYu9 i8ijBMSXPyaVWwU1WNM9mcuT3CY709N+3cJGPU/Zx8Q1RaVcdZdGRSVua0tEf2awI6gs dUanpFCrSZYuWU4J2WY75q0zOT8T3UX46zoHGMmw9buJxdx9TLIMzOD0rKM/Ir7hOm9Y 1uailI7fwVt1OQWlXamUIps4NOO+OP13L3dLOGXBWNoTI3lgHni/RRT2hvTOoeVBxc5m rabvMWLPP1ib3RJIV44SXj3GwTLVDwMcvCYS7MC6DbQVhdRe18XTkKar/PxrnBticB4H w29Q== X-Received: by 10.180.187.16 with SMTP id fo16mr14096862wic.26.1390424403239; Wed, 22 Jan 2014 13:00:03 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id p1sm21914210wie.1.2014.01.22.13.00.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jan 2014 13:00:02 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Wed, 22 Jan 2014 21:59:41 +0100 Message-Id: <1390424381-6889-5-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390424381-6889-1-git-send-email-s.martin49@gmail.com> References: <1390424381-6889-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v2 5/5] fs/common.mk: add host-mkpasswd if PACKAGES_USERS is not empty X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net When using a custom rootfs skeleton, the host-mkpasswd target is not automatically built, even if some packages add usersi (i.e. when PACKAGES_USERS is not empty). In this case, the rootfs generation may fail because the mkpasswd provided by some distribution does not support all options used in the mkusers script. This patch avoids such a trouble by automatically adding the host-mkpasswd package to the dependency list of the rootfs targets. Signed-off-by: Samuel Martin --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index aa9d961..9f32620 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -37,7 +37,8 @@ USERS_TABLE = $(BUILD_DIR)/_users_table.txt define ROOTFS_TARGET_INTERNAL # extra deps -ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs +ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ + $(if $(PACKAGES_USERS),host-mkpasswd) ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz