* [meta-networking][PATCH 0/2] some fixes for vsftpd and ntp scripts
@ 2014-04-21 5:53 wenzong.fan
2014-04-21 5:53 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning wenzong.fan
2014-04-21 5:53 ` [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl wenzong.fan
0 siblings, 2 replies; 6+ messages in thread
From: wenzong.fan @ 2014-04-21 5:53 UTC (permalink / raw)
To: openembedded-devel
From: Wenzong Fan <wenzong.fan@windriver.com>
* Fix QA warnings to vsftpd that some files installed but not shipped;
* Fix hardcode path to perl for ntp scripts: ntptrace, ntp-wait
The following changes since commit 5ccedeb028c46a6b98335fedb16029c6f7f87022:
sshfs-fuse: update to 2.5 (2014-04-20 16:10:21 +0200)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/networking
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/networking
Wenzong Fan (2):
vsftpd: fix install warning
ntp: fix hardcode to /usr/bin/perl
.../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++-
meta-networking/recipes-support/ntp/ntp.inc | 4 ++++
2 files changed, 12 insertions(+), 1 deletion(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-networking][PATCH 1/2] vsftpd: fix install warning
2014-04-21 5:53 [meta-networking][PATCH 0/2] some fixes for vsftpd and ntp scripts wenzong.fan
@ 2014-04-21 5:53 ` wenzong.fan
2014-04-21 7:58 ` Martin Jansa
2014-04-21 5:53 ` [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl wenzong.fan
1 sibling, 1 reply; 6+ messages in thread
From: wenzong.fan @ 2014-04-21 5:53 UTC (permalink / raw)
To: openembedded-devel
From: Wenzong Fan <wenzong.fan@windriver.com>
WARNING: QA Issue: vsftpd: Files/directories were installed but not shipped
/run
/run/vsftpd
/run/vsftpd/empty
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
index 0698a63..2cf9ac3 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
@@ -70,7 +70,6 @@ do_install() {
sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd
sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd
fi
- install -d ${D}${localstatedir}/run/vsftpd/empty
}
INITSCRIPT_PACKAGES = "${PN}"
@@ -82,3 +81,11 @@ USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp
--shell /bin/false ftp "
GROUPADD_PARAM_${PN} = "-r ftp"
+pkg_postinst_${PN}() {
+ if [ -n "$D" ]; then
+ exit 0
+ fi
+ if [ -e /etc/init.d/populate-volatile.sh ]; then
+ /etc/init.d/populate-volatile.sh update
+ fi
+}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-networking][PATCH 1/2] vsftpd: fix install warning
2014-04-21 5:53 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning wenzong.fan
@ 2014-04-21 7:58 ` Martin Jansa
2014-04-23 8:31 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning - [withdrawn] wenzong fan
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2014-04-21 7:58 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]
On Mon, Apr 21, 2014 at 01:53:27AM -0400, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan <wenzong.fan@windriver.com>
>
> WARNING: QA Issue: vsftpd: Files/directories were installed but not shipped
> /run
> /run/vsftpd
> /run/vsftpd/empty
I'm glad to see fix for QA, but I don't think that everybody is using
populate-volatile.sh for volatiles (e.g. images with systemd).
> Signed-off-by: Li Wang <li.wang@windriver.com>
> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ---
> .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> index 0698a63..2cf9ac3 100644
> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> @@ -70,7 +70,6 @@ do_install() {
> sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd
> sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd
> fi
> - install -d ${D}${localstatedir}/run/vsftpd/empty
> }
>
> INITSCRIPT_PACKAGES = "${PN}"
> @@ -82,3 +81,11 @@ USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp
> --shell /bin/false ftp "
> GROUPADD_PARAM_${PN} = "-r ftp"
>
> +pkg_postinst_${PN}() {
> + if [ -n "$D" ]; then
> + exit 0
> + fi
> + if [ -e /etc/init.d/populate-volatile.sh ]; then
> + /etc/init.d/populate-volatile.sh update
> + fi
> +}
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [meta-networking][PATCH 1/2] vsftpd: fix install warning - [withdrawn]
2014-04-21 7:58 ` Martin Jansa
@ 2014-04-23 8:31 ` wenzong fan
0 siblings, 0 replies; 6+ messages in thread
From: wenzong fan @ 2014-04-23 8:31 UTC (permalink / raw)
To: openembedded-devel, Martin Jansa
On 04/21/2014 03:58 PM, Martin Jansa wrote:
> On Mon, Apr 21, 2014 at 01:53:27AM -0400, wenzong.fan@windriver.com wrote:
>> From: Wenzong Fan <wenzong.fan@windriver.com>
>>
>> WARNING: QA Issue: vsftpd: Files/directories were installed but not shipped
>> /run
>> /run/vsftpd
>> /run/vsftpd/empty
>
> I'm glad to see fix for QA, but I don't think that everybody is using
> populate-volatile.sh for volatiles (e.g. images with systemd).
Good point, while I searching the thread I found there's another patch
tried to process this issue but still not merged:
[oe] [meta-networking][PATCH] vsftpd: install volatiles file based on
init system
I withdraw my patch and waiting for the upstream fixes:)
Thanks
Wenzong
>
>> Signed-off-by: Li Wang <li.wang@windriver.com>
>> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
>> ---
>> .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
>> index 0698a63..2cf9ac3 100644
>> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
>> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
>> @@ -70,7 +70,6 @@ do_install() {
>> sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd
>> sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd
>> fi
>> - install -d ${D}${localstatedir}/run/vsftpd/empty
>> }
>>
>> INITSCRIPT_PACKAGES = "${PN}"
>> @@ -82,3 +81,11 @@ USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp
>> --shell /bin/false ftp "
>> GROUPADD_PARAM_${PN} = "-r ftp"
>>
>> +pkg_postinst_${PN}() {
>> + if [ -n "$D" ]; then
>> + exit 0
>> + fi
>> + if [ -e /etc/init.d/populate-volatile.sh ]; then
>> + /etc/init.d/populate-volatile.sh update
>> + fi
>> +}
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl
2014-04-21 5:53 [meta-networking][PATCH 0/2] some fixes for vsftpd and ntp scripts wenzong.fan
2014-04-21 5:53 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning wenzong.fan
@ 2014-04-21 5:53 ` wenzong.fan
2014-04-25 1:21 ` Joe MacDonald
1 sibling, 1 reply; 6+ messages in thread
From: wenzong.fan @ 2014-04-21 5:53 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl
2014-04-21 5:53 ` [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl wenzong.fan
@ 2014-04-25 1:21 ` Joe MacDonald
0 siblings, 0 replies; 6+ messages in thread
From: Joe MacDonald @ 2014-04-25 1:21 UTC (permalink / raw)
To: openembedded-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-04-25 1:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-21 5:53 [meta-networking][PATCH 0/2] some fixes for vsftpd and ntp scripts wenzong.fan
2014-04-21 5:53 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning wenzong.fan
2014-04-21 7:58 ` Martin Jansa
2014-04-23 8:31 ` [meta-networking][PATCH 1/2] vsftpd: fix install warning - [withdrawn] wenzong fan
2014-04-21 5:53 ` [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl wenzong.fan
2014-04-25 1:21 ` Joe MacDonald
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.