* [meta-webserver][PATCH 0/2] webmin: themes and logins @ 2014-06-13 13:01 Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 1/2] webmin: allow override of webmin login and password Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 2/2] webmin: split out webmin themes Anders Darander 0 siblings, 2 replies; 5+ messages in thread From: Anders Darander @ 2014-06-13 13:01 UTC (permalink / raw) To: openembedded-devel; +Cc: Anders Darander 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [meta-webserver][PATCH 1/2] webmin: allow override of webmin login and password 2014-06-13 13:01 [meta-webserver][PATCH 0/2] webmin: themes and logins Anders Darander @ 2014-06-13 13:01 ` Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 2/2] webmin: split out webmin themes Anders Darander 1 sibling, 0 replies; 5+ messages in thread From: Anders Darander @ 2014-06-13 13:01 UTC (permalink / raw) To: openembedded-devel; +Cc: Anders Darander 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. Signed-off-by: Anders Darander <anders@chargestorm.se> --- meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb index 8822b92..a561de2 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb @@ -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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-webserver][PATCH 2/2] webmin: split out webmin themes 2014-06-13 13:01 [meta-webserver][PATCH 0/2] webmin: themes and logins Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 1/2] webmin: allow override of webmin login and password Anders Darander @ 2014-06-13 13:01 ` Anders Darander 2014-06-23 17:40 ` Martin Jansa 1 sibling, 1 reply; 5+ messages in thread From: Anders Darander @ 2014-06-13 13:01 UTC (permalink / raw) To: openembedded-devel; +Cc: Anders Darander 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@chargestorm.se> --- 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 -- 2.0.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-webserver][PATCH 2/2] webmin: split out webmin themes 2014-06-13 13:01 ` [meta-webserver][PATCH 2/2] webmin: split out webmin themes Anders Darander @ 2014-06-23 17:40 ` Martin Jansa 0 siblings, 0 replies; 5+ messages in thread From: Martin Jansa @ 2014-06-23 17:40 UTC (permalink / raw) To: openembedded-devel; +Cc: Anders Darander [-- Attachment #1: Type: text/plain, Size: 3495 bytes --] On Fri, Jun 13, 2014 at 03:01:21PM +0200, Anders Darander wrote: > 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). 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. > Signed-off-by: Anders Darander <anders@chargestorm.se> > --- > 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 > -- > 2.0.0 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-webserver][PATCH 2/2] webmin: split out webmin themes @ 2014-06-23 18:16 Anders Darander 0 siblings, 0 replies; 5+ messages in thread From: Anders Darander @ 2014-06-23 18:16 UTC (permalink / raw) To: Martin Jansa; +Cc: OpenEmbedded -- Devel On 23 Jun 2014 19:40, Martin Jansa <martin.jansa@gmail.com> wrote: > 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) I guess that the only working solution we have today is to remove allarch, correct? If so, sure I can spin a patch and send it tomorrow. Though, I guess that we sooner or later have to come up with a way to let allarch packages safely depend / recommend TUNE_PKGARCH packages. > 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. Not that I really cats that much about webmin. It's rather that we've had the need to quickly come up with a configuration interface for a product in a certain project. And webmin seemed like a pretty easy and quick solution. So obviously I wanted to remove the size of the package... But like I said above, of the currently best solution is to remove allarch, I'll spin a patch for our tomorrow. Cheers, Anders -- ChargeStorm AB / eStorm ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-23 18:16 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-13 13:01 [meta-webserver][PATCH 0/2] webmin: themes and logins Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 1/2] webmin: allow override of webmin login and password Anders Darander 2014-06-13 13:01 ` [meta-webserver][PATCH 2/2] webmin: split out webmin themes Anders Darander 2014-06-23 17:40 ` Martin Jansa -- strict thread matches above, loose matches on Subject: below -- 2014-06-23 18:16 Anders Darander
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox