Webmin updates/fixes
cover Webmin updates/fixes
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%)Signature · 1 line
1.7.10.4
PATCH 1/4 webmin: update to 1.620
---
.../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%)recipes-extended/webmin/files/disable-version-check.patch +16 -9
@@ -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 <[email protected]> ---- 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 <[email protected]> + +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").
recipes-extended/webmin/webmin_1.620.bb renamed from recipes-extended/webmin/webmin_1.590.bb +2 -4
@@ -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
Signature · 1 line
1.7.10.4
PATCH 2/4 webmin: tidy up recipe
In reply to Paul Eggleton* 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
--- recipes-extended/webmin/webmin_1.620.bb | 51 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 28 deletions(-)
recipes-extended/webmin/webmin_1.620.bb +23 -28
@@ -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() { : }
Signature · 1 line
1.7.10.4
PATCH 3/4 webmin: fix for changes in OE-Core master
In reply to Paul Eggleton* 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
--- recipes-extended/webmin/webmin_1.620.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-extended/webmin/webmin_1.620.bb +3 -3
@@ -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"
Signature · 1 line
1.7.10.4
PATCH 4/4 webmin: correct net-lib.pl patch
In reply to Paul EggletonFrom: Kevin Strasser <[email protected]>
remove absolute path from reference to debian-linux-lib.pl
--- recipes-extended/webmin/files/net-lib.pl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/webmin/files/net-lib.pl.patch +1 -1
@@ -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()
Signature · 1 line
1.7.10.4
Quoted 19 lines
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-contribpaule/webmin-update
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/webmin-updateKevin Strasser (1):
webmin: correct net-lib.pl patchPaul Eggleton (3):
webmin: update to 1.620
webmin: tidy up recipe
webmin: fix for changes in OE-Core master
Quoted 7 lines
.../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
Quoted 20 lines · On Tuesday 26 February 2013 11:56:49 [email protected] wrote:
Quoted 14 lines
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-contribpaule/webmin-update
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/webmin-up
date>
Kevin Strasser (1):
webmin: correct net-lib.pl patchQuoted 5 lines
Paul Eggleton (3):
webmin: update to 1.620
webmin: tidy up recipe
webmin: fix for changes in OE-Core master
Quoted 7 lines
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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre