[oe-commits] Anders Darander : webmin: split out webmin themes

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: cdbe0d485caf8d348ad60dd49dafe4f6e1c00ce9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=cdbe0d485caf8d348ad60dd49dafe4f6e1c00ce9

Author: Anders Darander <anders at chargestorm.se>
Date:   Fri Jun 13 15:01:21 2014 +0200

webmin: split out webmin themes

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).

Signed-off-by: Anders Darander <anders at chargestorm.se>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

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

diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
index a561de2..7eb1d63 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
@@ -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