diff options
-rw-r--r-- | rules/alsa-utils-bbinit.in | 8 | ||||
-rw-r--r-- | rules/alsa-utils.make | 5 | ||||
-rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
-rw-r--r-- | rules/initmethod-bbinit.make | 5 |
4 files changed, 13 insertions, 11 deletions
diff --git a/rules/alsa-utils-bbinit.in b/rules/alsa-utils-bbinit.in new file mode 100644 index 000000000..89310dac4 --- /dev/null +++ b/rules/alsa-utils-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config ALSA_UTILS_BBINIT_LINK + string + depends on ALSA_UTILS_STARTSCRIPT + prompt "alsa-utils" + default "S21alsa-utils" + diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index eeaaddc0f..3402a9f24 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -94,6 +94,11 @@ endif ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_ALSA_UTILS_STARTSCRIPT @$(call install_alternative, alsa-utils, 0, 0, 0755, /etc/init.d/alsa-utils, n) +ifneq ($(call remove_quotes,$(PTXCONF_ALSA_UTILS_BBINIT_LINK)),) + @$(call install_link, alsa-utils, \ + ../init.d/alsa-utils, \ + /etc/rc.d/$(PTXCONF_ALSA_UTILS_BBINIT_LINK)) +endif endif endif diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 6b7dd5c6c..c539e08ba 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -59,12 +59,6 @@ menu "service startup configuration " source "generated/initmethod_bbinit.in" -config INITMETHOD_BBINIT_LINK_ALSA_UTILS - string - depends on ALSA_UTILS_STARTSCRIPT - prompt "alsa-utils" - default "S21alsa-utils" - config INITMETHOD_BBINIT_LINK_APACHE2 string depends on APACHE2_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 20cb02810..85e390918 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -136,11 +136,6 @@ endif # # # # collect start links # # -ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_ALSA_UTILS)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/alsa-utils, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_ALSA_UTILS)) -endif ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_APACHE2)),) @$(call install_link, initmethod-bbinit, \ |