summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-10-03 11:31:54 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-10-03 11:31:54 +0100
commitcd1f400cb9b1312084527c8cd6f7198c9f36defe (patch)
tree2c373ebea60520f081d14413b00f84331d29c7ae
parentf63a82439d738c9c790102e737535a2572973750 (diff)
downloadbusybox-cd1f400cb9b1312084527c8cd6f7198c9f36defe.tar.gz
Attempt to rationalise service installation and linkage a little too
-rw-r--r--busybox.morph7
1 files changed, 3 insertions, 4 deletions
diff --git a/busybox.morph b/busybox.morph
index 572e3e5fb..17177c72e 100644
--- a/busybox.morph
+++ b/busybox.morph
@@ -51,14 +51,13 @@
],
"install-commands": [
"if [ \"$PREFIX\" = /usr ]; then PREFIX=; fi && make CONFIG_PREFIX=\"$DESTDIR$PREFIX\" install && chmod 6755 \"$DESTDIR$PREFIX\"/bin/busybox",
- "mkdir -p \"$DESTDIR/var/spool/cron/crontabs\"",
- "mkdir -p \"$DESTDIR/lib/systemd/system/\"",
+ "mkdir -p \"$DESTDIR/var/spool/cron/crontabs\"",
+ "mkdir -p \"$DESTDIR/lib/systemd/system/multi-user.target.wants\"",
"for f in systemd-units/*.service; do install -m 644 \"$f\" \"$DESTDIR/lib/systemd/system\"; done",
+ "for f in (cd systemd-units; ls *.service | grep -v -F \"@\"); do ln -s \"../$f\" \"$DESTDIR/lib/systemd/system/multi-user.target.wants/\"; done",
"mkdir -p \"$DESTDIR/lib/udev/rules.d\"",
"for f in udev-rules/100-baserock.rules; do install -m 644 \"$f\" \"$DESTDIR/lib/udev/rules.d\"; done",
"mkdir -p \"$DESTDIR$PREFIX\"/share/udhcpc",
- "mkdir -p \"$DESTDIR/etc/systemd/system/multi-user.target.wants\"",
- "ln -s $DESTDIR/lib/systemd/system/ntpd.service $DESTDIR/etc/systemd/system/multi-user.target.wants",
"cp examples/udhcp/simple.script \"$DESTDIR$PREFIX\"/share/udhcpc/default.script",
"cp scripts/ntpd-set.sh \"$DESTDIR$PREFIX\"/bin/ntpd-set.sh && chmod 6755 \"$DESTDIR$PREFIX\"/bin/ntpd-set.sh"
]