* [meta-baryon][PATCH 0/4] Webmin updates/fixes
@ 2013-02-22 13:59 Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 1/4] webmin: update to 1.620 Paul Eggleton
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-22 13:59 UTC (permalink / raw)
To: yocto
The following changes since commit 6c7948d9ca339caa6647b7e3f20ab82508f0793a:
schroedinger: specify the version of MPL in use (2013-01-03 13:46:02 -0800)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/webmin-update
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/webmin-update
Kevin Strasser (1):
webmin: correct net-lib.pl patch
Paul Eggleton (3):
webmin: update to 1.620
webmin: tidy up recipe
webmin: fix for changes in OE-Core master
.../webmin/files/disable-version-check.patch | 25 +++++---
recipes-extended/webmin/files/net-lib.pl.patch | 2 +-
.../webmin/{webmin_1.590.bb => webmin_1.620.bb} | 63 +++++++++-----------
3 files changed, 45 insertions(+), 45 deletions(-)
rename recipes-extended/webmin/{webmin_1.590.bb => webmin_1.620.bb} (81%)
--
1.7.10.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-baryon][PATCH 1/4] webmin: update to 1.620
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
@ 2013-02-22 13:59 ` Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 2/4] webmin: tidy up recipe Paul Eggleton
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-22 13:59 UTC (permalink / raw)
To: yocto
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../webmin/files/disable-version-check.patch | 25 +++++++++++++-------
.../webmin/{webmin_1.590.bb => webmin_1.620.bb} | 6 ++---
2 files changed, 18 insertions(+), 13 deletions(-)
rename recipes-extended/webmin/{webmin_1.590.bb => webmin_1.620.bb} (97%)
diff --git a/recipes-extended/webmin/files/disable-version-check.patch b/recipes-extended/webmin/files/disable-version-check.patch
index 585303f..a9ee405 100644
--- a/recipes-extended/webmin/files/disable-version-check.patch
+++ b/recipes-extended/webmin/files/disable-version-check.patch
@@ -1,18 +1,24 @@
-# Disable OS version check in status screen, since it is not able to
-# accurately detect the correct distro/version at the moment
-#
-# Upstream-status: Inappropriate
-#
-# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---- webmin-1.570.orig/webmin/webmin-lib.pl
-+++ webmin-1.570/webmin/webmin-lib.pl
-@@ -1055,17 +1055,18 @@ my %miniserv;
+Disable OS version check in status screen
+
+The code is not able to accurately detect the correct distro/version at
+the moment.
+
+Upstream-status: Inappropriate
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
+index 57a37f7..838b944 100755
+--- a/webmin/webmin-lib.pl
++++ b/webmin/webmin-lib.pl
+@@ -1059,18 +1059,19 @@ my %miniserv;
&load_theme_library(); # So that UI functions work
# Need OS upgrade
-my %realos = &detect_operating_system(undef, 1);
-if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
+- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- push(@notifs,
- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
@@ -25,6 +31,7 @@
+#my %realos = &detect_operating_system(undef, 1);
+#if (($realos{'os_version'} ne $gconfig{'os_version'} ||
+# $realos{'os_type'} ne $gconfig{'os_type'}) &&
++# $realos{'os_version'} && $realos{'os_type'} &&
+# &foreign_available("webmin")) {
+# push(@notifs,
+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
diff --git a/recipes-extended/webmin/webmin_1.590.bb b/recipes-extended/webmin/webmin_1.620.bb
similarity index 97%
rename from recipes-extended/webmin/webmin_1.590.bb
rename to recipes-extended/webmin/webmin_1.620.bb
index c2d593a..59c0e38 100644
--- a/recipes-extended/webmin/webmin_1.590.bb
+++ b/recipes-extended/webmin/webmin_1.620.bb
@@ -9,8 +9,6 @@ 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 perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
-PR = "r1"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://setup.sh \
file://init-exclude.patch \
@@ -25,8 +23,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://net-lib.pl.patch \
file://media-tomb.patch"
-SRC_URI[md5sum] = "815005ed7f208dcfbda5308b446779c2"
-SRC_URI[sha256sum] = "07b06612a8bc864388d86b55ec9a9adba0fa71ec60cc66d87c0e58280264182d"
+SRC_URI[md5sum] = "e93bc5057a5b7d7e31ecb2bb228d7044"
+SRC_URI[sha256sum] = "3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b"
inherit allarch perlnative update-rc.d
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-baryon][PATCH 2/4] webmin: tidy up recipe
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 1/4] webmin: update to 1.620 Paul Eggleton
@ 2013-02-22 13:59 ` Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 3/4] webmin: fix for changes in OE-Core master Paul Eggleton
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-22 13:59 UTC (permalink / raw)
To: yocto
* Move packaging definitions to the end
* Set SUMMARY instead of DESCRIPTION
* Remove EXCLUDE_FROM_SHLIBS and override of split_and_strip_files since
these are now taken care of by allarch.bbclass
* Reindent SRC_URI
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-extended/webmin/webmin_1.620.bb | 51 ++++++++++++++-----------------
1 file changed, 23 insertions(+), 28 deletions(-)
diff --git a/recipes-extended/webmin/webmin_1.620.bb b/recipes-extended/webmin/webmin_1.620.bb
index 59c0e38..d7145e4 100644
--- a/recipes-extended/webmin/webmin_1.620.bb
+++ b/recipes-extended/webmin/webmin_1.620.bb
@@ -1,27 +1,21 @@
-DESCRIPTION = "Web-based administration interface"
-HOMEPAGE="http://www.webmin.com"
+SUMMARY = "Web-based administration interface"
+HOMEPAGE = "http://www.webmin.com"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c"
-# FIXME: some of this should be figured out automatically
-RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict"
-RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader"
-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"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
- file://setup.sh \
- file://init-exclude.patch \
- file://net-generic.patch \
- 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 \
- file://net-lib.pl.patch \
- file://media-tomb.patch"
+ file://setup.sh \
+ file://init-exclude.patch \
+ file://net-generic.patch \
+ 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 \
+ file://net-lib.pl.patch \
+ file://media-tomb.patch"
SRC_URI[md5sum] = "e93bc5057a5b7d7e31ecb2bb228d7044"
SRC_URI[sha256sum] = "3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b"
@@ -71,9 +65,6 @@ do_configure() {
sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
}
-INITSCRIPT_NAME = "webmin"
-INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ."
-
do_install() {
install -d ${D}${sysconfdir}
install -d ${D}${sysconfdir}/webmin
@@ -110,6 +101,15 @@ do_install() {
${S}/../setup.sh
}
+INITSCRIPT_NAME = "webmin"
+INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ."
+
+# FIXME: some of this should be figured out automatically
+RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict"
+RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader"
+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"
+
PACKAGES_DYNAMIC += "webmin-module-*"
RRECOMMENDS_${PN} += "webmin-module-system-status"
@@ -134,11 +134,6 @@ python populate_packages_prepend() {
}
# Time-savers
-EXCLUDE_FROM_SHLIBS = "1"
-split_and_strip_files() {
- :
-}
-
package_do_pkgconfig() {
:
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-baryon][PATCH 3/4] webmin: fix for changes in OE-Core master
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 1/4] webmin: update to 1.620 Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 2/4] webmin: tidy up recipe Paul Eggleton
@ 2013-02-22 13:59 ` Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 4/4] webmin: correct net-lib.pl patch Paul Eggleton
2013-02-26 19:56 ` [meta-baryon][PATCH 0/4] Webmin updates/fixes kevin.strasser
4 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-22 13:59 UTC (permalink / raw)
To: yocto
* Hide read-only-rootfs-hook.sh in init module
* Hide debugfs filesystems in mount module
* perl-module-file is no longer packaged, so remove references to it
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
recipes-extended/webmin/webmin_1.620.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/webmin/webmin_1.620.bb b/recipes-extended/webmin/webmin_1.620.bb
index d7145e4..8822b92 100644
--- a/recipes-extended/webmin/webmin_1.620.bb
+++ b/recipes-extended/webmin/webmin_1.620.bb
@@ -38,8 +38,8 @@ do_configure() {
# Adjust configs
mv init/config-debian-linux init/config-generic-linux
sed -i "s/shutdown_command=.*/shutdown_command=poweroff/" init/config-generic-linux
- echo "exclude=bootmisc.sh,single,halt,reboot,hostname.sh,modutils.sh,mountall.sh,mountnfs.sh,networking,populate-volatile.sh,rmnologin.sh,save-rtc.sh,umountfs,umountnfs.sh,hwclock.sh,checkroot.sh,banner.sh,udev,udev-cache,devpts.sh,psplash.sh,sendsigs,fbsetup,bootlogd,stop-bootlogd,sysfs.sh,syslog,syslog.busybox,urandom,webmin,functions.initscripts" >> init/config-generic-linux
- echo "excludefs=devpts,devtmpfs,usbdevfs,proc,tmpfs,sysfs" >> mount/config-generic-linux
+ echo "exclude=bootmisc.sh,single,halt,reboot,hostname.sh,modutils.sh,mountall.sh,mountnfs.sh,networking,populate-volatile.sh,rmnologin.sh,save-rtc.sh,umountfs,umountnfs.sh,hwclock.sh,checkroot.sh,banner.sh,udev,udev-cache,devpts.sh,psplash.sh,sendsigs,fbsetup,bootlogd,stop-bootlogd,sysfs.sh,syslog,syslog.busybox,urandom,webmin,functions.initscripts,read-only-rootfs-hook.sh" >> init/config-generic-linux
+ echo "excludefs=devpts,devtmpfs,usbdevfs,proc,tmpfs,sysfs,debugfs" >> mount/config-generic-linux
mv exports/config-debian-linux exports/config-generic-linux
sed -i "s/killall -HUP rpc.nfsd && //" exports/config-generic-linux
@@ -108,7 +108,7 @@ INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ."
RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict"
RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader"
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"
+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-*"
RRECOMMENDS_${PN} += "webmin-module-system-status"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-baryon][PATCH 4/4] webmin: correct net-lib.pl patch
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
` (2 preceding siblings ...)
2013-02-22 13:59 ` [meta-baryon][PATCH 3/4] webmin: fix for changes in OE-Core master Paul Eggleton
@ 2013-02-22 13:59 ` Paul Eggleton
2013-02-26 19:56 ` [meta-baryon][PATCH 0/4] Webmin updates/fixes kevin.strasser
4 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-22 13:59 UTC (permalink / raw)
To: yocto
From: Kevin Strasser <kevin.strasser@linux.intel.com>
remove absolute path from reference to debian-linux-lib.pl
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
recipes-extended/webmin/files/net-lib.pl.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/webmin/files/net-lib.pl.patch b/recipes-extended/webmin/files/net-lib.pl.patch
index 62d28db..bdba5e7 100644
--- a/recipes-extended/webmin/files/net-lib.pl.patch
+++ b/recipes-extended/webmin/files/net-lib.pl.patch
@@ -13,7 +13,7 @@ diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl
else {
- do "$gconfig{'os_type'}-lib.pl";
+ #do "$gconfig{'os_type'}-lib.pl";
-+ do "/usr/libexec/webmin/net/debian-linux-lib.pl";
++ do "debian-linux-lib.pl";
}
# list_hosts()
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-baryon][PATCH 0/4] Webmin updates/fixes
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
` (3 preceding siblings ...)
2013-02-22 13:59 ` [meta-baryon][PATCH 4/4] webmin: correct net-lib.pl patch Paul Eggleton
@ 2013-02-26 19:56 ` kevin.strasser
2013-02-27 15:31 ` Paul Eggleton
4 siblings, 1 reply; 7+ messages in thread
From: kevin.strasser @ 2013-02-26 19:56 UTC (permalink / raw)
To: Paul Eggleton; +Cc: yocto
> The following changes since commit
> 6c7948d9ca339caa6647b7e3f20ab82508f0793a:
>
> schroedinger: specify the version of MPL in use (2013-01-03 13:46:02
> -0800)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib paule/webmin-update
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/webmin-update
>
> Kevin Strasser (1):
> webmin: correct net-lib.pl patch
>
> Paul Eggleton (3):
> webmin: update to 1.620
> webmin: tidy up recipe
> webmin: fix for changes in OE-Core master
>
> .../webmin/files/disable-version-check.patch | 25 +++++---
> recipes-extended/webmin/files/net-lib.pl.patch | 2 +-
> .../webmin/{webmin_1.590.bb => webmin_1.620.bb} | 63
> +++++++++-----------
> 3 files changed, 45 insertions(+), 45 deletions(-)
> rename recipes-extended/webmin/{webmin_1.590.bb => webmin_1.620.bb} (81%)
>
Hi Paul,
This looks great, but I noticed that the nfs-utils recipe in oe-core has
been updated and is causing our bbappend to break. I went ahead and made
the update and applied a commit on top of these changes. That addition is
available in a branch at:
git://git.yoctoproject.org/poky-contrib
strassek/webmin-update_and_nfs-utils
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/webmin-update_and_nfs-utils
-Kevin
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-baryon][PATCH 0/4] Webmin updates/fixes
2013-02-26 19:56 ` [meta-baryon][PATCH 0/4] Webmin updates/fixes kevin.strasser
@ 2013-02-27 15:31 ` Paul Eggleton
0 siblings, 0 replies; 7+ messages in thread
From: Paul Eggleton @ 2013-02-27 15:31 UTC (permalink / raw)
To: kevin.strasser; +Cc: yocto
On Tuesday 26 February 2013 11:56:49 kevin.strasser@linux.intel.com wrote:
> > The following changes since commit
> >
> > 6c7948d9ca339caa6647b7e3f20ab82508f0793a:
> > schroedinger: specify the version of MPL in use (2013-01-03 13:46:02
> >
> > -0800)
> >
> > are available in the git repository at:
> > git://git.yoctoproject.org/poky-contrib paule/webmin-update
> > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/webmin-up
> > date>
> > Kevin Strasser (1):
> > webmin: correct net-lib.pl patch
> >
> > Paul Eggleton (3):
> > webmin: update to 1.620
> > webmin: tidy up recipe
> > webmin: fix for changes in OE-Core master
> >
>
> This looks great, but I noticed that the nfs-utils recipe in oe-core has
> been updated and is causing our bbappend to break. I went ahead and made
> the update and applied a commit on top of these changes. That addition is
> available in a branch at:
>
> git://git.yoctoproject.org/poky-contrib
> strassek/webmin-update_and_nfs-utils
Thanks Kevin, I've now pushed all of these changes to master (with a slight
tweak to the nfs-utils commit message 1.7.7 -> 1.2.7).
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-27 15:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-22 13:59 [meta-baryon][PATCH 0/4] Webmin updates/fixes Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 1/4] webmin: update to 1.620 Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 2/4] webmin: tidy up recipe Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 3/4] webmin: fix for changes in OE-Core master Paul Eggleton
2013-02-22 13:59 ` [meta-baryon][PATCH 4/4] webmin: correct net-lib.pl patch Paul Eggleton
2013-02-26 19:56 ` [meta-baryon][PATCH 0/4] Webmin updates/fixes kevin.strasser
2013-02-27 15:31 ` Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.