some fixes for vsftpd and ntp scripts
cover some fixes for vsftpd and ntp scripts
From: Wenzong Fan <[email protected]>
* 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(-)
Signature · 1 line
1.7.9.5
PATCH 1/2 vsftpd: fix install warning
From: Wenzong Fan <[email protected]>
WARNING: QA Issue: vsftpd: Files/directories were installed but not shipped
/run
/run/vsftpd
/run/vsftpd/empty
--- .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb +8 -1
@@ -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 +}
Signature · 1 line
1.7.9.5
Re: [meta-networking][PATCH 1/2] vsftpd: fix install warning
Quoted 6 lines · On Mon, Apr 21, 2014 at 01:53:27AM -0400, [email protected] wrote:
From: Wenzong Fan <[email protected]>
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).
Quoted 38 lines
Signed-off-by Li Wang <[email protected]>Signed-off-by Wenzong Fan <[email protected]>--- .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb +8
-1@@ -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 +}Signature · 7 lines
1.7.9.5 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-networking][PATCH 1/2] vsftpd: fix install warning - [withdrawn]
Quoted 10 lines · Martin Jansa
Quoted 6 lines · On Mon, Apr 21, 2014 at 01:53:27AM -0400, [email protected] wrote:
From: Wenzong Fan <[email protected]>
WARNING: QA Issue: vsftpd: Files/directories were installed but not shipped
/run
/run/vsftpd
/run/vsftpd/emptyI'm glad to see fix for QA, but I don't think that everybody is using
populate-volatile.shfor 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
Quoted 42 lines
Quoted 39 lines
Signed-off-by Li Wang <[email protected]>Signed-off-by Wenzong Fan <[email protected]>--- .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb +8
-2@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 2/2 ntp: fix hardcode to /usr/bin/perl
In reply to [email protected]From: Wenzong Fan <[email protected]>
This patch properly uses the path variables and fixes ntptrace and ntp-wait, just in case perl is not installed with the hardcode path.
--- meta-networking/recipes-support/ntp/ntp.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta-networking/recipes-support/ntp/ntp.inc +4 -0
@@ -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
Signature · 1 line
1.7.9.5
Re: [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl
Merged this piece, we'll sort out the 1/2 soon I hope. :-)
-J.
Quoted 29 lines · [[oe] [meta-networking][PATCH 2/2] ntp: fix hardcode to /usr/bin/perl] On…
From: Wenzong Fan <[email protected]>
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 <[email protected]>Signed-off-by Wenzong Fan <[email protected]>--- meta-networking/recipes-support/ntp/ntp.inc | 4 ++++ 1 file changed, 4 insertions(+)meta-networking/recipes-support/ntp/ntp.inc +4
-0@@ -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/ntpdateSignature · 1 line
1.7.9.5
Signature · 2 lines
-Joe MacDonald. :wq