diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-09 15:30:47 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:18:29 +0200 |
| commit | e74c5e613d9e1a7e3813a5fd830dac5758f4462b (patch) | |
| tree | 1de99c564ea59c265dd91d2c68ce3476f54d2629 | |
| parent | af61cd8e8f790adaef66b1fd7f4e9e4bb431f076 (diff) | |
| download | ptxdist-e74c5e613d9e1a7e3813a5fd830dac5758f4462b.tar.gz ptxdist-e74c5e613d9e1a7e3813a5fd830dac5758f4462b.tar.xz | |
rc-once: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | projectroot/usr/lib/init/rc-once.sh (renamed from projectroot/lib/init/rc-once.sh) | 0 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/rc-once.service (renamed from projectroot/lib/systemd/system/rc-once.service) | 0 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/systemd-rc-once (renamed from projectroot/lib/systemd/systemd-rc-once) | 0 | ||||
| -rw-r--r-- | projectroot/usr/sbin/enable-rc-once (renamed from projectroot/sbin/enable-rc-once) | 2 | ||||
| -rw-r--r-- | rules/rc-once.make | 10 | ||||
| -rw-r--r-- | rules/rc-once.postinst | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/projectroot/lib/init/rc-once.sh b/projectroot/usr/lib/init/rc-once.sh index 8689a32bc..8689a32bc 100644 --- a/projectroot/lib/init/rc-once.sh +++ b/projectroot/usr/lib/init/rc-once.sh diff --git a/projectroot/lib/systemd/system/rc-once.service b/projectroot/usr/lib/systemd/system/rc-once.service index 78f6f4c48..78f6f4c48 100644 --- a/projectroot/lib/systemd/system/rc-once.service +++ b/projectroot/usr/lib/systemd/system/rc-once.service diff --git a/projectroot/lib/systemd/systemd-rc-once b/projectroot/usr/lib/systemd/systemd-rc-once index ff7f7d3dc..ff7f7d3dc 100644 --- a/projectroot/lib/systemd/systemd-rc-once +++ b/projectroot/usr/lib/systemd/systemd-rc-once diff --git a/projectroot/sbin/enable-rc-once b/projectroot/usr/sbin/enable-rc-once index d95c6cb4b..892b1df44 100644 --- a/projectroot/sbin/enable-rc-once +++ b/projectroot/usr/sbin/enable-rc-once @@ -4,7 +4,7 @@ if [ -n "$1" ]; then fi rm -f "$DESTDIR/etc/rc.once.d/.done/rc-once" -if [ -f "$DESTDIR/lib/systemd/system/rc-once.service" ]; then +if [ -f "$DESTDIR/usr/lib/systemd/system/rc-once.service" ]; then if [ ! -e $DESTDIR/system-update ]; then ln -sf etc/rc.once.d $DESTDIR/system-update fi diff --git a/rules/rc-once.make b/rules/rc-once.make index dbee7d8d1..f452258af 100644 --- a/rules/rc-once.make +++ b/rules/rc-once.make @@ -32,8 +32,8 @@ $(STATEDIR)/rc-once.targetinstall: @$(call install_fixup, rc-once, AUTHOR, "Michael Olbrich <m.olbrich@pengutronix.de>") @$(call install_fixup, rc-once, DESCRIPTION, missing) - @$(call install_alternative, rc-once, 0, 0, 0644, /lib/init/rc-once.sh) - @$(call install_alternative, rc-once, 0, 0, 0755, /sbin/enable-rc-once) + @$(call install_alternative, rc-once, 0, 0, 0644, /usr/lib/init/rc-once.sh) + @$(call install_alternative, rc-once, 0, 0, 0755, /usr/sbin/enable-rc-once) ifdef PTXCONF_INITMETHOD_BBINIT @$(call install_alternative, rc-once, 0, 0, 0755, /etc/init.d/rc-once) @@ -46,12 +46,12 @@ endif endif ifdef PTXCONF_INITMETHOD_SYSTEMD @$(call install_alternative, rc-once, 0, 0, 0755, \ - /lib/systemd/systemd-rc-once) + /usr/lib/systemd/systemd-rc-once) @$(call install_alternative, rc-once, 0, 0, 0644, \ - /lib/systemd/system/rc-once.service) + /usr/lib/systemd/system/rc-once.service) @$(call install_link, rc-once, ../rc-once.service, \ - /lib/systemd/system/system-update.target.wants/rc-once.service) + /usr/lib/systemd/system/system-update.target.wants/rc-once.service) endif @$(call install_copy, rc-once, 0, 0, 0755, /etc/rc.once.d) diff --git a/rules/rc-once.postinst b/rules/rc-once.postinst index 900cd4297..f970daab4 100644 --- a/rules/rc-once.postinst +++ b/rules/rc-once.postinst @@ -1,2 +1,2 @@ #!/bin/sh -$DESTDIR/sbin/enable-rc-once +$DESTDIR/usr/sbin/enable-rc-once |