summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 11:02:29 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:19:50 +0200
commit5c7e5b48a39fea528573797e56cc9e6ab8f5abf2 (patch)
tree2b5414e29235735e9a00cc727e217c6325083611
parent4d3ab0abcb56a0c93572db357aed857ba0915dd6 (diff)
downloadptxdist-5c7e5b48a39fea528573797e56cc9e6ab8f5abf2.tar.gz
ptxdist-5c7e5b48a39fea528573797e56cc9e6ab8f5abf2.tar.xz
initmethod: /usr merge
move initmethod-bbinit-functions.sh Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-xprojectroot/usr/lib/init/initmethod-bbinit-functions.sh (renamed from projectroot/lib/init/initmethod-bbinit-functions.sh)0
-rw-r--r--rules/initmethod-bbinit.make2
-rw-r--r--rules/initmethod-systemd.make2
3 files changed, 2 insertions, 2 deletions
diff --git a/projectroot/lib/init/initmethod-bbinit-functions.sh b/projectroot/usr/lib/init/initmethod-bbinit-functions.sh
index 122e37883..122e37883 100755
--- a/projectroot/lib/init/initmethod-bbinit-functions.sh
+++ b/projectroot/usr/lib/init/initmethod-bbinit-functions.sh
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index b71e9a34b..f95baa579 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -42,7 +42,7 @@ $(STATEDIR)/initmethod-bbinit.targetinstall:
@CONSOLE@, $(PTXCONF_CONSOLE_NAME))
@$(call install_replace, initmethod-bbinit, /etc/inittab, \
@SPEED@, $(PTXCONF_CONSOLE_SPEED))
- @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, /lib/init/initmethod-bbinit-functions.sh)
+ @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, /usr/lib/init/initmethod-bbinit-functions.sh)
# #
# # start scripts
diff --git a/rules/initmethod-systemd.make b/rules/initmethod-systemd.make
index 9d8d992b3..3738076e6 100644
--- a/rules/initmethod-systemd.make
+++ b/rules/initmethod-systemd.make
@@ -29,7 +29,7 @@ $(STATEDIR)/initmethod-systemd.targetinstall:
@$(call install_fixup,initmethod-systemd,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup,initmethod-systemd,DESCRIPTION,missing)
- @$(call install_alternative, initmethod-systemd, 0, 0, 0755, /lib/init/initmethod-bbinit-functions.sh)
+ @$(call install_alternative, initmethod-systemd, 0, 0, 0755, /usr/lib/init/initmethod-bbinit-functions.sh)
ifdef PTXCONF_INITMETHOD_SYSTEMD_IFUPDOWN
@$(call install_alternative, initmethod-systemd, 0, 0, 0755, \