[meta-intel] [PATCH] lms7: do_install destination issue

[Thibault GUITTET]

2013/7/3 Burton, Ross <ross.burton at intel.com>:
> On 3 July 2013 13:34, Thibault GUITTET <guittet.thibault at gmail.com> wrote:
>> -       mv ${D}${sysconfdir}/rc.d/init.d/lms
>> ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
>> +       mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
>
> Assuming that lms7 is doing the same as lms8, the path used at
> install-time depends on the host operating system so this will fix it
> for you but break (iirc) Red Hat-based hosts.
>
> I fixed this for lms8 earlier, so please replicate this logic:
>
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?id=fc9cba841017972bfdebbeef5144aa962a61ec65
>
> Ross

Sorry, my bad, here you go  :

diff --git a/common/recipes-bsp/amt/lms7_7.1.20.bb
b/common/recipes-bsp/amt/lms7_7.1.20.bb
index 2c6a29e..9bc9ef1 100644
--- a/common/recipes-bsp/amt/lms7_7.1.20.bb
+++ b/common/recipes-bsp/amt/lms7_7.1.20.bb
@@ -34,7 +34,13 @@ addtask unpack2 after do_unpack before do_patch
 do_install_append () {
 	mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms7
 	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=lms7/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 	rmdir ${D}${datadir} || :
 }

Thibault