summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 14:28:37 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:23:58 +0200
commitb3e35cfe505a0cde32086940943c27125a4014d2 (patch)
tree68c543298cd98abccf50bee46dea1f15e44088cc /rules
parent72fec7a083bfbf377877f0b5dc790c3f4a720783 (diff)
downloadptxdist-b3e35cfe505a0cde32086940943c27125a4014d2.tar.gz
ptxdist-b3e35cfe505a0cde32086940943c27125a4014d2.tar.xz
[portmap] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/initmethod-bbinit.in6
-rw-r--r--rules/initmethod-bbinit.make6
-rw-r--r--rules/portmap-bbinit.in8
-rw-r--r--rules/portmap.make6
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 2f3b2078d..e7d652005 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -83,12 +83,6 @@ config INITMETHOD_BBINIT_LINK_HWCLOCK
prompt "hwclock"
default "S12hwclock"
-config INITMETHOD_BBINIT_LINK_PORTMAP
- string
- depends on PORTMAP_STARTSCRIPT
- prompt "portmap"
- default ""
-
config INITMETHOD_BBINIT_LINK_PPPD
string
depends on PPP_STARTSCRIPT
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index 48ad22e9f..30dc78af2 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -161,12 +161,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK)),)
/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK))
endif
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_PORTMAP)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/portmapd, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_PORTMAP))
-endif
-
ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_PPPD)),)
@$(call install_link, initmethod-bbinit, \
../init.d/pppd, \
diff --git a/rules/portmap-bbinit.in b/rules/portmap-bbinit.in
new file mode 100644
index 000000000..dfd023ebf
--- /dev/null
+++ b/rules/portmap-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config PORTMAP_BBINIT_LINK
+ string
+ depends on PORTMAP_STARTSCRIPT
+ prompt "portmap"
+ default ""
+
diff --git a/rules/portmap.make b/rules/portmap.make
index 46643728b..6ff518350 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -65,6 +65,12 @@ $(STATEDIR)/portmap.targetinstall:
ifdef PTXCONF_INITMETHOD_BBINIT
ifdef PTXCONF_PORTMAP_STARTSCRIPT
@$(call install_alternative, portmap, 0, 0, 0755, /etc/init.d/portmapd, n)
+
+ifneq ($(call remove_quotes,$(PTXCONF_PORTMAP_BBINIT_LINK)),)
+ @$(call install_link, portmap, \
+ ../init.d/portmapd, \
+ /etc/rc.d/$(PTXCONF_PORTMAP_BBINIT_LINK))
+endif
endif
endif