From patchwork Fri Oct 16 14:50:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 531357 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 923111402B0 for ; Sat, 17 Oct 2015 01:50:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ykeUwG2S; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B359F896D7; Fri, 16 Oct 2015 14:50:29 +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 rqrIMProhAW9; Fri, 16 Oct 2015 14:50:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3014194E8C; Fri, 16 Oct 2015 14:50:29 +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 6B8411CED09 for ; Fri, 16 Oct 2015 14:50:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6633694E8C for ; Fri, 16 Oct 2015 14:50:27 +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 mbb+DekxQgV2 for ; Fri, 16 Oct 2015 14:50:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8C9B1896D7 for ; Fri, 16 Oct 2015 14:50:26 +0000 (UTC) Received: by wicgb1 with SMTP id gb1so12718871wic.1 for ; Fri, 16 Oct 2015 07:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=NGziVx8MpbMsTcobEg/P0KF7h3FHf0/zSzJLs1VcE5w=; b=ykeUwG2S6h63+XZMzS8YplxVZyIg7x0j2PTdwuEJhB9I9WMTzADCP2SrYgPowknrDz j/HFVJWNQAqvvgNdw6DOCkHkP/l3aC3q+FJJEdpCR1fq2ASK0N5X9GaMpCyaV6WOsmcC OidrBJeN2IDplYCCFU8JgFLKHjcFgtxdVX72mKmzSrfIqpFrp0Tb/cLUsGuxkPUUCJZ+ pw9JeEfr82q+Og86i+CitrNg6eO1vPD/KR+ufPDHfADz+EyDCdX8r+KCgaEpAtXwpq8Y XxC9eO2NLOQWlcq5CQCjeMHelcTll43F6gmBVnligVCY0Fb9kWZ7ef0ln4u5OfTWr/m5 XKuA== X-Received: by 10.194.22.69 with SMTP id b5mr17207808wjf.157.1445007022906; Fri, 16 Oct 2015 07:50:22 -0700 (PDT) Received: from dell.be.48ers.dk ([91.183.168.190]) by smtp.gmail.com with ESMTPSA id h8sm3502655wib.21.2015.10.16.07.50.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 07:50:21 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.84) (envelope-from ) id 1Zn6Kq-0006BE-Nb; Fri, 16 Oct 2015 16:50:20 +0200 From: Peter Korsgaard To: buildroot@buildroot.org, yann.morin.1998@free.fr Date: Fri, 16 Oct 2015 16:50:19 +0200 Message-Id: <1445007019-23720-1-git-send-email-peter@korsgaard.com> X-Mailer: git-send-email 2.1.4 Subject: [Buildroot] [PATCH] fs/common.mk: support comments in user table files 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 format of the users table files is non trivial, so it is sometimes handy to add comments explaining the syntax (or simply the reason for the user) inline in the files. Support comment lines prefixed with '#' similar to shell / makedevs files and strip those lines before passing to the mkusers script. Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 528e194..7110bc7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -87,7 +87,7 @@ endif echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) endif ifneq ($$(ROOTFS_USERS_TABLES),) - cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) + sed '/^#/d' $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) endif printf '$$(subst $$(sep),\n,$$(PACKAGES_USERS))' >> $$(USERS_TABLE) PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)