summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
index a561de2c7f..7eb1d6319b 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
113RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" 113RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
114RDEPENDS_${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature" 114RDEPENDS_${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
115 115
116PACKAGES_DYNAMIC += "webmin-module-*" 116PACKAGES_DYNAMIC += "webmin-module-* webmin-theme-*"
117RRECOMMENDS_${PN} += "webmin-module-system-status" 117RRECOMMENDS_${PN} += "webmin-module-system-status"
118 118
119RDEPENDS_webmin-module-proc = "procps" 119RDEPENDS_webmin-module-proc = "procps"
@@ -128,12 +128,17 @@ python populate_packages_prepend() {
128 wadir = bb.data.expand('${libexecdir}/webmin', d) 128 wadir = bb.data.expand('${libexecdir}/webmin', d)
129 wadir_image = bb.data.expand('${D}', d) + wadir 129 wadir_image = bb.data.expand('${D}', d) + wadir
130 modules = [] 130 modules = []
131 themes = []
131 for mod in os.listdir(wadir_image): 132 for mod in os.listdir(wadir_image):
132 modinfo = os.path.join(wadir_image, mod, "module.info") 133 modinfo = os.path.join(wadir_image, mod, "module.info")
134 themeinfo = os.path.join(wadir_image, mod, "theme.info")
133 if os.path.exists(modinfo): 135 if os.path.exists(modinfo):
134 modules.append(mod) 136 modules.append(mod)
137 elif os.path.exists(themeinfo):
138 themes.append(mod)
135 139
136 do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True) 140 do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True)
141 do_split_packages(d, wadir, '^(%s)$' % "|".join(themes), 'webmin-theme-%s', 'Webmin theme for %s', allow_dirs=True, prepend=True)
137} 142}
138 143
139# Time-savers 144# Time-savers