webmin: themes and logins

This series improves the webmin recipe by:

1) allowing a layer to override the default login and password.
2) split out the themes from the main webmin package.

The following changes since commit 8316933b400ae6fda688637fcc3e202b38a8e12b:

libol: compile issue files missing in B and packaging issue (2014-06-13 13:38:12 +0200)

are available in the git repository at:

git://github.com/darander/meta-oe 362107ac6702cb380c86a7ac249b52f558d2b923
https://github.com/darander/meta-oe/tree/webmin

Anders Darander (2):
webmin: allow override of webmin login and password
webmin: split out webmin themes

 meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

2.0.0

Don't hardcode the webmin login and password in the install script. Instead, extract them to variables, to allow us to override them in a bbappend.

---
 meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

index 8822b92..a561de2 100644
@@ -65,6 +65,9 @@ do_configure() {
     sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
 }
 
+WEBMIN_LOGIN ?= "admin"
+WEBMIN_PASSWORD ?= "password"
+
 do_install() {
     install -d ${D}${sysconfdir}
     install -d ${D}${sysconfdir}/webmin

@@ -92,8 +95,8 @@ do_install() {
     export real_os_type="${DISTRO_NAME}"
     export real_os_version="${DISTRO_VERSION}"
     export port=10000
-    export login=admin
-    export password=password
+    export login=${WEBMIN_LOGIN}
+    export password=${WEBMIN_PASSWORD}
     export ssl=0
     export atboot=1
     export no_pam=1

2.0.0

The default set of themes taks up ~13MB, with a couple of them weighting in at ~5MB each.

Let's split the themes to separate packages, to allow a considerable size reduction of the core webmin package (from +15MB to 2.1MB on my build host).

---
 meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

index a561de2..7eb1d63 100644
@@ -113,7 +113,7 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix p
 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-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
 
-PACKAGES_DYNAMIC += "webmin-module-*"
+PACKAGES_DYNAMIC += "webmin-module-* webmin-theme-*"
 RRECOMMENDS_${PN} += "webmin-module-system-status"
 
 RDEPENDS_webmin-module-proc = "procps"

@@ -128,12 +128,17 @@ python populate_packages_prepend() {
     wadir = bb.data.expand('${libexecdir}/webmin', d)
     wadir_image = bb.data.expand('${D}', d) + wadir
     modules = []
+    themes = []
     for mod in os.listdir(wadir_image):
         modinfo = os.path.join(wadir_image, mod, "module.info")
+        themeinfo = os.path.join(wadir_image, mod, "theme.info")
         if os.path.exists(modinfo):
             modules.append(mod)
+        elif os.path.exists(themeinfo):
+            themes.append(mod)
 
     do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True)
+    do_split_packages(d, wadir, '^(%s)$' % "|".join(themes), 'webmin-theme-%s', 'Webmin theme for %s', allow_dirs=True, prepend=True)
 }
 
 # Time-savers

2.0.0

It isn't caused by your patch, but current webmin recipe is inheritting allarch and then adding runtime dependency on TUNE_PKGARCH perl, so it's causing webmin rebuilds every time MACHINE is changed (to MACHINE with different TUNE_PKGARCH)

ERROR: webmin different signature for task do_package_write_ipk.sigdata between qemux86copy and qemuarm
Hash for dependent task webmin_1.620.bb.do_package changed from 1a4ee0753eff9a8e392e851b6bbe252d to 36578d90d5866248da6afaa50fd586a1 Hash for dependent task perl_5.14.3.bb.do_packagedata changed from c7f952812f189c608e14e0862807ae27 to 24b9ff1de4f046333d292aa97673a8d2 Hash for dependent task webmin_1.620.bb.do_packagedata changed from bd1b17c957d4091a0f6d3ff6a9acb0fe to b584e5a6a90eeb320046c457b03a607f

Please fix it if you care about webmin.

Martin 'JaMa' Jansa     jabber: [email protected]