diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 15:05:26 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:24:01 +0200 |
commit | 9eb68dfafbaa859e57d831ed69a25e8225e16654 (patch) | |
tree | 2f912f791b4cb0370f68d75ceab7d2ab189a7e90 | |
parent | 91ff539bf909ede180ba24ecfc606a27f5192e47 (diff) | |
download | ptxdist-9eb68dfafbaa859e57d831ed69a25e8225e16654.tar.gz ptxdist-9eb68dfafbaa859e57d831ed69a25e8225e16654.tar.xz |
[acpid] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/acpid-bbinit.in | 8 | ||||
-rw-r--r-- | rules/acpid.make | 6 | ||||
-rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
-rw-r--r-- | rules/initmethod-bbinit.make | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/rules/acpid-bbinit.in b/rules/acpid-bbinit.in new file mode 100644 index 000000000..d1b1187c6 --- /dev/null +++ b/rules/acpid-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config ACPID_BBINIT_LINK + string + depends on ACPID_STARTSCRIPT + prompt "acpid" + default "S10acpid" + diff --git a/rules/acpid.make b/rules/acpid.make index dc5dafcd6..9e44f89cb 100644 --- a/rules/acpid.make +++ b/rules/acpid.make @@ -62,6 +62,12 @@ endif ifdef PTXCONF_ACPID_STARTSCRIPT @$(call install_alternative, acpid, 0, 0, 0755, /etc/init.d/acpid) + +ifneq ($(call remove_quotes,$(PTXCONF_ACPID_BBINIT_LINK)),) + @$(call install_link, acpid, \ + ../init.d/acpid, \ + /etc/rc.d/$(PTXCONF_ACPID_BBINIT_LINK)) +endif endif @$(call install_finish, acpid) diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 0b864177f..e45b9616b 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -113,12 +113,6 @@ config INITMETHOD_BBINIT_LINK_NETWORKING prompt "networking" default "S26networking" -config INITMETHOD_BBINIT_ACPID - string - depends on ACPID_STARTSCRIPT - prompt "acpid" - default "S10acpid" - config INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH string depends on INITMETHOD_BBINIT_ETC_INITD_RT_SET_BANDWIDTH diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index c035e4b8d..697945bb8 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -191,14 +191,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_NETWORKING)),) /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_NETWORKING)) endif -ifdef PTXCONF_ARCH_X86 -ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_ACPID)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/acpid, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_ACPID)) -endif -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH)),) @$(call install_link, initmethod-bbinit, \ ../init.d/rt-set-bandwidth, \ |