package/rpcbind: use upstream systemd service files
PATCH 1/1 package/rpcbind: use upstream systemd service files
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 <[email protected]>
--- 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
package/rpcbind/rpcbind.mk +2 -8
@@ -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
package/rpcbind/rpcbind.service deleted +0 -10
@@ -1,10 +0,0 @@ -[Unit] -Description=RPC bind service -Requires=rpcbind.socket - -[Service] -Type=forking -ExecStart=/usr/sbin/rpcbind - -[Install] -Also=rpcbind.socket
package/rpcbind/rpcbind.socket deleted +0 -8
@@ -1,8 +0,0 @@ -[Unit] -Description=RPCbind Server Activation Socket - -[Socket] -ListenStream=/var/run/rpcbind.sock - -[Install] -WantedBy=sockets.target
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH 1/1 package/rpcbind: use upstream systemd service files
Quoted 6 lines · On Sun, 11 Jul 2021 22:35:34 -0600 James Hilliard <[email protected]>…
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.
Quoted 8 lines
Signed-off-by James Hilliard <[email protected]>--- 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
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com