Patchwork ntp: fix perl path in scripts

login
register
mail settings
Submitter Kang Kai
Date Jan. 22, 2014, 7:47 a.m.
Message ID <1390376858-17416-1-git-send-email-kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/65505/
State New, archived
Headers show

Comments

Kang Kai - Jan. 22, 2014, 7:47 a.m.
Scripts ntptrace and ntp-wait use /bin/perl directly that cause
ntp-utils depends on /bin/perl but no package provides it. It should use
'${USRBINPATH}/env perl'.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta-networking/recipes-support/ntp/ntp.inc | 2 ++
 1 file changed, 2 insertions(+)
Martin Jansa - Jan. 22, 2014, 11:31 a.m.
On Wed, Jan 22, 2014 at 03:47:38PM +0800, Kai Kang wrote:
> Scripts ntptrace and ntp-wait use /bin/perl directly that cause
> ntp-utils depends on /bin/perl but no package provides it. It should use
> '${USRBINPATH}/env perl'.

Next time please add [meta-networking] tag, but it's already in right
patchwork bundle so that you don't need to resend it.

> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  meta-networking/recipes-support/ntp/ntp.inc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index 9ea24e9..8ada604 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -54,6 +54,8 @@ 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!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntptrace
> +    sed -i '1s!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntp-wait
>  
>      install -d ${D}/${sysconfdir}/default
>      install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Kang Kai - Feb. 19, 2014, 2:19 a.m.
On 2014?01?22? 19:31, Martin Jansa wrote:
> On Wed, Jan 22, 2014 at 03:47:38PM +0800, Kai Kang wrote:
>> Scripts ntptrace and ntp-wait use /bin/perl directly that cause
>> ntp-utils depends on /bin/perl but no package provides it. It should use
>> '${USRBINPATH}/env perl'.
> Next time please add [meta-networking] tag, but it's already in right
> patchwork bundle so that you don't need to resend it.

OK, thanks.

--Kai

>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>>   meta-networking/recipes-support/ntp/ntp.inc | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
>> index 9ea24e9..8ada604 100644
>> --- a/meta-networking/recipes-support/ntp/ntp.inc
>> +++ b/meta-networking/recipes-support/ntp/ntp.inc
>> @@ -54,6 +54,8 @@ 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!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntptrace
>> +    sed -i '1s!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntp-wait
>>   
>>       install -d ${D}/${sysconfdir}/default
>>       install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
>> -- 
>> 1.8.1.2
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 9ea24e9..8ada604 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -54,6 +54,8 @@  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!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntptrace
+    sed -i '1s!/bin/perl!${USRBINPATH}/env perl!' ${D}${sbindir}/ntp-wait
 
     install -d ${D}/${sysconfdir}/default
     install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate