[meta-baryon][PATCH 1/2] webmin: include webmin-module-acl

[meta-baryon][PATCH 1/2] webmin: include webmin-module-acl

[Kevin Strasser]

Webmin's logging module depends on webmin-module-acl.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 recipes-extended/images/baryon-image.bb |    1 +
 recipes-extended/webmin/webmin_1.570.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/images/baryon-image.bb b/recipes-extended/images/baryon-image.bb
index dc6b197..56b160c 100644
--- a/recipes-extended/images/baryon-image.bb
+++ b/recipes-extended/images/baryon-image.bb
@@ -22,6 +22,7 @@ IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs util-linux \
                      webmin-module-webmincron \
                      webmin-module-mediatomb \
                      webmin-notice \
+                     webmin-module-acl \
                      mediatomb \
                      proftpd"
 
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
index c30b050..b6c4965 100644
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ b/recipes-extended/webmin/webmin_1.570.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-modul
 RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
 RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://setup.sh \
-- 
1.7.9.5

[meta-baryon][PATCH 2/2] webmin: remove nfsd check from exports-lib.pl

[Kevin Strasser]

YOCTO #1719: Webmin expects the userspace version of nsfd and
attempts to find its pid when applying a new set of nfs exports.
This check fails because baryon is configured to install the
kernelspace version. In result the command that is assigned to
apply_cmd will never be executed, and the contents of /exports
are not successfully exported.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 recipes-extended/webmin/files/exports-lib.pl.patch |   32 ++++++++++++++++++++
 recipes-extended/webmin/webmin_1.570.bb            |    3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extended/webmin/files/exports-lib.pl.patch

diff --git a/recipes-extended/webmin/files/exports-lib.pl.patch b/recipes-extended/webmin/files/exports-lib.pl.patch
new file mode 100644
index 0000000..cdee355
--- /dev/null
+++ b/recipes-extended/webmin/files/exports-lib.pl.patch
@@ -0,0 +1,32 @@
+From 7eba4c98c6953fa6ea76c1620d19524bcfa3a576 Mon Sep 17 00:00:00 2001
+From: Kevin Strasser <kevin.strasser@linux.intel.com>
+Date: Wed, 1 Aug 2012 11:51:26 -0700
+Subject: [PATCH] nfs export: remove nfsd check
+
+nfsd runs as a kernel process and does not have a pid. This means
+that the command assigned to apply_cmd will never be executed when
+the user tries to apply changes to nfs exports.
+
+Upstream-Status: Not appropriate [config]
+
+Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
+---
+ exports/exports-lib.pl |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exports/exports-lib.pl b/exports/exports-lib.pl
+index 22891c0..1c67494 100755
+--- a/exports/exports-lib.pl
++++ b/exports/exports-lib.pl
+@@ -273,7 +273,7 @@ return !&has_command("rpc.nfsd") && !&has_command("nfsd") &&
+ sub restart_mountd
+ {
+ # Try exportfs -r first
+-if ($config{'apply_cmd'} && &find_byname("nfsd") && &find_byname("mountd")) {
++if ($config{'apply_cmd'} && &find_byname("mountd")) {
+ 	local $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null");
+ 	if (!$? && $out !~ /invalid|error|failed/i) {
+ 		# Looks like it worked!
+-- 
+1.7.9.5
+
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
index b6c4965..8cda8f0 100644
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ b/recipes-extended/webmin/webmin_1.570.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-modul
 RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
 RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://setup.sh \
@@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://remove-startup-option.patch \
           file://disable-version-check.patch \
           file://nfs-export.patch \
+          file://exports-lib.pl.patch \
           file://mount-excludefs.patch \
           file://samba-config-fix.patch \
           file://proftpd-config-fix.patch \
-- 
1.7.9.5

Re: [meta-baryon][PATCH 2/2] webmin: remove nfsd check from exports-lib.pl

[Paul Eggleton]

Hi Kevin,

Thanks for tracking this one down! A couple of minor stylistic issues though:

On Wednesday 01 August 2012 14:25:02 Kevin Strasser wrote:
> YOCTO #1719: Webmin expects the userspace version of nsfd and
> attempts to find its pid when applying a new set of nfs exports.
> This check fails because baryon is configured to install the
> kernelspace version. In result the command that is assigned to
> apply_cmd will never be executed, and the contents of /exports
> are not successfully exported.

The bug reference needs to be in square brackets i.e. [YOCTO #1719], and 
typically (at least the way I use it) appears after the main body of the 
commit message.

> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> ---
>  recipes-extended/webmin/files/exports-lib.pl.patch |   32
> ++++++++++++++++++++ recipes-extended/webmin/webmin_1.570.bb            |  
>  3 +-
>  2 files changed, 34 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-extended/webmin/files/exports-lib.pl.patch
> 
> diff --git a/recipes-extended/webmin/files/exports-lib.pl.patch
> b/recipes-extended/webmin/files/exports-lib.pl.patch new file mode 100644
> index 0000000..cdee355
> --- /dev/null
> +++ b/recipes-extended/webmin/files/exports-lib.pl.patch
> @@ -0,0 +1,32 @@
> +From 7eba4c98c6953fa6ea76c1620d19524bcfa3a576 Mon Sep 17 00:00:00 2001
> +From: Kevin Strasser <kevin.strasser@linux.intel.com>
> +Date: Wed, 1 Aug 2012 11:51:26 -0700
> +Subject: [PATCH] nfs export: remove nfsd check
> +
> +nfsd runs as a kernel process and does not have a pid. This means
> +that the command assigned to apply_cmd will never be executed when
> +the user tries to apply changes to nfs exports.
> +
> +Upstream-Status: Not appropriate [config]

Technically this should be "Inappropriate [config]".

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-baryon][PATCH 1/2] webmin: include webmin-module-acl

[Paul Eggleton]

On Wednesday 01 August 2012 14:25:01 Kevin Strasser wrote:
> Webmin's logging module depends on webmin-module-acl.
> 
> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> ---
>  recipes-extended/images/baryon-image.bb |    1 +
>  recipes-extended/webmin/webmin_1.570.bb |    2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-extended/images/baryon-image.bb
> b/recipes-extended/images/baryon-image.bb index dc6b197..56b160c 100644
> --- a/recipes-extended/images/baryon-image.bb
> +++ b/recipes-extended/images/baryon-image.bb
> @@ -22,6 +22,7 @@ IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs
> util-linux \ webmin-module-webmincron \
>                       webmin-module-mediatomb \
>                       webmin-notice \
> +                     webmin-module-acl \
>                       mediatomb \
>                       proftpd"
> 
> diff --git a/recipes-extended/webmin/webmin_1.570.bb
> b/recipes-extended/webmin/webmin_1.570.bb index c30b050..b6c4965 100644
> --- a/recipes-extended/webmin/webmin_1.570.bb
> +++ b/recipes-extended/webmin/webmin_1.570.bb
> @@ -9,7 +9,7 @@ RDEPENDS_${PN} += "perl-module-warnings
> perl-module-warnings-register perl-modul RDEPENDS_${PN} +=
> "perl-module-fcntl perl-module-tie-hash perl-module-vars
> perl-module-time-local perl-module-config perl-module-constant"
> RDEPENDS_${PN} += "perl-module-file perl-module-file-glob
> perl-module-file-copy perl-module-sdbm perl-module-sdbm-file
> perl-module-timelocal perl-module-feature"
> 
> -PR = "r10"
> +PR = "r11"
> 
>  SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
>            file://setup.sh \

I've merged this patch (with a slight tweak to the commit message - it's the 
Logging configuration page within the main webmin module). Thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre