NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: rely on systemctl preset-all for upstream-provided services

Browse Source 
All these packages have an upstream-provided service, but buildroot
enabled manually the services in exactly the same way as the [Install]
section.

This is not needed anymore

Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
[yann.morin.1998@free.fr: fix check-package errors]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Jérémy Rosen 2019-12-16 11:30:44 +01:00 committed by Yann E. MORIN
parent 3e092163e5
commit 1640fca208
23 changed files with 0 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/audit/audit.mk
View File

@ -44,10 +44,6 @@ define AUDIT_INSTALL_INIT_SYSV
endef
define AUDIT_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/auditd.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service
$(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \
$(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf
endef

8
package/avahi/avahi.mk
View File

@ -198,14 +198,6 @@ endef
endif
define AVAHI_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/avahi-daemon.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service
ln -fs ../../../../usr/lib/systemd/system/avahi-dnsconfd.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
$(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \
$(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf

8
package/bluez5_utils/bluez5_utils.mk
View File

@ -118,12 +118,4 @@ else
BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
endif
define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
$(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
ln -fs ../../../usr/lib/systemd/system/bluetooth.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
endef
$(eval $(autotools-package))

6
package/boinc/boinc.mk
View File

@ -53,10 +53,4 @@ define BOINC_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S99boinc-client
endef
define BOINC_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/boinc-client.service
endef
$(eval $(autotools-package))

3
package/docker-engine/docker-engine.mk
View File

@ -68,9 +68,6 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
$(TARGET_DIR)/usr/lib/systemd/system/docker.service
$(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \
$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
ln -fs ../../../../usr/lib/systemd/system/docker.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service
endef
define DOCKER_ENGINE_INSTALL_INIT_SYSV

3
package/fail2ban/fail2ban.mk
View File

@ -25,9 +25,6 @@ endef
define FAIL2BAN_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/files/fail2ban.service.in \
$(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib//systemd/system/fail2ban.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/fail2ban.service
$(SED) 's,@BINDIR@,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service
$(SED) '/^PIDFile/c\PIDFile=/run/fail2ban.pid' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service
endef

7
package/gerbera/gerbera.mk
View File

@ -104,11 +104,4 @@ define GERBERA_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S99gerbera
endef
# gerbera.service is installed by cmake in $(TARGET_DIR)/usr/lib/systemd/system
define GERBERA_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/gerbera.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/gerbera.service
endef
$(eval $(cmake-package))

16
package/iputils/iputils.mk
View File

@ -62,11 +62,6 @@ ifeq ($(IPUTILS_NINFOD),n)
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
else
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
define IPUTILS_INSTALL_SERVICE_NINFOD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../lib/systemd/system/ninfod.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
endef
endif
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
@ -118,15 +113,4 @@ define IPUTILS_PERMISSIONS
endef
endif
define IPUTILS_INSTALL_SERVICE_RDISC
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../lib/systemd/system/rdisc.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service
endef
define IPUTILS_INSTALL_INIT_SYSTEMD
$(IPUTILS_INSTALL_SERVICE_NINFOD)
$(IPUTILS_INSTALL_SERVICE_RDISC)
endef
$(eval $(meson-package))

6
package/lighttpd/lighttpd.mk
View File

@ -99,12 +99,6 @@ endef
define LIGHTTPD_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \
$(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service
$(INSTALL) -D -m 644 package/lighttpd/lighttpd_tmpfiles.conf \
$(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf
endef

6
package/lldpd/lldpd.mk
View File

@ -65,10 +65,4 @@ define LLDPD_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S60lldpd
endef
define LLDPD_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/lldpd.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lldpd.service
endef
$(eval $(autotools-package))

3
package/mosquitto/mosquitto.mk
View File

@ -111,9 +111,6 @@ endef
define MOSQUITTO_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 644 $(@D)/service/systemd/mosquitto.service.notify \
$(TARGET_DIR)/usr/lib/systemd/system/mosquitto.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/mosquitto.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mosquitto.service
endef
define MOSQUITTO_USERS

16
package/nfs-utils/nfs-utils.mk
View File

@ -73,25 +73,9 @@ define NFS_UTILS_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S60nfs
endef
define NFS_UTILS_INSTALL_INIT_SYSTEMD_NFSD
ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service
endef
endif
define NFS_UTILS_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
$(NFS_UTILS_INSTALL_INIT_SYSTEMD_NFSD)
ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target
mkdir -p $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants
ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \
$(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
$(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
$(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh

6
package/ofono/ofono.mk
View File

@ -31,12 +31,6 @@ define OFONO_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/ofono/S46ofono $(TARGET_DIR)/etc/init.d/S46ofono
endef
define OFONO_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/ofono.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
endef
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
OFONO_CONF_OPTS += --enable-udev
OFONO_DEPENDENCIES += udev

6
package/pcsc-lite/pcsc-lite.mk
View File

@ -44,10 +44,4 @@ ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y)
PCSC_LITE_CONF_OPTS += --enable-embedded
endif
define PCSC_LITE_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
ln -sf ../../../../usr/lib/systemd/system/pcscd.socket \
$(TARGET_DIR)/etc/systemd/system/sockets.target.wants/pcscd.socket
endef
$(eval $(autotools-package))

3
package/php/php.mk
View File

@ -338,9 +338,6 @@ endef
define PHP_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/sapi/fpm/php-fpm.service \
$(TARGET_DIR)/usr/lib/systemd/system/php-fpm.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/php-fpm.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/php-fpm.service
endef
define PHP_INSTALL_FPM_CONF

14
package/rsyslog/rsyslog.mk
View File

@ -85,20 +85,6 @@ define RSYSLOG_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S01rsyslogd
endef
# The rsyslog.service is installed by rsyslog, but the link is not created
# so the service is not enabled.
# We need to create another link which is due to the fact that the
# rsyslog.service contains an Alias=
# If we were to use systemctl enable to enable the service, it would
# create both, so we mimic that.
define RSYSLOG_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service
ln -sf ../../../usr/lib/systemd/system/rsyslog.service \
$(TARGET_DIR)/etc/systemd/system/syslog.service
endef
define RSYSLOG_INSTALL_CONF
$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
$(TARGET_DIR)/etc/rsyslog.conf

7
package/samba4/samba4.mk
View File

@ -174,13 +174,6 @@ SAMBA4_DEPENDENCIES += systemd
endif
define SAMBA4_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/nmb.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service
ln -sf ../../../../usr/lib/systemd/system/smb.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smb.service
ln -sf ../../../../usr/lib/systemd/system/winbind.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service
$(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \
$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
printf "d /var/log/samba 755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf

3
package/squid/squid.mk
View File

@ -85,9 +85,6 @@ endef
define SQUID_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/tools/systemd/squid.service \
$(TARGET_DIR)/usr/lib/systemd/system/squid.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../..//usr/lib/systemd/system/squid.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service
endef
$(eval $(autotools-package))

3
package/sshguard/sshguard.mk
View File

@ -25,9 +25,6 @@ endef
define SSHGUARD_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/examples/sshguard.service \
$(TARGET_DIR)/usr/lib/systemd/system/sshguard.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/sshguard.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshguard.service
endef
$(eval $(autotools-package))

8
package/sysrepo/sysrepo.mk
View File

@ -41,14 +41,6 @@ define SYSREPO_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S51sysrepo-plugind
endef
define SYSREPO_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/sysrepod.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/sysrepo-plugind.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
endef
HOST_SYSREPO_CONF_OPTS = \
-DGEN_PYTHON2_TESTS=OFF \
-DENABLE_TESTS=OFF \

6
package/systemd-bootchart/systemd-bootchart.mk
View File

@ -16,10 +16,4 @@ SYSTEMD_BOOTCHART_DEPENDENCIES = systemd
SYSTEMD_BOOTCHART_CONF_OPTS = --disable-man
define SYSTEMD_BOOTCHART_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
ln -sf ../../../../lib/systemd/system/systemd-bootchart.service \
$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-bootchart.service
endef
$(eval $(autotools-package))

3
package/transmission/transmission.mk
View File

@ -66,9 +66,6 @@ endef
define TRANSMISSION_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/daemon/transmission-daemon.service \
$(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service
endef
else

3
package/upmpdcli/upmpdcli.mk
View File

@ -27,9 +27,6 @@ endef
define UPMPDCLI_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 644 $(@D)/systemd/upmpdcli.service \
$(TARGET_DIR)/usr/lib/systemd/system/upmpdcli.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/upmpdcli.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upmpdcli.service
endef
define UPMPDCLI_INSTALL_CONF_FILE