From patchwork Mon Jul 12 04:35:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1503765 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwD2++tA; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GNWD13tr7z9sWS for ; Mon, 12 Jul 2021 14:35:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 455EF401B1; Mon, 12 Jul 2021 04:35:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w7pKRu-Qt246; Mon, 12 Jul 2021 04:35:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8820E4011A; Mon, 12 Jul 2021 04:35:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 793751BF4D7 for ; Mon, 12 Jul 2021 04:35:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 596DB835C6 for ; Mon, 12 Jul 2021 04:35:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OFg4Sj7HEgez for ; Mon, 12 Jul 2021 04:35:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3A8B783547 for ; Mon, 12 Jul 2021 04:35:38 +0000 (UTC) Received: by mail-ot1-x32a.google.com with SMTP id e1-20020a9d63c10000b02904b8b87ecc43so3660082otl.4 for ; Sun, 11 Jul 2021 21:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EeEevkuCVK+X+B69G9ZW32KN/OzOHsjdm5L/yhplZFM=; b=EwD2++tAQKbF/T0+MxDw/1m82IJIsFfyEBEL3EOr7211+VUqf7cTnMaTzvrP8zDSFa emE7jpasIvJPdkm2Rao3JwFAY34R0zBncirB+CfKmxzX1FvezmIvKzLbL34FdNpf12nt lM09OVL6k728QTou5Td08/R+1jxlHp7dgDGuW5eZyl+ctxymuDKbDETUj6lTPe9qJYid RDu8yYpOhTOhVP/04ci6HutSVylmu1wStLoC4d4nDhT1/TkEfn9Qe/7lgv6Xxb9NhMdY Q5LermoglgUcFbYTb06YOd7VrQQErWhnLMFGCFiYjWcLP0GaWT/GHQInJkBAh0DYKBoS wQPg== 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:mime-version :content-transfer-encoding; bh=EeEevkuCVK+X+B69G9ZW32KN/OzOHsjdm5L/yhplZFM=; b=NiykFGBSKWFGao2l50vvSWlpdmIPqDeC8M9V/dobUFsf5xpuL9d8MCKJESSJSmQ3Wl XI7babxrwi8WeM4mrsfH/FDrK3zisJcLbixbi/ZS9W/iHpcsknVqiPBAe2eM5wB0qYs6 zbzhWBBWAq83D37bidbXLUjFjsdB39zgvrFoUG3ns2nISjvqmLBKhbev6zpD4sxlbl3C XGtOObZymZIoGzpxeiQkKDlR8B1Q0GUCuZYKIl+PtbDpm72GYA1lnh2jtibnyKCkHFwi rvUDpGjQfn4ZQqqkwFHRsLqEHKVpBGodE8tDxYukuGaRuczwh+zeL1UxyynIGhvmN0f2 IrQQ== X-Gm-Message-State: AOAM532ypZH2gioUdJOxVUDi0mQeBL+6y9VRVXRpBNgiK8TWlcEBGu1w GHotRxxNwBvi/vIrLnoe6YSD+YjGOG0= X-Google-Smtp-Source: ABdhPJwAvf0MxliPNKBFUoZzc/d3RTj3CXkSsdAiMCGakk8eRTp0gsJiDw2Humkhc3N9Dycg/GYskw== X-Received: by 2002:a05:6830:18d1:: with SMTP id v17mr34992006ote.111.1626064537030; Sun, 11 Jul 2021 21:35:37 -0700 (PDT) Received: from james-x399.localdomain (97-118-178-184.hlrn.qwest.net. [97.118.178.184]) by smtp.gmail.com with ESMTPSA id w19sm1494140ooj.39.2021.07.11.21.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 21:35:36 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 11 Jul 2021 22:35:34 -0600 Message-Id: <20210712043534.3849257-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/rpcbind: use upstream systemd service files 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: James Hilliard , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The overriden service files appear to have compatibility issues with upstream rpcbind, don't replace the bundled service files. We need to build with --enable-warmstarts as this is required by the systemd service files. Signed-off-by: James Hilliard --- package/rpcbind/rpcbind.mk | 10 ++-------- package/rpcbind/rpcbind.service | 10 ---------- package/rpcbind/rpcbind.socket | 8 -------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 package/rpcbind/rpcbind.service delete mode 100644 package/rpcbind/rpcbind.socket diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index d9f25e698e..725075f962 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -17,19 +17,13 @@ RPCBIND_DEPENDENCIES += libtirpc host-pkgconf RPCBIND_CONF_OPTS += --with-rpcuser=root ifeq ($(BR2_INIT_SYSTEMD),y) -RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +RPCBIND_CONF_OPTS += --enable-warmstarts \ + --with-systemdsystemunitdir=/usr/lib/systemd/system RPCBIND_DEPENDENCIES += systemd else RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no endif -define RPCBIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service - $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket -endef - define RPCBIND_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \ $(TARGET_DIR)/etc/init.d/S30rpcbind diff --git a/package/rpcbind/rpcbind.service b/package/rpcbind/rpcbind.service deleted file mode 100644 index e41931df4a..0000000000 --- a/package/rpcbind/rpcbind.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=RPC bind service -Requires=rpcbind.socket - -[Service] -Type=forking -ExecStart=/usr/sbin/rpcbind - -[Install] -Also=rpcbind.socket diff --git a/package/rpcbind/rpcbind.socket b/package/rpcbind/rpcbind.socket deleted file mode 100644 index d63c1d9720..0000000000 --- a/package/rpcbind/rpcbind.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPCbind Server Activation Socket - -[Socket] -ListenStream=/var/run/rpcbind.sock - -[Install] -WantedBy=sockets.target