[ptxdist] [patch 1/1] Add telnetd startup script to busy box init

2009-06-10 Thread Bart vd. Meulen
Telnetd startup script was not correctly installed when UTELNETD_STARTSCRIPT
was selected in the configuration

Signed-off-by: Bart vd. Meulen bartvdrmeu...@gmail.com
---
 rules/initmethod-bbinit.in |2 +-
 rules/utelnetd.make|8 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

Index: ptxdist-trunk/rules/initmethod-bbinit.in
===
--- ptxdist-trunk.orig/rules/initmethod-bbinit.in   2009-06-10 
10:31:15.0 +0200
+++ ptxdist-trunk/rules/initmethod-bbinit.in2009-06-10 10:33:09.0 
+0200
@@ -199,7 +199,7 @@ config INITMETHOD_BBINIT_LINK_SYSLOG_NG
 
 config INITMETHOD_BBINIT_LINK_TELNETD
string
-   depends on BUSYBOX_TELNETD_STARTSCRIPT
+   depends on BUSYBOX_TELNETD_STARTSCRIPT || UTELNETD_STARTSCRIPT
prompt telnetd
default S16telnetd
 
Index: ptxdist-trunk/rules/utelnetd.make
===
--- ptxdist-trunk.orig/rules/utelnetd.make  2009-06-10 10:31:15.0 
+0200
+++ ptxdist-trunk/rules/utelnetd.make   2009-06-10 10:33:09.0 +0200
@@ -72,14 +72,8 @@ $(STATEDIR)/utelnetd.targetinstall:
$(UTELNETD_DIR)/utelnetd, \
/sbin/utelnetd)
 
-   #
-   # busybox init
-   #
-
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_UTELNETD_STARTSCRIPT
-   @$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/telnetd, 
n)
-endif
+   @$(call install_alternative, utelnetd, 0, 0, 0755, /etc/init.d/telnetd, 
n)
 endif
 
@$(call install_finish, utelnetd)

-- 



--
ptxdist mailing list
ptxdist@pengutronix.de


[ptxdist] [patch 1/1] Fix the AT91 Bootstrap targetinstall phase.

2009-06-10 Thread Bart vd. Meulen
Fix merge error while integrating AT91 bootstrap patches

Signed-off-by: Bart vd. Meulen bartvdrmeu...@gmail.com
---
 rules/at91bootstrap.make |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ptxdist-trunk/rules/at91bootstrap.make
===
--- ptxdist-trunk.orig/rules/at91bootstrap.make 2009-06-10 10:31:15.0 
+0200
+++ ptxdist-trunk/rules/at91bootstrap.make  2009-06-10 10:57:27.0 
+0200
@@ -76,7 +76,7 @@ $(STATEDIR)/at91bootstrap.install:
 
 $(STATEDIR)/at91bootstrap.targetinstall:
@$(call targetinfo)
-   @cp 
$(AT91BOOTSTRAP_BOARDDIR)/$(AT91BOOTSTRAP_BOOTMEDIA)_${PTXCONF_AT91BOOTSTRAP_CONFIG}.bin
 \
+   @cp 
$(AT91BOOTSTRAP_BOARDDIR)/$(AT91BOOTSTRAP_BOOTMEDIA-y)_${PTXCONF_AT91BOOTSTRAP_CONFIG}.bin
 \
$(IMAGEDIR)/at91bootstrap.bin
@$(call touch)
 

-- 


This message and attachment(s) are intended solely for use by the addressee and 
may contain information that is privileged, confidential or otherwise exempt 
from disclosure under applicable law.

If you are not the intended recipient or agent thereof responsible for 
delivering this message to the intended recipient, you are hereby notified that 
any dissemination, distribution or copying of this communication is strictly 
prohibited.

If you have received this communication in error, please notify the sender 
immediately by telephone and with a 'reply' message.

Thank you for your co-operation.



--
ptxdist mailing list
ptxdist@pengutronix.de


[ptxdist] [patch 1/1] Prevent multiple sysctl implementations being active at the same time

2009-06-10 Thread Bart vd. Meulen
Both busy-box sysctl as procps sysctl could be selected due to difference in
config names

Signed-off-by: Bart vd. Meulen bartvdrmeu...@gmail.com

---
 rules/procps.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Index: ptxdist-trunk/rules/procps.in
===
--- ptxdist-trunk.orig/rules/procps.in  2009-06-10 11:41:26.0 +0200
+++ ptxdist-trunk/rules/procps.in   2009-06-10 11:41:44.0 +0200
@@ -32,12 +32,12 @@ config PROCPS_SLABTOP
 config PROCPS_SYSCTL
bool
prompt sysctl
-   depends on !BUSYBOX_SYSCTL || ALLYES
+   depends on !BUSYBOX_BB_SYSCTL || ALLYES
help
  configure kernel parameters at runtime
 
 comment sysctl is disabled by busybox sysctl
-   depends on BUSYBOX_SYSCTL
+   depends on BUSYBOX_BB_SYSCTL
 
 config PROCPS_PS
bool

-- 


This message and attachment(s) are intended solely for use by the addressee and 
may contain information that is privileged, confidential or otherwise exempt 
from disclosure under applicable law.

If you are not the intended recipient or agent thereof responsible for 
delivering this message to the intended recipient, you are hereby notified that 
any dissemination, distribution or copying of this communication is strictly 
prohibited.

If you have received this communication in error, please notify the sender 
immediately by telephone and with a 'reply' message.

Thank you for your co-operation.



--
ptxdist mailing list
ptxdist@pengutronix.de


[ptxdist] [patch 1/1] Add telnetd startup script to busy box init

2009-06-10 Thread Bart vd. Meulen
Telnetd startup script was not correctly installed when UTELNETD_STARTSCRIPT
was selected in the configuration

Signed-off-by: Bart vd. Meulen bartvdrmeu...@gmail.com
---
 rules/initmethod-bbinit.in |2 +-
 rules/utelnetd.make|8 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

Index: ptxdist-trunk/rules/initmethod-bbinit.in
===
--- ptxdist-trunk.orig/rules/initmethod-bbinit.in   2009-06-10 
10:31:15.0 +0200
+++ ptxdist-trunk/rules/initmethod-bbinit.in2009-06-10 10:33:09.0 
+0200
@@ -199,7 +199,7 @@ config INITMETHOD_BBINIT_LINK_SYSLOG_NG
 
 config INITMETHOD_BBINIT_LINK_TELNETD
string
-   depends on BUSYBOX_TELNETD_STARTSCRIPT
+   depends on BUSYBOX_TELNETD_STARTSCRIPT || UTELNETD_STARTSCRIPT
prompt telnetd
default S16telnetd
 
Index: ptxdist-trunk/rules/utelnetd.make
===
--- ptxdist-trunk.orig/rules/utelnetd.make  2009-06-10 10:31:15.0 
+0200
+++ ptxdist-trunk/rules/utelnetd.make   2009-06-10 10:33:09.0 +0200
@@ -72,14 +72,8 @@ $(STATEDIR)/utelnetd.targetinstall:
$(UTELNETD_DIR)/utelnetd, \
/sbin/utelnetd)
 
-   #
-   # busybox init
-   #
-
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_UTELNETD_STARTSCRIPT
-   @$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/telnetd, 
n)
-endif
+   @$(call install_alternative, utelnetd, 0, 0, 0755, /etc/init.d/telnetd, 
n)
 endif
 
@$(call install_finish, utelnetd)

-- 


This message and attachment(s) are intended solely for use by the addressee and 
may contain information that is privileged, confidential or otherwise exempt 
from disclosure under applicable law.

If you are not the intended recipient or agent thereof responsible for 
delivering this message to the intended recipient, you are hereby notified that 
any dissemination, distribution or copying of this communication is strictly 
prohibited.

If you have received this communication in error, please notify the sender 
immediately by telephone and with a 'reply' message.

Thank you for your co-operation.



--
ptxdist mailing list
ptxdist@pengutronix.de