From patchwork Wed Apr 24 09:33:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1090026 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="IuYe0Qf7"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44pw9t25BLz9s55 for ; Wed, 24 Apr 2019 19:33:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4BBF086DEB; Wed, 24 Apr 2019 09:33:52 +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 04uMQ4qxH6BY; Wed, 24 Apr 2019 09:33:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B3A486D36; Wed, 24 Apr 2019 09:33:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 135321BF616 for ; Wed, 24 Apr 2019 09:33:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EEC585CDC for ; Wed, 24 Apr 2019 09:33:49 +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 M0vC9+f6PXdN for ; Wed, 24 Apr 2019 09:33:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id E76A086D36 for ; Wed, 24 Apr 2019 09:33:46 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id z6so4164454wmi.0 for ; Wed, 24 Apr 2019 02:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=DXhHP2bonPg4UNkol8x7Z6qhcH8bfcqc6KLhTORLkNY=; b=IuYe0Qf7x3k+uNmQkXyftL0YZgtXDeQ7xhTnzMrIbXp+rhXPz27h0+0EYgBSSX4Pb8 zjtpo0IIzObhK9Am8hVyEY3bo+4FzRZhsWAJ3CYG8px3Sc9yDCN61S0InWYbovVDHR4p GwvcVTMHltP5k4jtyTQK1RAsTTH9+LgOmKkQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DXhHP2bonPg4UNkol8x7Z6qhcH8bfcqc6KLhTORLkNY=; b=mEgR5uoXrURpoKAnrzbLzK8nv9Sd3X9n82OQOo9jiUTjHN/fF6e5o2w0rNiHyXPZZz 5Sud2GhwtEHSfNeGRPqhzZue5df3za9HzSmwNxSgc500R9/0yYml9hajT8efQPEkhPpG RKN7PBLOurbC3CLqQXNism4IhZKuMxqCLSuZWgBGQqYA09pOJGT5HeSrp4Ezd9eR8qp+ lU1qs6fBuhbaVbI249ylwsclKfJP81J/hmj8uTQwjBWZ2IOZoqFiAiqG+kZ1CtDb7dUe jydA8/oankeNVfayicjaIzZARl+vhOBmmZypm+QZOUJyotifMmYUoSPHA0Z9nkN/DXn4 cQ1A== X-Gm-Message-State: APjAAAVrICHT77uRkjb2uIWOAaO3SGYkAJSXu2BGkWk/97Il1VCej342 xUF0IQvTrSCsuORTjHl+CDHxGE0x4/J2Uw== X-Google-Smtp-Source: APXvYqx5CorVja7550drWqmcUxCvtiCI4DypJcQ0y3mbCRky0FLw+8kegAe46FDIWt3aSQRbe4TIag== X-Received: by 2002:a05:600c:d4:: with SMTP id u20mr6025308wmm.88.1556098424830; Wed, 24 Apr 2019 02:33:44 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id x192sm28358373wmf.48.2019.04.24.02.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Apr 2019 02:33:43 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Apr 2019 11:33:34 +0200 Message-Id: <1556098414-13394-1-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v3] package/nfs-utils: making nfs server optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch makes nfs server component optional. This is useful when only client tools are used and the full nfs server is not needed. Signed-off-by: Angelo Compagnucci Reviewed-by: Matthew Weber --- v1->v2: Fixing minor formatting nitpick. v2->v3: fixing systemd stuff as suggested by Thomas package/nfs-utils/Config.in | 6 ++++++ package/nfs-utils/nfs-utils.mk | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index 055b711..04ea4db 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -25,6 +25,12 @@ config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD help NFS lock manager for Linux kernels older than 2.4 +config BR2_PACKAGE_NFS_UTILS_RPC_NFSD + bool "rpc.nfsd" + default y + help + NFS server + config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD bool "rpc.rquotad" help diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 9fa7ae2..188d7f4 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -41,6 +41,8 @@ HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad +NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service ifeq ($(BR2_PACKAGE_LIBCAP),y) NFS_UTILS_CONF_OPTS += --enable-caps @@ -57,7 +59,7 @@ NFS_UTILS_CONF_OPTS += --disable-tirpc endif define NFS_UTILS_INSTALL_FIXUP - rm -f $(NFS_UTILS_TARGETS_) + cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports $(INSTALL) -D -m 644 \ $(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf @@ -71,16 +73,20 @@ else NFS_UTILS_CONF_OPTS += --without-systemd endif +ifeq ($(BR2_PACKAGE_NFS_UTILS_RPC_NFSD),y) define NFS_UTILS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/nfs-utils/S60nfs \ $(TARGET_DIR)/etc/init.d/S60nfs endef +endif define NFS_UTILS_INSTALL_INIT_SYSTEMD mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + $(if $(BR2_PACKAGE_NFS_UTILS_RPC_NFSD), \ ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service,) + ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target