Re: [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl

[Joe MacDonald <joe@deserted.net>]

[-- Attachment #1: Type: text/plain, Size: 1694 bytes --]

Merged this piece, we'll sort out the 1/2 soon I hope.  :-)

-J.

[[oe] [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl] On 14.04.21 (Mon 01:53) wenzong.fan@windriver.com wrote:

> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> This patch properly uses the path variables and fixes ntptrace and
> ntp-wait, just in case perl is not installed with the hardcode path.
> 
> Signed-off-by: Rahat Mahbub <rahat.mahbub@windriver.com>
> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ---
>  meta-networking/recipes-support/ntp/ntp.inc |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index 9c3e0d1..d4adfd8 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -58,6 +58,10 @@ do_install_append() {
>      sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
>      sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
>      sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
> +    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace
> +    sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace
> +    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait
> +    sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait
>  
>      install -d ${D}/${sysconfdir}/default
>      install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
> -- 
> 1.7.9.5
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]