use host-systemd to enable units
v4 cover use host-systemd to enable units
As discussed during the buildroot dev days, upstream systemd now relies on systemctl to enable units at install time.
The patch bumping systemd to v243 in buildroot did add the logic to handle that through Makefiles.
This patch adds support for compiling host-systemd and using it to enable all units.
* 0001-new-recipe-host-systemd.patch
I might have missed some build-dependencies. Please review carefully
* 0002-use-host-systemctl-preset-all-to-enable-units.patch Use the previous patch to simplify the systemd recipe
* 0003-fix-tty-handling.patch
TTY handling is tricky. Separate it in its own patch
Everything else deals with updating the packages
Version 4:
* remove dependency on host-eudev and provide hwdb handling ourselves
J?r?my Rosen (13):
new recipe : host-systemd
use host-systemctl preset all to enable units fix tty handling
fix trivial packages with buildroot-provided services fix trivial cases, upstream-provided services package/connman: adapt to preset-all package/linuxptp adapt to preset-all package/network-manager: adapt to preset-all package/wpa_supplicant: adapt for preset-all package/sysrepo: update to new systemd package/syslog-ng: implement default using DefaultInstance package/rauc: add a WantedBy section to the unit package/alsa-utils: add a WantedBy section to the unit
docs/manual/adding-packages-generic.txt | 4 + package/Config.in.host | 1 + package/acpid/acpid.mk | 3 - package/alsa-utils/alsa-utils.mk | 9 +- package/apache/apache.mk | 3 - package/audit/audit.mk | 4 - package/avahi/avahi.mk | 8 - package/babeld/babeld.mk | 5 - package/bandwidthd/bandwidthd.mk | 5 - package/bind/bind.mk | 5 - package/bluez5_utils/bluez5_utils.mk | 8 - package/boinc/boinc.mk | 5 - package/brltty/brltty.mk | 4 - package/chrony/chrony.mk | 3 - package/collectd/collectd.mk | 3 - package/connman/connman.mk | 6 - package/darkhttpd/darkhttpd.mk | 3 - package/dcron/dcron.mk | 3 - package/dhcp/dhcp.mk | 5 - package/dhcpcd/dhcpcd.mk | 3 - package/docker-engine/docker-engine.mk | 3 - package/domoticz/domoticz.mk | 3 - package/dropbear/dropbear.mk | 3 - package/exim/exim.mk | 3 - package/fail2ban/fail2ban.mk | 3 - package/freescale-imx/imx-uuc/imx-uuc.mk | 3 - package/gerbera/gerbera.mk | 6 - package/haveged/haveged.mk | 3 - package/i2pd/i2pd.mk | 3 - package/ifupdown-scripts/ifupdown-scripts.mk | 3 - package/igd2-for-linux/igd2-for-linux.mk | 3 - package/inadyn/inadyn.mk | 3 - .../input-event-daemon/input-event-daemon.mk | 3 - package/iputils/iputils.mk | 16 -- package/irqbalance/irqbalance.mk | 3 - package/iucode-tool/iucode-tool.mk | 3 - package/kodi/kodi.mk | 5 - package/lighttpd/lighttpd.mk | 6 - .../linuxptp/linuxptp-system-clock.service | 1 - package/linuxptp/linuxptp.mk | 3 - package/lldpd/lldpd.mk | 6 - package/mariadb/mariadb.mk | 3 - package/mender/mender.mk | 3 - package/mini-snmpd/mini-snmpd.mk | 3 - package/minidlna/minidlna.mk | 5 - package/minissdpd/minissdpd.mk | 3 - package/mosquitto/mosquitto.mk | 3 - package/motion/motion.mk | 3 - package/netplug/netplug.mk | 3 - package/network-manager/network-manager.mk | 7 - package/nfs-utils/nfs-utils.mk | 16 -- package/nginx/nginx.mk | 5 - package/nss-pam-ldapd/nss-pam-ldapd.mk | 3 - package/ntp/ntp.mk | 3 - package/ofono/ofono.mk | 6 - package/olsr/olsr.mk | 3 - package/openntpd/openntpd.mk | 3 - package/openssh/openssh.mk | 3 - package/openvmtools/openvmtools.mk | 3 - package/oracle-mysql/oracle-mysql.mk | 3 - package/pcsc-lite/pcsc-lite.mk | 6 - package/php/php.mk | 3 - package/postgresql/postgresql.mk | 3 - package/proftpd/proftpd.mk | 3 - package/psplash/psplash.mk | 6 - package/ptpd/ptpd.mk | 3 - package/ptpd2/ptpd2.mk | 3 - package/pulseaudio/pulseaudio.mk | 3 - package/python-web2py/python-web2py.mk | 3 - package/rabbitmq-server/rabbitmq-server.mk | 5 - package/rauc/rauc.mk | 5 +- package/redis/redis.mk | 3 - package/rng-tools/rng-tools.mk | 3 - package/rpcbind/rpcbind.mk | 3 - package/rsyslog/rsyslog.mk | 14 -- package/rygel/rygel.mk | 3 - package/samba4/samba4.mk | 7 - package/sane-backends/sane-backends.mk | 6 - package/squid/squid.mk | 3 - package/sshguard/sshguard.mk | 3 - package/supervisor/supervisor.mk | 3 - package/suricata/suricata.mk | 3 - package/sysklogd/sysklogd.mk | 5 - package/syslog-ng/syslog-ng.mk | 7 +- package/sysrepo/sysrepo.mk | 10 +- .../systemd-bootchart/systemd-bootchart.mk | 6 - package/systemd/80-buildroot.preset | 4 + package/systemd/Config.in | 2 +- package/systemd/Config.in.host | 3 + package/systemd/systemd.mk | 224 ++++++++++-------- package/tcf-agent/tcf-agent.mk | 3 - package/thttpd/thttpd.mk | 3 - package/ti-gfx/ti-gfx.mk | 3 - package/tinyhttpd/tinyhttpd.mk | 3 - package/transmission/transmission.mk | 3 - package/triggerhappy/triggerhappy.mk | 3 - package/upmpdcli/upmpdcli.mk | 3 - .../wpa_supplicant/50-wpa_supplicant.preset | 4 + package/wpa_supplicant/wpa_supplicant.mk | 2 + 99 files changed, 154 insertions(+), 484 deletions(-) create mode 100644 package/systemd/80-buildroot.preset create mode 100644 package/systemd/Config.in.host create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset
Signature · 1 line
2.24.0
PATCH v4 1/13 new recipe : host-systemd
Add the infrastructure to build the host version of systemd
* disable all optional features, they can be re-added when needed
* systemd has creative way of dealing with cross compile we build a "normal" host systemd, but install it in $HOST_DIR we use systemctl --root to correctly act on TARGET_DIR
* we need to adjust RPATH using patchelf because meson can't do it correctly by itsel
--- package/Config.in.host | 1 + package/systemd/Config.in | 1 - package/systemd/Config.in.host | 3 ++ package/systemd/systemd.mk | 98 ++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 package/systemd/Config.in.host
package/Config.in.host +1 -0
@@ -70,6 +70,7 @@ menu "Host utilities" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" source "package/uboot-tools/Config.in.host"
package/systemd/Config.in +0 -1
@@ -199,7 +199,6 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" default y - select BR2_PACKAGE_HOST_EUDEV # for udevadm, during target-finalize help Enables hardware database installation to /usr/lib/udev/hwdb.d
package/systemd/Config.in.host new file +3 -0
@@ -0,0 +1,3 @@ +# Select this if you need host systemd tools (e.g. systemctl) +config BR2_PACKAGE_HOST_SYSTEMD + bool
package/systemd/systemd.mk +98 -0
107 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH v4 1/13 new recipe : host-systemd
Hello,
Thanks for this work, very useful!
Quoted 26 lines · On Thu, 12 Dec 2019 08:53:48 +0100 J?r?my Rosen <[email protected]> wrote:
package/systemd/Config.in +0
-1@@ -199,7 +199,6 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" default y - select BR2_PACKAGE_HOST_EUDEV # for udevadm, during target-finalize help Enables hardware database installation to /usr/lib/udev/hwdb.dpackage/systemd/Config.in.host new file +3
-0@@ -0,0 +1,3 @@ +# Select this if you need host systemd tools (e.g. systemctl) +config BR2_PACKAGE_HOST_SYSTEMD + boolpackage/systemd/systemd.mk +0
-0
package/systemd/systemd.mk endif · line 209
Quoted 6 lines
package/systemd/systemd.mk +3
-0@@ -204,6 +204,11 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true +define SYSTEMD_BUILD_HWDB + $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) +endef
I think this change could be a separate patch, no? Or is the udevadm binary installed by host-systemd conflicting with the one installed by host-eudev ?
Should be explained in the commit log.
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 558
Quoted 9 lines
package/systemd/systemd.mk +2
-0+SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB + else SYSTEMD_CONF_OPTS += -Dhwdb=false endif@@ -551,3 +556,96 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) $(eval $(meson-package))
We normally have both meson-package and host-meson-package macro invocations at the end of .mk files.
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 567
Quoted 8 lines
package/systemd/systemd.mk +8
-0+# +# Host-systemd configuration +# +#Options tweaked for buildroot +HOST_SYSTEMD_CONF_OPTS= \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + --prefix=/usr \
This should really be:
--prefix=$(HOST_DIR)
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 570
Quoted 3 lines
package/systemd/systemd.mk +3
-0+ --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/var
But in fact, all these options are already passed by the host-meson-package infrastructure. Why are you overriding them ?
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 572
Quoted 1 line
package/systemd/systemd.mk +1
-0+#disable everything else
Space after #
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 573
Quoted 1 line
package/systemd/systemd.mk +1
-0+HOST_SYSTEMD_CONF_OPTS+= \
Space before +=
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 634
Quoted 11 lines
package/systemd/systemd.mk +11
-0+HOST_SYSTEMD_DEPENDENCIES = \ + host-util-linux \ + host-patchelf \ + host-libcap \ + host-gperf + +# Fix RPATH After installation +# * systemd provides a install_rpath instruction to meson because the binaries need to link with +# libsystemd which is not in a standard path +# * meson can only replace the RPATH, not append to it +# * the original rpatch is thus lost.
rpatch -> rpath
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 635
Quoted 1 line
package/systemd/systemd.mk +1
-0+# * the original path had been tweaked by buildroot vial LD_FLAGS to add $(HOST_DIR)/lib
vial -> via
LD_FLAGS -> LDFLAGS
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 636
Quoted 1 line
package/systemd/systemd.mk +1
-0+# * thus re-tweak rpath after the installation for all binaries that need it
I must admit I don't really understand what's going on here. Can't you simply do something like this:
HOST_SYSTEMD_CONF_ENV = \ LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(HOST_DIR)/lib/systemd"
and that's it ?
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 638
Quoted 2 lines
package/systemd/systemd.mk +2
-0+#buildroot detects incorrect RPATH, so adding new binaries should be safe (it won't compile +#unless properly integrated).
Space after #, and lines are too long.
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 649
Quoted 11 lines
package/systemd/systemd.mk +11
-0+HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze systemd-mount systemctl udevadm + +define HOST_SYSTEMD_FIX_RPATH + $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) + ) +endef + +HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)
With the correct --prefix=$(HOST_DIR) passed by the default host-meson-package infrastructure, this DESTDIR=$(HOST_DIR) should no longer be necessary.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v4 1/13 new recipe : host-systemd
Le jeu. 12 d?c. 2019 ? 11:19, Thomas Petazzoni <[email protected]> a ?crit :
Quoted 11 lines
package/systemd/systemd.mk endif · line 209
Quoted 6 lines
ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y)
SYSTEMD_CONF_OPTS+= -Dhwdb=truepackage/systemd/systemd.mk +3
-0+define SYSTEMD_BUILD_HWDB + $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) +endefI think this change could be a separate patch, no? Or is the udevadm binary installed by host-systemd conflicting with the one installed by host-eudev ?
Quoted 3 lines
Should be explained in the commit log.
That's a matter of taste, I guess
No it doesn't conflict, i'll split in v5
Quoted 8 lines
Quoted 8 lines
package/systemd/systemd.mk +2
-0+SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB + else SYSTEMD_CONF_OPTS += -Dhwdb=false endif@@ -551,3 +556,96 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
Quoted 6 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 558
Quoted 1 line
package/systemd/systemd.mk +0
-0$(eval $(meson-package))We normally have both meson-package and host-meson-package macro invocations at the end of .mk files.
Ok, I wanted to separate the host and target part clearly, but i'll follow proper styling
Quoted 11 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 567
Quoted 8 lines
package/systemd/systemd.mk +8
-0+# +# Host-systemd configuration +# +#Options tweaked for buildroot +HOST_SYSTEMD_CONF_OPTS= \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + --prefix=/usr \This should really be:
Quoted 3 lines
--prefix=$(HOST_DIR)
No... upstream does not user --prefix properly and we are force to set it to /usr
even if HOST_DIR would make more sense.
I'll discuss this more in depth in the commit log
Quoted 8 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 570
Quoted 3 lines
package/systemd/systemd.mk +3
-0+ --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/varBut in fact, all these options are already passed by the host-meson-package infrastructure. Why are you overriding them ?
it's probably a bit overkill, but these need to be set to the same value as the target, not the ones provided by the host
It's a bit complex to follow because upstream does not understand the concept of cross-tool correctly so we might build
a systemctl that does the right thing for the host instead of doing the right thing for the target
Quoted 22 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 572
Quoted 1 line
package/systemd/systemd.mk +1
-0+#disable everything elseSpace after #
ok
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 573
Quoted 1 line
package/systemd/systemd.mk +1
-0+HOST_SYSTEMD_CONF_OPTS+= \Space before +=
ok
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV)
Quoted 8 lines
package/systemd/systemd.mk +8
-0+HOST_SYSTEMD_DEPENDENCIES = \ + host-util-linux \ + host-patchelf \ + host-libcap \ + host-gperf + +# Fix RPATH After installation +# * systemd provides a install_rpath instruction to meson because thebinaries need to link with
Quoted 7 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 634
Quoted 3 lines
package/systemd/systemd.mk +3
-0+# libsystemd which is not in a standard path +# * meson can only replace the RPATH, not append to it +# * the original rpatch is thus lost.rpatch -> rpath
darn me typing to fast
Quoted 12 lines
Review SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 583
Quoted 1 line
(quoted diff) +1
-0+# * the original path had been tweaked by buildroot vial LD_FLAGS toadd $(HOST_DIR)/lib
vial -> via
ditto
LD_FLAGS-> LDFLAGSReview SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 584
Quoted 1 line
(quoted diff) +1
-0+# * thus re-tweak rpath after the installation for all binaries thatneed it
Quoted 9 lines
I must admit I don't really understand what's going on here. Can't you simply do something like this:
HOST_SYSTEMD_CONF_ENV = \ LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(HOST_DIR)/lib/systemd"and that's it ?
No.. that's already what is done by host-package-meson but meson+systemd breaks that.
Meson does not support using -rpath in LDFLAGS. It will rewrite the rpath at the end of the
build using the information it has, but that does not include parsing the ENV var and directly
understanding the linker flags.
Normally, everything should be alright since systemd tells meson about libsystemd's location *
through meson conf files. meson would user systemd's instructions and combine it with the
--prefix option to rewrite rpath correctly.
However systemd does not handle --prefix correctly (it hardcodes lots of stuff in its build system based
on --prefix) so --prefix can either be empty or point to /usr. (this is heavily linked to the split-usr problem)
Because of that, meson will erase our LDFLAGS provided rpath but won't rewrite them correctly.
I have spent quite some time with Yann at Lyon looking for a way around, and this seems the best one
until upstream deals correctly with --prefix.
I tried to be both concise and clear in my comment in the .mk (since i'm pretty sure this is where
future contributors will stumble) but apparently i'm not there yet :)
Quoted 13 lines
Review SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 585
Quoted 1 line
(quoted diff) +1
-0+#buildroot detects incorrect RPATH, so adding new binaries should besafe (it won't compile
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 638
Quoted 1 line
package/systemd/systemd.mk +1
-0+#unless properly integrated).Space after #, and lines are too long.
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV)
Quoted 6 lines
package/systemd/systemd.mk +6
-0+HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze systemd-mount systemctl udevadm + +define HOST_SYSTEMD_FIX_RPATH + $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath$(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f)
Quoted 11 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 649
Quoted 5 lines
package/systemd/systemd.mk +5
-0+ ) +endef + +HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)With the correct --prefix=$(HOST_DIR) passed by the default host-meson-package infrastructure, this DESTDIR=$(HOST_DIR) should no longer be necessary.
see my comment above
Thx for the review... I'll wait a bit and send a v5 integrating all your remarks
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 21 lines
[image: SMILE] <http://www.smile.eu/> 20 rue des Jardins 92600 Asni?res-sur-Seine *J?r?my ROSEN* Architecte technique [image: email] jeremy.rosen at smile.fr [image: phone] +33 6 88 25 87 42 [image: url] http://www.smile.eu [image: Twitter] <https://twitter.com/GroupeSmile> [image: Facebook] <https://www.facebook.com/smileopensource> [image: LinkedIn] <https://www.linkedin.com/company/smile> [image: Github] <https://github.com/Smile-SA> [image: D?couvrez l?univers Smile, rendez-vous sur smile.eu] <https://www.smile.eu/fr/publications/livres-blancs/yocto?utm_source=signature&utm_medium=email&utm_campaign=signature> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20191212/bf57adfc/attachment.html>
PATCH v4 1/13 new recipe : host-systemd
In reply to Thomas PetazzoniJ?r?my, Thomas,All,
On 2019-12-12 11:19 +0100, Thomas Petazzoni spake thusly:
Quoted 2 lines
On Thu, 12 Dec 2019 08:53:48 +0100
J?r?my Rosen <[email protected]> wrote:
[--SNIP--]
Quoted 16 lines
package/systemd/systemd.mk endif · line 209
Quoted 11 lines
package/systemd/systemd.mk +3
-0@@ -204,6 +204,11 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true +define SYSTEMD_BUILD_HWDB + $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) +endefI think this change could be a separate patch, no? Or is the udevadm binary installed by host-systemd conflicting with the one installed by host-eudev ?
Quoted 1 line
Should be explained in the commit log.
I think this change should go in current patch 2, where systemd is made dependent on host-systemd, which indeed installs its own udevadm which would conflict with the one from host-eudev.
[--SNIP--]
Quoted 10 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 567
Quoted 7 lines
package/systemd/systemd.mk +7
-0+# Host-systemd configuration +# +#Options tweaked for buildroot +HOST_SYSTEMD_CONF_OPTS= \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + --prefix=/usr \This should really be:
Quoted 8 lines
--prefix=$(HOST_DIR)package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 570
Quoted 3 lines
package/systemd/systemd.mk +3
-0+ --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/varBut in fact, all these options are already passed by the host-meson-package infrastructure. Why are you overriding them ?
[--SNIP--]
Quoted 8 lines
Quoted 1 line
+# * thus re-tweak rpath after the installation for all binaries that need it
I must admit I don't really understand what's going on here. Can't you simply do something like this:
HOST_SYSTEMD_CONF_ENV = \ LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(HOST_DIR)/lib/systemd"and that's it ?
For the records, here are the explanations I provided on IRC.
The first question is: why do we use --prefix=/usr ?
systemd will store its --prefix in all the executables it generates. As such, systemctl will have a hardcoded 'prefix', where it will manipulate and create files/symlinks in. When called natively, this is nice and shinny.
However, for cross-setup, that does not work obviously.
So, systemd has its tools know about the 'root' directory where this prefix should be related to. We can call systemctl --root=$(TARGET_DIR) and systemctl wil do the links and such in there.
However, it does so by appending its known prefix to it.
So, if we were to configure host-systemd as we usually do, with --prefix=$(HOST_DIR), then when we would call host systemctl --root=$(TARGET_DIR) it would look for files in $(TARGET_DIR)/$(HOST_DIR), which is wrong.
Calling the host systemctl without --root is also wrong, as it would look for files in $(HOST_DIR)
So, there is no satisfying official support for this case.
The trick then, is to configure systemd with the prefix it would expect at runtime (on the target!), that is with /usr, but install out-of-tree.
That was it for the first part of the question: why do we use --prefix.
Now, the second question is: why do we need to muck up with the rpath after installation?
Well, this boils down to meson (and not systemd itself). When it installs executables, meson will handily insert whatever rpath the package meson.build would tell it to use. systemd installs libs in $(prefix)/lib/systemd and as a NEEDED to those libs, so it uses an RPATH to find those libs, and meson does introduce that RPATH. However, we Buildroot also want to insert our own RPATH, because systemd uses util-linux' libs and libcap, so it needs our RPATH. However, meson can not extend the RPATH from the LDFLAGS in the environment; meson can only set the RPATH from what it knows about from the package's meson.build.
That, in addition to the --prefix=/usr issue above, means that the executables installed by host-systemd have an RPATH set to /usr/lib/systemd. when we would want it to be set to $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd
That;s what is done in the post-install hook: set the RPATH to the appropriate values.
[--SNIP--]
Quoted 5 lines
package/systemd/systemd.mk SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) · line 649
Quoted 2 lines
package/systemd/systemd.mk +2
-0+HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)With the correct --prefix=$(HOST_DIR) passed by the default host-meson-package infrastructure, this DESTDIR=$(HOST_DIR) should no longer be necessary.
Alas, this is not possible... :-(
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/13 use host-systemctl preset all to enable units
In reply to Jérémy Rosensince v234 upstream recommands using systemctl preset-all to enable units.
* add a buildroot specific preset file
* use that file to disable getty at tty1
* make systemd depend on host-systemd
* remove all link-creating code that systemd does for us.
Most packages will not be affected by this change, but a few packages were installing units without manually enabling them. Those packages will now be automatically enabled.
The fact that those packages were not enabled is almost certainly a bug, but it is a change of behaviour that needs to be reported
--- docs/manual/adding-packages-generic.txt | 4 + package/systemd/80-buildroot.preset | 5 ++ package/systemd/Config.in | 1 + package/systemd/systemd.mk | 103 +++--------------------- 4 files changed, 22 insertions(+), 91 deletions(-) create mode 100644 package/systemd/80-buildroot.preset
docs/manual/adding-packages-generic.txt +4 -0
@@ -550,6 +550,10 @@ different steps of the build process. is when openrc is chosen as init system and +LIBFOO_INSTALL_INIT_OPENRC+ has not been set, in such situation +LIBFOO_INSTALL_INIT_SYSV+ will be called, since openrc supports sysv init scripts. + When systemd is used as the init system, buildroot will automatically enable + all services using the +systemctl preset-all+ command in the final phase of + image building. You can add preset files to prevent a particular unit from + being automatically enabled by buildroot. * +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which is included to the main +make help+ output. These commands can print
package/systemd/80-buildroot.preset new file +5 -0
@@ -0,0 +1,5 @@ +# Higher priority than systemd presets + +# by default systemd enables a getty on tty1 +# we don't want that because tty1 may not exist +disable getty at .service
package/systemd/Config.in +1 -0
@@ -35,6 +35,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_KMOD_TOOLS select BR2_TARGET_TZ_INFO select BR2_NEEDS_HOST_UTF8_LOCALE + select BR2_PACKAGE_HOST_SYSTEMD # for systemctl preset-all, during target-finalize help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides
package/systemd/systemd.mk +12 -91
181 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH v4 3/13 fix tty handling
In reply to Jérémy RosenHandling of tty is a bit tricky, we need to aggressively disable what systemd does with tty1 then update for what buildroot wants to do
Rework the whole tty generation to work with presets
--- package/systemd/80-buildroot.preset | 5 ++--- package/systemd/systemd.mk | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-)
package/systemd/80-buildroot.preset +2 -3
@@ -1,5 +1,4 @@ # Higher priority than systemd presets -# by default systemd enables a getty on tty1 -# we don't want that because tty1 may not exist -disable getty at .service +# This file is currently empty, but is available for demonstration and future use +
package/systemd/systemd.mk +17 -8
@@ -433,22 +433,33 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd needs getty.service for VTs and serial-getty.service for serial ttys # note that console-getty.service should be used on /dev/console as it should not have dependencies # also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that +# +# systemd defaults to only have getty at tty.service enabled +# * DefaultInstance=tty1 in getty at service +# * no DefaultInstance in serial-getty at .service +# * WantedBy=getty.target in console-getty.service +# * console-getty is not enabled because of 90-systemd.preset +# We want "systemctl preset-all" to do the right thing, even when run on the target after boot +# * remove the default instance of getty at .service via a drop-in in /usr/lib +# * set a new DefaultInstance for getty at .service instead, if needed +# * set a new DefaultInstance for serial-getty at .service, if needed +# * override the systemd-provided preset for console-getty.service if needed define SYSTEMD_INSTALL_SERVICE_TTY + mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty at .service.d;\ + printf '[Install]\nDefaultInstance=\n' > $(TARGET_DIR)/usr/lib/systemd/system/getty at .service.d/buildroot-console.conf;\ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ TARGET="console-getty.service"; \ - LINK_NAME="console-getty.service"; \ + printf 'enable console-getty.service\n' > $(TARGET_DIR)/usr/lib/systemd/system-preset/81-buildroot-tty.preset;\ elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ then \ TARGET="getty at .service"; \ - LINK_NAME="getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + printf '[Install]\nDefaultInstance=%s\n' $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) > $(TARGET_DIR)/usr/lib/systemd/system/getty at .service.d/buildroot-console.conf;\ else \ TARGET="serial-getty at .service"; \ - LINK_NAME="serial-getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d;\ + printf '[Install]\nDefaultInstance=%s\n' $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) > $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d/buildroot-console.conf;\ fi; \ - mkdir -p $(TARGET_DIR)/etc/systemd/system/getty.target.wants/; \ - ln -fs ../../../../lib/systemd/system/$${TARGET} \ - $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${LINK_NAME}; \ if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ then \ $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \
@@ -456,7 +467,6 @@ define SYSTEMD_INSTALL_SERVICE_TTY endef endif - define SYSTEMD_INSTALL_PRESET $(INSTALL) -D -m 644 $(SYSTEMD_PKGDIR)/80-buildroot.preset $(TARGET_DIR)/usr/lib/systemd/system-preset/80-buildroot.preset endef
@@ -472,7 +482,6 @@ define SYSTEMD_PRESET_ALL endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL - SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
Signature · 1 line
2.24.0
PATCH v4 4/13 fix trivial packages with buildroot-provided services
In reply to Jérémy RosenAll the packages in this list have the following properties
* units are provided by buildroot in the package directory
* the SYSTEMD_INSTALL_INIT_HOOK is exactly equivalent to what the [Install] section of the unit does
The fix removes the soflinking in the .mk file
--- package/acpid/acpid.mk | 3 --- package/apache/apache.mk | 3 --- package/babeld/babeld.mk | 5 ----- package/bandwidthd/bandwidthd.mk | 5 ----- package/bind/bind.mk | 5 ----- package/brltty/brltty.mk | 4 ---- package/chrony/chrony.mk | 3 --- package/collectd/collectd.mk | 3 --- package/darkhttpd/darkhttpd.mk | 3 --- package/dcron/dcron.mk | 3 --- package/dhcp/dhcp.mk | 5 ----- package/dhcpcd/dhcpcd.mk | 3 --- package/domoticz/domoticz.mk | 3 --- package/dropbear/dropbear.mk | 3 --- package/exim/exim.mk | 3 --- package/freescale-imx/imx-uuc/imx-uuc.mk | 3 --- package/haveged/haveged.mk | 3 --- package/i2pd/i2pd.mk | 3 --- package/ifupdown-scripts/ifupdown-scripts.mk | 3 --- package/igd2-for-linux/igd2-for-linux.mk | 3 --- package/inadyn/inadyn.mk | 3 --- package/input-event-daemon/input-event-daemon.mk | 3 --- package/irqbalance/irqbalance.mk | 3 --- package/iucode-tool/iucode-tool.mk | 3 --- package/kodi/kodi.mk | 5 ----- package/mariadb/mariadb.mk | 3 --- package/mender/mender.mk | 3 --- package/mini-snmpd/mini-snmpd.mk | 3 --- package/minidlna/minidlna.mk | 5 ----- package/minissdpd/minissdpd.mk | 3 --- package/motion/motion.mk | 3 --- package/netplug/netplug.mk | 3 --- package/nginx/nginx.mk | 5 ----- package/nss-pam-ldapd/nss-pam-ldapd.mk | 3 --- package/ntp/ntp.mk | 3 --- package/olsr/olsr.mk | 3 --- package/openntpd/openntpd.mk | 3 --- package/openssh/openssh.mk | 3 --- package/openvmtools/openvmtools.mk | 3 --- package/oracle-mysql/oracle-mysql.mk | 3 --- package/postgresql/postgresql.mk | 3 --- package/proftpd/proftpd.mk | 3 --- package/psplash/psplash.mk | 6 ------ package/ptpd/ptpd.mk | 3 --- package/ptpd2/ptpd2.mk | 3 --- package/pulseaudio/pulseaudio.mk | 3 --- package/python-web2py/python-web2py.mk | 3 --- package/rabbitmq-server/rabbitmq-server.mk | 5 ----- package/redis/redis.mk | 3 --- package/rng-tools/rng-tools.mk | 3 --- package/rpcbind/rpcbind.mk | 3 --- package/rygel/rygel.mk | 3 --- package/sane-backends/sane-backends.mk | 6 ------ package/supervisor/supervisor.mk | 3 --- package/suricata/suricata.mk | 3 --- package/sysklogd/sysklogd.mk | 5 ----- package/tcf-agent/tcf-agent.mk | 3 --- package/thttpd/thttpd.mk | 3 --- package/ti-gfx/ti-gfx.mk | 3 --- package/tinyhttpd/tinyhttpd.mk | 3 --- package/triggerhappy/triggerhappy.mk | 3 --- 61 files changed, 208 deletions(-)
package/acpid/acpid.mk +0 -3
@@ -13,9 +13,6 @@ ACPID_LICENSE_FILES = COPYING define ACPID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/acpid/acpid.service \ $(TARGET_DIR)/usr/lib/systemd/system/acpid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/acpid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/acpid.service endef define ACPID_INSTALL_INIT_SYSV
package/apache/apache.mk +0 -3
@@ -109,9 +109,6 @@ endef define APACHE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/apache/apache.service \ $(TARGET_DIR)/usr/lib/systemd/system/apache.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/apache.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/apache.service endef $(eval $(autotools-package))
package/babeld/babeld.mk +0 -5
@@ -25,11 +25,6 @@ endef define BABELD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/babeld/babeld.service \ $(TARGET_DIR)/usr/lib/systemd/system/babeld.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/babeld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/babeld.service endef $(eval $(generic-package))
package/bandwidthd/bandwidthd.mk +0 -5
@@ -34,11 +34,6 @@ endif define BANDWIDTHD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/bandwidthd/bandwidthd.service \ $(TARGET_DIR)/usr/lib/systemd/system/bandwidthd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/bandwidthd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bandwidthd.service endef $(eval $(autotools-package))
package/bind/bind.mk +0 -5
@@ -111,11 +111,6 @@ endef define BIND_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(BIND_PKGDIR)/named.service \ $(TARGET_DIR)/usr/lib/systemd/system/named.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/named.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/named.service endef else BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER
package/brltty/brltty.mk +0 -4
@@ -121,10 +121,6 @@ endef define BRLTTY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/brltty/brltty.service \ $(TARGET_DIR)/usr/lib/systemd/system/brltty.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -fs ../../../../usr/lib/systemd/system/brltty.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/brltty.service endef $(eval $(autotools-package))
package/chrony/chrony.mk +0 -3
@@ -67,9 +67,6 @@ endef define CHRONY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/chrony/chrony.service \ $(TARGET_DIR)/usr/lib/systemd/system/chrony.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/chrony.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/chrony.service endef $(eval $(generic-package))
package/collectd/collectd.mk +0 -3
@@ -229,9 +229,6 @@ endef define COLLECTD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/collectd/collectd.service \ $(TARGET_DIR)/usr/lib/systemd/system/collectd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/collectd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service endef $(eval $(autotools-package))
package/darkhttpd/darkhttpd.mk +0 -3
@@ -21,9 +21,6 @@ endef define DARKHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/darkhttpd/darkhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/darkhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/darkhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/darkhttpd.service endef define DARKHTTPD_INSTALL_INIT_SYSV
package/dcron/dcron.mk +0 -3
@@ -31,9 +31,6 @@ endef define DCRON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dcron/dcron.service \ $(TARGET_DIR)/usr/lib/systemd/system/dcron.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dcron.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dcron.service endef $(eval $(generic-package))
package/dhcp/dhcp.mk +0 -5
@@ -100,11 +100,6 @@ define DHCP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dhcp/dhcpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf ../../../../usr/lib/systemd/system/dhcpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpd.service - mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d echo "d /var/lib/dhcp 0755 - - - -" > \ $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf
package/dhcpcd/dhcpcd.mk +0 -3
@@ -48,9 +48,6 @@ endef define DHCPCD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/dhcpcd/dhcpcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dhcpcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpcd.service endef endif
package/domoticz/domoticz.mk +0 -3
@@ -78,9 +78,6 @@ endef define DOMOTICZ_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/domoticz/domoticz.service \ $(TARGET_DIR)/usr/lib/systemd/system/domoticz.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/domoticz.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/domoticz.service endef $(eval $(cmake-package))
package/dropbear/dropbear.mk +0 -3
@@ -90,9 +90,6 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH define DROPBEAR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/dropbear.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dropbear.service endef ifeq ($(BR2_USE_MMU),y)
package/exim/exim.mk +0 -3
@@ -145,9 +145,6 @@ endef define EXIM_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/exim/exim.service \ $(TARGET_DIR)/usr/lib/systemd/system/exim.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/exim.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/exim.service endef $(eval $(generic-package))
package/freescale-imx/imx-uuc/imx-uuc.mk +0 -3
@@ -33,9 +33,6 @@ endef define IMX_UUC_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/freescale-imx/imx-uuc/imx-uuc.service \ $(TARGET_DIR)/usr/lib/systemd/system/imx-uuc.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/imx-uuc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/imx-uuc.service endef $(eval $(generic-package))
package/haveged/haveged.mk +0 -3
@@ -21,9 +21,6 @@ endef define HAVEGED_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/haveged/haveged.service \ $(TARGET_DIR)/usr/lib/systemd/system/haveged.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs /usr/lib/systemd/system/haveged.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/haveged.service endef $(eval $(autotools-package))
package/i2pd/i2pd.mk +0 -3
@@ -59,9 +59,6 @@ endef define I2PD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/i2pd/i2pd.service \ $(TARGET_DIR)/usr/lib/systemd/system/i2pd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/i2pd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/i2pd.service endef $(eval $(cmake-package))
package/ifupdown-scripts/ifupdown-scripts.mk +0 -3
@@ -48,9 +48,6 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../network.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service endef $(eval $(generic-package))
package/igd2-for-linux/igd2-for-linux.mk +0 -3
@@ -40,9 +40,6 @@ endef define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/igd2-for-linux/upnpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upnpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upnpd.service endef $(eval $(generic-package))
package/inadyn/inadyn.mk +0 -3
@@ -34,9 +34,6 @@ endef define INADYN_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/inadyn/inadyn.service \ $(TARGET_DIR)/usr/lib/systemd/system/inadyn.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/inadyn.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/inadyn.service endef $(eval $(autotools-package))
package/input-event-daemon/input-event-daemon.mk +0 -3
@@ -30,9 +30,6 @@ endef define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/input-event-daemon/input-event-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/input-event-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/input-event-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/input-event-daemon.service endef $(eval $(generic-package))
package/irqbalance/irqbalance.mk +0 -3
@@ -55,9 +55,6 @@ endef define IRQBALANCE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/irqbalance/irqbalance.service \ $(TARGET_DIR)/usr/lib/systemd/system/irqbalance.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/irqbalance.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/irqbalance.service endef $(eval $(autotools-package))
package/iucode-tool/iucode-tool.mk +0 -3
@@ -21,9 +21,6 @@ endef define IUCODE_TOOL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/iucode-tool/iucode.service \ $(TARGET_DIR)/usr/lib/systemd/system/iucode.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/iucode.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iucode.service endef $(eval $(autotools-package))
package/kodi/kodi.mk +0 -5
@@ -398,11 +398,6 @@ endef define KODI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/kodi/kodi.service \ $(TARGET_DIR)/usr/lib/systemd/system/kodi.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/kodi.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service endef $(eval $(cmake-package))
package/mariadb/mariadb.mk +0 -3
@@ -120,9 +120,6 @@ endef define MARIADB_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mariadb/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef endif
package/mender/mender.mk +0 -3
@@ -70,9 +70,6 @@ MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES define MENDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \ $(TARGET_DIR)/usr/lib/systemd/system/mender.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mender.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef define MENDER_INSTALL_INIT_SYSV
package/mini-snmpd/mini-snmpd.mk +0 -3
@@ -13,9 +13,6 @@ MINI_SNMPD_AUTORECONF = YES define MINI_SNMPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mini-snmpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mini-snmpd.service endef $(eval $(autotools-package))
package/minidlna/minidlna.mk +0 -5
@@ -31,11 +31,6 @@ endef define MINIDLNA_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/minidlna/minidlnad.service \ $(TARGET_DIR)/usr/lib/systemd/system/minidlnad.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/minidlnad.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minidlnad.service endef $(eval $(autotools-package))
package/minissdpd/minissdpd.mk +0 -3
@@ -32,9 +32,6 @@ endef define MINISSDPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/minissdpd/minissdpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/minissdpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/minissdpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minissdpd.service endef $(eval $(generic-package))
package/motion/motion.mk +0 -3
@@ -71,9 +71,6 @@ endef define MOTION_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/motion/motion.service \ $(TARGET_DIR)/usr/lib/systemd/system/motion.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/motion.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/motion.service endef $(eval $(autotools-package))
package/netplug/netplug.mk +0 -3
@@ -26,9 +26,6 @@ endef define NETPLUG_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/netplug/netplug.service \ $(TARGET_DIR)/usr/lib/systemd/system/netplug.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/netplug.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/netplug.service endef $(eval $(generic-package))
package/nginx/nginx.mk +0 -5
@@ -281,11 +281,6 @@ endef define NGINX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/nginx/nginx.service \ $(TARGET_DIR)/usr/lib/systemd/system/nginx.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nginx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nginx.service endef define NGINX_INSTALL_INIT_SYSV
package/nss-pam-ldapd/nss-pam-ldapd.mk +0 -3
@@ -29,9 +29,6 @@ endif define NSS_PAM_LDAPD_INSTALL_INIT_SYSTEMD $(INSTALL) -m 644 -D package/nss-pam-ldapd/nslcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/nslcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/nslcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nslcd.service endef define NSS_PAM_LDAPD_INSTALL_INIT_SYSV
package/ntp/ntp.mk +0 -3
@@ -108,9 +108,6 @@ endef define NTP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ntp/ntpd.service $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef endif
package/olsr/olsr.mk +0 -3
@@ -43,9 +43,6 @@ endef define OLSR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/olsr/olsr.service \ $(TARGET_DIR)/usr/lib/systemd/system/olsr.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/olsr.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/olsr.service endef $(eval $(generic-package))
package/openntpd/openntpd.mk +0 -3
@@ -24,9 +24,6 @@ OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread" define OPENNTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/openntpd/ntpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef define OPENNTPD_INSTALL_INIT_SYSV
package/openssh/openssh.mk +0 -3
@@ -74,9 +74,6 @@ endif define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sshd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS) endef
package/openvmtools/openvmtools.mk +0 -3
@@ -72,9 +72,6 @@ endef define OPENVMTOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openvmtools/vmtoolsd.service \ $(TARGET_DIR)/usr/lib/systemd/system/vmtoolsd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/vmtoolsd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vmtoolsd.service endef $(eval $(autotools-package))
package/oracle-mysql/oracle-mysql.mk +0 -3
@@ -116,9 +116,6 @@ endef define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef else
package/postgresql/postgresql.mk +0 -3
@@ -128,9 +128,6 @@ endef define POSTGRESQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/postgresql/postgresql.service \ $(TARGET_DIR)/usr/lib/systemd/system/postgresql.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/postgresql.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/postgresql.service endef $(eval $(autotools-package))
package/proftpd/proftpd.mk +0 -3
@@ -123,9 +123,6 @@ endef define PROFTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/proftpd/proftpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/proftpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/proftpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service endef ifneq ($(BR2_PACKAGE_PROFTPD_BUFFER_SIZE),0)
package/psplash/psplash.mk +0 -6
@@ -13,15 +13,9 @@ PSPLASH_AUTORECONF = YES define PSPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-start.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/ $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-quit.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ endef $(eval $(autotools-package))
package/ptpd/ptpd.mk +0 -3
@@ -25,9 +25,6 @@ endef define PTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd/ptpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd.service endef $(eval $(generic-package))
package/ptpd2/ptpd2.mk +0 -3
@@ -32,9 +32,6 @@ endef define PTPD2_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd2/ptpd2.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd2.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd2.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd2.service endef $(eval $(autotools-package))
package/pulseaudio/pulseaudio.mk +0 -3
@@ -167,9 +167,6 @@ endef define PULSEAUDIO_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/pulseaudio/pulseaudio.service \ $(TARGET_DIR)/usr/lib/systemd/system/pulseaudio.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/pulseaudio.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/pulseaudio.service endef endif
package/python-web2py/python-web2py.mk +0 -3
@@ -57,9 +57,6 @@ endef define PYTHON_WEB2PY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/python-web2py/web2py.service \ $(TARGET_DIR)/usr/lib/systemd/system/web2py.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/web2py.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/web2py.service endef # www-data user and group are used for web2py. Because these user and group
package/rabbitmq-server/rabbitmq-server.mk +0 -5
@@ -36,11 +36,6 @@ endef define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/rabbitmq-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rabbitmq-server.service endef define RABBITMQ_SERVER_INSTALL_INIT_SYSV
package/redis/redis.mk +0 -3
@@ -49,9 +49,6 @@ endef define REDIS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/redis/redis.service \ $(TARGET_DIR)/usr/lib/systemd/system/redis.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/redis.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/redis.service endef $(eval $(generic-package))
package/rng-tools/rng-tools.mk +0 -3
@@ -37,9 +37,6 @@ endef define RNG_TOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rng-tools/rngd.service \ $(TARGET_DIR)/usr/lib/systemd/system/rngd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/rngd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rngd.service endef $(eval $(autotools-package))
package/rpcbind/rpcbind.mk +0 -3
@@ -27,9 +27,6 @@ define RPCBIND_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket endef define RPCBIND_INSTALL_INIT_SYSV
package/rygel/rygel.mk +0 -3
@@ -68,9 +68,6 @@ endef define RYGEL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rygel/rygel.service \ $(TARGET_DIR)/usr/lib/systemd/system/rygel.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/rygel.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rygel.service endef $(eval $(autotools-package))
package/sane-backends/sane-backends.mk +0 -6
@@ -66,14 +66,8 @@ endef define SANE_BACKENDS_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/sane-backends/saned.socket \ $(TARGET_DIR)/usr/lib/systemd/system/saned.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/socket.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned.socket \ - $(TARGET_DIR)/etc/systemd/system/socket.target.wants/saned.socket $(INSTALL) -m 0644 -D package/sane-backends/saned at .service \ $(TARGET_DIR)/usr/lib/systemd/system/saned at .service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned at .service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/saned at .service endef $(eval $(autotools-package))
package/supervisor/supervisor.mk +0 -3
@@ -26,9 +26,6 @@ endef define SUPERVISOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/supervisor/supervisord.service \ $(TARGET_DIR)/usr/lib/systemd/system/supervisord.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/supervisord.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/supervisord.service endef $(eval $(python-package))
package/suricata/suricata.mk +0 -3
@@ -132,9 +132,6 @@ endef define SURICATA_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/suricata/suricata.service \ $(TARGET_DIR)/usr/lib/systemd/system/suricata.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/suricata.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/suricata.service endef $(eval $(autotools-package))
package/sysklogd/sysklogd.mk +0 -5
@@ -30,11 +30,6 @@ define SYSKLOGD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/klogd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslogd.service - ln -sf ../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service endef $(eval $(autotools-package))
package/tcf-agent/tcf-agent.mk +0 -3
@@ -24,9 +24,6 @@ TCF_AGENT_CONF_OPTS = \ define TCF_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/tcf-agent.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tcf-agent.service endef define TCF_AGENT_INSTALL_INIT_SYSV
package/thttpd/thttpd.mk +0 -3
@@ -36,9 +36,6 @@ endef define THTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/thttpd/thttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/thttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/thttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/thttpd.service endef $(eval $(autotools-package))
package/ti-gfx/ti-gfx.mk +0 -3
@@ -196,9 +196,6 @@ define TI_GFX_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/scripts/ti-gfx $(INSTALL) -D -m 644 package/ti-gfx/ti-gfx.service \ $(TARGET_DIR)/usr/lib/systemd/system/ti-gfx.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ti-gfx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ti-gfx.service endef define TI_GFX_INSTALL_TARGET_CMDS
package/tinyhttpd/tinyhttpd.mk +0 -3
@@ -27,9 +27,6 @@ endef define TINYHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/tinyhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tinyhttpd.service endef $(eval $(generic-package))
package/triggerhappy/triggerhappy.mk +0 -3
@@ -41,9 +41,6 @@ endef define TRIGGERHAPPY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/triggerhappy/triggerhappy.service \ $(TARGET_DIR)/usr/lib/systemd/system/triggerhappy.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/triggerhappy.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/triggerhappy.service endef $(eval $(generic-package))
Signature · 1 line
2.24.0
PATCH v4 5/13 fix trivial cases, upstream-provided services
In reply to Jérémy RosenAll 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
--- package/audit/audit.mk | 4 ---- package/avahi/avahi.mk | 8 -------- package/bluez5_utils/bluez5_utils.mk | 8 -------- package/boinc/boinc.mk | 5 ----- package/docker-engine/docker-engine.mk | 3 --- package/fail2ban/fail2ban.mk | 3 --- package/gerbera/gerbera.mk | 6 ------ package/iputils/iputils.mk | 16 ---------------- package/lighttpd/lighttpd.mk | 6 ------ package/lldpd/lldpd.mk | 6 ------ package/mosquitto/mosquitto.mk | 3 --- package/nfs-utils/nfs-utils.mk | 16 ---------------- package/ofono/ofono.mk | 6 ------ package/pcsc-lite/pcsc-lite.mk | 6 ------ package/php/php.mk | 3 --- package/rsyslog/rsyslog.mk | 14 -------------- package/samba4/samba4.mk | 7 ------- package/squid/squid.mk | 3 --- package/sshguard/sshguard.mk | 3 --- package/systemd-bootchart/systemd-bootchart.mk | 6 ------ package/transmission/transmission.mk | 3 --- package/upmpdcli/upmpdcli.mk | 3 --- 22 files changed, 138 deletions(-)
package/audit/audit.mk +0 -4
@@ -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
package/avahi/avahi.mk +0 -8
@@ -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
package/bluez5_utils/bluez5_utils.mk +0 -8
@@ -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))
package/boinc/boinc.mk +0 -5
@@ -53,10 +53,5 @@ 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))
package/docker-engine/docker-engine.mk +0 -3
@@ -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
package/fail2ban/fail2ban.mk +0 -3
@@ -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, at 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
package/gerbera/gerbera.mk +0 -6
@@ -104,11 +104,5 @@ 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))
package/iputils/iputils.mk +0 -16
@@ -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))
package/lighttpd/lighttpd.mk +0 -6
@@ -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
package/lldpd/lldpd.mk +0 -6
@@ -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))
package/mosquitto/mosquitto.mk +0 -3
@@ -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
package/nfs-utils/nfs-utils.mk +0 -16
@@ -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
package/ofono/ofono.mk +0 -6
@@ -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
package/pcsc-lite/pcsc-lite.mk +0 -6
@@ -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))
package/php/php.mk +0 -3
@@ -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
package/rsyslog/rsyslog.mk +0 -14
@@ -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
package/samba4/samba4.mk +0 -7
@@ -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
package/squid/squid.mk +0 -3
@@ -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))
package/sshguard/sshguard.mk +0 -3
@@ -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))
package/systemd-bootchart/systemd-bootchart.mk +0 -6
@@ -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))
package/transmission/transmission.mk +0 -3
@@ -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
package/upmpdcli/upmpdcli.mk +0 -3
@@ -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
Signature · 1 line
2.24.0
PATCH v4 6/13 package/connman: adapt to preset-all
In reply to Jérémy Rosenconnman has two services
* connman.service which is the real daemon
* connman-wait-online.service which is a sync point for network-online.target
Only the first one was enabled. This adaptation enables both.
Not enabling connman-wait-online.service is probably a bug
--- package/connman/connman.mk | 6 ------ 1 file changed, 6 deletions(-)
package/connman/connman.mk +0 -6
@@ -32,12 +32,6 @@ define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef -define CONNMAN_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/connman.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service -endef - ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y) CONNMAN_LICENSE += , GPL-2.0+ (client) CONNMAN_CONF_OPTS += --enable-client
Signature · 1 line
2.24.0
PATCH v4 7/13 package/linuxptp adapt to preset-all
In reply to Jérémy Rosenlinuxptp has two services
* linuxptp.service : the actual daemon
* linuxptp-system-clock.service : sync the linux clock to the phc clock
The first was enabled, the second was not, we now enable both
The second has an incorrect (though harmless) WantedBy : there is an explicit Wants= in linuxptp.service
--- package/linuxptp/linuxptp-system-clock.service | 1 - package/linuxptp/linuxptp.mk | 3 --- 2 files changed, 4 deletions(-)
package/linuxptp/linuxptp-system-clock.service +0 -1
@@ -8,4 +8,3 @@ Restart=always [Install] WantedBy=multi-user.target -WantedBy=linuxptp.service
package/linuxptp/linuxptp.mk +0 -3
@@ -42,9 +42,6 @@ define LINUXPTP_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/linuxptp.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/linuxptp.service endef $(eval $(generic-package))
Signature · 1 line
2.24.0
PATCH v4 8/13 package/network-manager: adapt to preset-all
In reply to Jérémy RosenNM has three services
* NetworkManger.service : the main daemon
* NetworkManger-dispatcher.service : a daemon handling network callbacks
* NetworkManager-wait-online.service : sync of other services with network-online
Only the first two were activated. We now also enable wait-online. Not enabling it was probably a bug.
Note that buildroot adds an alias dbus-org.freedesktop.NetworkManager Adding an alias that is not known upstream is not clean, but I left it for backward compatibility
--- package/network-manager/network-manager.mk | 7 ------- 1 file changed, 7 deletions(-)
package/network-manager/network-manager.mk +0 -7
@@ -88,16 +88,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSV endef define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/NetworkManager.service \ $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service endef $(eval $(autotools-package))
Signature · 1 line
2.24.0
PATCH v4 9/13 package/wpa_supplicant: adapt for preset-all
In reply to Jérémy Rosenall services were installed but not enabled.
This change enables the non-templated service
but disables the templated ones
Enabling the templates creates weird links which are probably an upstream bug.
--- package/wpa_supplicant/50-wpa_supplicant.preset | 4 ++++ package/wpa_supplicant/wpa_supplicant.mk | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset
package/wpa_supplicant/50-wpa_supplicant.preset new file +4 -0
@@ -0,0 +1,4 @@ +disable wpa_supplicant at .service +disable wpa_supplicant-nl80211 at .service +disable wpa_supplicant-wired at .service +
package/wpa_supplicant/wpa_supplicant.mk +2 -0
@@ -227,6 +227,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211 at .service $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired at .service \ $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired at .service + $(INSTALL) -D -m 644 $(WPA_SUPPLICANT_PKGDIR)/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package))
Signature · 1 line
2.24.0
PATCH v4 10/13 package/sysrepo: update to new systemd
In reply to Jérémy Rosensysrepo provides it's own services so just remove the section
Also fix sysrepo not installing the files in the correct directory
--- package/sysrepo/sysrepo.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
package/sysrepo/sysrepo.mk +1 -9
@@ -24,7 +24,7 @@ SYSREPO_CONF_OPTS = \ -DCALL_SYSREPOCFG_BIN=$(HOST_DIR)/bin/sysrepocfg \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ $(if $(BR2_INIT_SYSTEMD),-DWITH_SYSTEMD=ON) \ - $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=usr/lib/systemd/system) + $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=/usr/lib/systemd/system) # On ARM, this is needed to prevent unaligned memory access with an optimized # build .. https://github.com/sysrepo/sysrepo/issues/947
@@ -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 \
Signature · 1 line
2.24.0
PATCH v4 11/13 package/syslog-ng: implement default using DefaultInstance
In reply to Jérémy RosenInstead of using a manual symlink we use add a DefaultInstance= to the config file
This is how upstream wants us to do it and allows systemctl preset to correctly restore it if needed
--- package/syslog-ng/syslog-ng.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
package/syslog-ng/syslog-ng.mk +2 -5
@@ -105,11 +105,8 @@ endef # By default syslog-ng installs a .service that requires a config file at # /etc/default, so provide one with the default values. define SYSLOG_NG_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/syslog-ng/syslog-ng at default \ - $(TARGET_DIR)/etc/default/syslog-ng at default - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslog-ng at .service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog-ng at default.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d;\ + printf '[Install]\nDefaultInstance=default\n' > $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d/buildroot-default-instance.conf; endef # By default syslog-ng installs a number of sample configuration
Signature · 1 line
2.24.0
PATCH v4 12/13 package/rauc: add a WantedBy section to the unit
In reply to Jérémy Rosenupstream-provided service has no WantedBy, which means that rauc won't be enabled by default
Add a WantedBy instead of manually creating the symlink so the user can enable/disable the unit properly
--- package/rauc/rauc.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
package/rauc/rauc.mk +2 -3
@@ -31,9 +31,8 @@ RAUC_DEPENDENCIES += systemd endif define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/rauc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rauc.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf; endef HOST_RAUC_DEPENDENCIES = \
Signature · 1 line
2.24.0
PATCH v4 13/13 package/alsa-utils: add a WantedBy section to the unit
In reply to Jérémy RosenThis allows the user to enable/disable manually the unit. It is enabled by default
--- package/alsa-utils/alsa-utils.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
package/alsa-utils/alsa-utils.mk +4 -5
@@ -90,11 +90,10 @@ define ALSA_UTILS_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service $(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \ $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/sound.target.wants - ln -sf ../../../../lib/systemd/system/alsa-restore.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-restore.service - ln -sf ../../../../lib/systemd/system/alsa-state.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-state.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d/buildroot-enable.conf;\ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d/buildroot-enable.conf; endef endif
Signature · 1 line
2.24.0
v4 cover use host-systemd to enable units
In reply to Jérémy RosenHello J?r?my,
I have a very minor comment, no need to resend just for that: I'd like the commit titles to be a bit nicer. See below for some suggestions.
Quoted 2 lines · On Thu, 12 Dec 2019 08:53:47 +0100 J?r?my Rosen <[email protected]> wrote:
J?r?my Rosen (13):
new recipe : host-systemd
Should be:
package/systemd: add host variant
Quoted 1 line
use host-systemctl preset all to enable units
package/systemd: use host-systemctl preset-all to enable units
Quoted 1 line
fix tty handling
package/systemd: fix tty handling
Quoted 1 line
fix trivial packages with buildroot-provided services
package: rely on systemctl preset-all for buildroot-provided services
Quoted 1 line
fix trivial cases, upstream-provided services
package: rely on systemctl preset-all for upstream-provided services
Quoted 1 line
package/connman: adapt to preset-all
package/commman: adapt to systemctl preset-all
Quoted 3 lines
package/linuxptp adapt to preset-all
package/network-manager: adapt to preset-all
package/wpa_supplicant: adapt for preset-all
Ditto for those ones.
Quoted 4 lines
package/sysrepo: update to new systemd package/syslog-ng: implement default using DefaultInstance package/rauc: add a WantedBy section to the unit package/alsa-utils: add a WantedBy section to the unit
In those last three ones, perhaps have "systemd" somewhere in the commit title.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com