[meta-intel][PATCH] lms8: handle different host setups

[meta-intel][PATCH] lms8: handle different host setups

[Ross Burton]

The configure script looks at the *host* environment to decide where to install
the init script, so it's location at packaging time can change.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 common/recipes-bsp/amt/lms8_8.0.0-7.bb |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/recipes-bsp/amt/lms8_8.0.0-7.bb b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
index fbb4e45..65c413a 100644
--- a/common/recipes-bsp/amt/lms8_8.0.0-7.bb
+++ b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
@@ -26,7 +26,13 @@ INITSCRIPT_PARAMS = "defaults"
 do_install_append () {
 	mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms8
 	install -d ${D}${sysconfdir}/init.d
-	mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+	# The configure script looks at the host to decide where to put init
+	# scripts, so move it at the same time as renaming it.
+	if test -f ${D}${sysconfdir}/rc.d/init.d/lms ; then
+		mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+	else
+		mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+	fi
 	sed -i 's/^NAME=lms/NAME=lms8/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 	rmdir ${D}${datadir} || :
 }
-- 
1.7.10.4

Re: [meta-intel][PATCH] lms8: handle different host setups

[Tom Zanussi]

On Tue, 2013-06-25 at 17:45 +0100, Ross Burton wrote:
> The configure script looks at the *host* environment to decide where to install
> the init script, so it's location at packaging time can change.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Pulled into meta-intel/master.

Thanks,

Tom

> ---
>  common/recipes-bsp/amt/lms8_8.0.0-7.bb |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/common/recipes-bsp/amt/lms8_8.0.0-7.bb b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
> index fbb4e45..65c413a 100644
> --- a/common/recipes-bsp/amt/lms8_8.0.0-7.bb
> +++ b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
> @@ -26,7 +26,13 @@ INITSCRIPT_PARAMS = "defaults"
>  do_install_append () {
>  	mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms8
>  	install -d ${D}${sysconfdir}/init.d
> -	mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
> +	# The configure script looks at the host to decide where to put init
> +	# scripts, so move it at the same time as renaming it.
> +	if test -f ${D}${sysconfdir}/rc.d/init.d/lms ; then
> +		mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
> +	else
> +		mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
> +	fi
>  	sed -i 's/^NAME=lms/NAME=lms8/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
>  	rmdir ${D}${datadir} || :
>  }