[oe] [PATCH][meta-networking] ypbind-mt: set path of ypdomainname in ypbind script

2015-11-01 Thread wenzong.fan 
From: Jian Liu 

The script ypbind will cause error if using ypdomainname command
provided by busybox. So add RDEPENDCY on yp-tools and change
the path of ypdomainname.

Signed-off-by: Jian Liu 
Signed-off-by: Wenzong Fan 
---
 meta-networking/recipes-support/nis/files/ypbind.init | 11 ++-
 meta-networking/recipes-support/nis/ypbind-mt_1.38.bb |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-support/nis/files/ypbind.init 
b/meta-networking/recipes-support/nis/files/ypbind.init
index 244dc78..669c19c 100644
--- a/meta-networking/recipes-support/nis/files/ypbind.init
+++ b/meta-networking/recipes-support/nis/files/ypbind.init
@@ -26,6 +26,7 @@
 
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
+YPDOMAINNAME_bin=/usr/bin/ypdomainname
 
 [ -f /etc/default/ypbind ] && . /etc/default/ypbind
 
@@ -34,14 +35,14 @@ case "$1" in
echo -n "Starting ypbind"
## If the domainname is not set, skip starting of ypbind
## and return with "program not configured"
-/bin/ypdomainname >/dev/null 2>&1
-if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+$YPDOMAINNAME_bin >/dev/null 2>&1
+if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
if [ -f /etc/defaultdomain ]; then
  XDOMAINNAME=`cat /etc/defaultdomain`
- /bin/ypdomainname "$XDOMAINNAME"
+ $YPDOMAINNAME_bin "$XDOMAINNAME"
   fi
-   /bin/ypdomainname >/dev/null 2>&1
-   if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+   $YPDOMAINNAME_bin >/dev/null 2>&1
+   if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
 # Tell the user this has skipped
 echo -n " . . . . . . . . . . No domainname set"
  # service is not configured
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index 5702cd6..d113b82 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -21,6 +21,8 @@ DEPENDS = " \
yp-tools \
${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
   "
+RDEPENDS_${PN} += "yp-tools"
+
 # ypbind-mt now provides all the functionality of ypbind
 # and is used in place of it.
 PROVIDES += "ypbind"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [PATCH][meta-networking] ypbind-mt: set path of ypdomainname in ypbind script

2015-07-08 Thread Martin Jansa 
On Wed, Jul 08, 2015 at 11:21:14AM +0800, Jian Liu wrote:
> The script ypbind will cause error if using ypdomainname command
> provided by busybox. So add RDEPENDCY on yp-tools and change
> the path of ypdomainname.

Missing meta-networking/ prefix

> Signed-off-by: Jian Liu 
> ---
>  recipes-support/nis/files/ypbind-yocto.init | 11 ++-
>  recipes-support/nis/ypbind-mt_1.36.bb   |  1 +
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes-support/nis/files/ypbind-yocto.init 
> b/recipes-support/nis/files/ypbind-yocto.init
> index da533a1..f97a3e1 100644
> --- a/recipes-support/nis/files/ypbind-yocto.init
> +++ b/recipes-support/nis/files/ypbind-yocto.init
> @@ -26,6 +26,7 @@
>  
>  YPBIND_BIN=/usr/sbin/ypbind
>  pidfile=/var/run/ypbind.pid
> +YPDOMAINNAME_bin=/usr/bin/ypdomainname
>  
>  [ -f /etc/default/ypbind ] && . /etc/default/ypbind
>  
> @@ -34,14 +35,14 @@ case "$1" in
>   echo -n "Starting ypbind"
>   ## If the domainname is not set, skip starting of ypbind
>   ## and return with "program not configured"
> -/bin/ypdomainname &> /dev/null
> -if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
> +$YPDOMAINNAME_bin &> /dev/null
> +if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
> if [ -f /etc/defaultdomain ]; then
>   XDOMAINNAME=`cat /etc/defaultdomain`
> - /bin/ypdomainname "$XDOMAINNAME"
> + $YPDOMAINNAME_bin "$XDOMAINNAME"
>  fi
> -   /bin/ypdomainname &> /dev/null
> -   if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
> +   $YPDOMAINNAME_bin &> /dev/null
> +   if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
># Tell the user this has skipped
>echo -n " . . . . . . . . . . No domainname set"
>   # service is not configured
> diff --git a/recipes-support/nis/ypbind-mt_1.36.bb 
> b/recipes-support/nis/ypbind-mt_1.36.bb
> index 35ef16a..4fdef9f 100644
> --- a/recipes-support/nis/ypbind-mt_1.36.bb
> +++ b/recipes-support/nis/ypbind-mt_1.36.bb
> @@ -50,3 +50,4 @@ RPROVIDES_${PN} += "${PN}-systemd"
>  RREPLACES_${PN} += "${PN}-systemd"
>  RCONFLICTS_${PN} += "${PN}-systemd"
>  SYSTEMD_SERVICE_${PN} = "ypbind.service"
> +RDEPENDS_${PN} += "yp-tools"
> -- 
> 1.8.5.2.233.g932f7e4
> 
> -- 
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com


signature.asc
Description: Digital signature
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] ypbind-mt: set path of ypdomainname in ypbind script

2015-07-07 Thread Jian Liu 
The script ypbind will cause error if using ypdomainname command
provided by busybox. So add RDEPENDCY on yp-tools and change
the path of ypdomainname.

Signed-off-by: Jian Liu 
---
 recipes-support/nis/files/ypbind-yocto.init | 11 ++-
 recipes-support/nis/ypbind-mt_1.36.bb   |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes-support/nis/files/ypbind-yocto.init 
b/recipes-support/nis/files/ypbind-yocto.init
index da533a1..f97a3e1 100644
--- a/recipes-support/nis/files/ypbind-yocto.init
+++ b/recipes-support/nis/files/ypbind-yocto.init
@@ -26,6 +26,7 @@
 
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
+YPDOMAINNAME_bin=/usr/bin/ypdomainname
 
 [ -f /etc/default/ypbind ] && . /etc/default/ypbind
 
@@ -34,14 +35,14 @@ case "$1" in
echo -n "Starting ypbind"
## If the domainname is not set, skip starting of ypbind
## and return with "program not configured"
-/bin/ypdomainname &> /dev/null
-if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+$YPDOMAINNAME_bin &> /dev/null
+if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
if [ -f /etc/defaultdomain ]; then
  XDOMAINNAME=`cat /etc/defaultdomain`
- /bin/ypdomainname "$XDOMAINNAME"
+ $YPDOMAINNAME_bin "$XDOMAINNAME"
   fi
-   /bin/ypdomainname &> /dev/null
-   if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
+   $YPDOMAINNAME_bin &> /dev/null
+   if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
 # Tell the user this has skipped
 echo -n " . . . . . . . . . . No domainname set"
  # service is not configured
diff --git a/recipes-support/nis/ypbind-mt_1.36.bb 
b/recipes-support/nis/ypbind-mt_1.36.bb
index 35ef16a..4fdef9f 100644
--- a/recipes-support/nis/ypbind-mt_1.36.bb
+++ b/recipes-support/nis/ypbind-mt_1.36.bb
@@ -50,3 +50,4 @@ RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "ypbind.service"
+RDEPENDS_${PN} += "yp-tools"
-- 
1.8.5.2.233.g932f7e4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel