deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/rpcbind: use upstream systemd service files

Browse source 
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 <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard 2021-07-11 22:35:34 -06:00 committed by Thomas Petazzoni
parent 7801a85c13
commit f943478807
3 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/rpcbind/rpcbind.mk
View file

@ -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

10
package/rpcbind/rpcbind.service
View file

@ -1,10 +0,0 @@
[Unit]
Description=RPC bind service
Requires=rpcbind.socket
[Service]
Type=forking
ExecStart=/usr/sbin/rpcbind
[Install]
Also=rpcbind.socket

8
package/rpcbind/rpcbind.socket
View file

@ -1,8 +0,0 @@
[Unit]
Description=RPCbind Server Activation Socket
[Socket]
ListenStream=/var/run/rpcbind.sock
[Install]
WantedBy=sockets.target