summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 14:43:13 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:24:00 +0200
commit91ff539bf909ede180ba24ecfc606a27f5192e47 (patch)
tree0ae51b04531fc4c60df69f359241c645d09356ad
parentc43987e7ab0f9921f7622b8c6b2ce07d3ae5d1df (diff)
downloadptxdist-91ff539bf909ede180ba24ecfc606a27f5192e47.tar.gz
ptxdist-91ff539bf909ede180ba24ecfc606a27f5192e47.tar.xz
[udev] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/initmethod-bbinit.in6
-rw-r--r--rules/initmethod-bbinit.make6
-rw-r--r--rules/udev-bbinit.in8
-rw-r--r--rules/udev.make6
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 95d2d42f2..0b864177f 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -89,12 +89,6 @@ config INITMETHOD_BBINIT_LINK_TELNETD
prompt "telnetd"
default "S16telnetd"
-config INITMETHOD_BBINIT_LINK_UDEV
- string
- depends on UDEV_STARTSCRIPT
- prompt "udev"
- default "S00udev"
-
config INITMETHOD_BBINIT_LINK_BANNER
string
depends on INITMETHOD_BBINIT_ETC_INITD_BANNER
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index 825aaac80..c035e4b8d 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -167,12 +167,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_TELNETD)),)
/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_TELNETD))
endif
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_UDEV)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/udev, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_UDEV))
-endif
-
ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_BANNER)),)
@$(call install_link, initmethod-bbinit, \
../init.d/banner, \
diff --git a/rules/udev-bbinit.in b/rules/udev-bbinit.in
new file mode 100644
index 000000000..66fadcc92
--- /dev/null
+++ b/rules/udev-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config UDEV_BBINIT_LINK
+ string
+ depends on UDEV_STARTSCRIPT
+ prompt "udev"
+ default "S00udev"
+
diff --git a/rules/udev.make b/rules/udev.make
index 9f39fcbe1..b07ee03f1 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -204,6 +204,12 @@ endif
ifdef PTXCONF_UDEV_STARTSCRIPT
ifdef PTXCONF_INITMETHOD_BBINIT
@$(call install_alternative, udev, 0, 0, 0755, /etc/init.d/udev)
+
+ifneq ($(call remove_quotes,$(PTXCONF_UDEV_BBINIT_LINK)),)
+ @$(call install_link, udev, \
+ ../init.d/udev, \
+ /etc/rc.d/$(PTXCONF_UDEV_BBINIT_LINK))
+endif
endif
ifdef PTXCONF_INITMETHOD_UPSTART
@$(call install_alternative, udev, 0, 0, 0644, /etc/init/udev.conf)