aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/webmin
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-10-28 14:01:00 +0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-09 14:09:23 +0000
commit80274da40daaccf72cb0c30bce853a4f15634798 (patch)
tree875dfced0105109b3cb65ab9fb57325ffabe490e /recipes-extended/webmin
parent5251042271b1f358c6ef6454ec4cad67ab204d3a (diff)
downloadmeta-baryon-80274da40daaccf72cb0c30bce853a4f15634798.tar.gz
meta-baryon-80274da40daaccf72cb0c30bce853a4f15634798.tar.bz2
meta-baryon-80274da40daaccf72cb0c30bce853a4f15634798.zip
webmin: make Network Configuration module work
1) add perl-module-file-copy into RDEPENDS since debian-linux-lib.pl needs that. 2) let generic-linux-lib.pl use debian-linux-lib.pl. This is a hack. We need to work out a better fix. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'recipes-extended/webmin')
-rw-r--r--recipes-extended/webmin/files/net-lib.pl.patch19
-rw-r--r--recipes-extended/webmin/webmin_1.570.bb5
2 files changed, 22 insertions, 2 deletions
diff --git a/recipes-extended/webmin/files/net-lib.pl.patch b/recipes-extended/webmin/files/net-lib.pl.patch
new file mode 100644
index 0000000..62d28db
--- /dev/null
+++ b/recipes-extended/webmin/files/net-lib.pl.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Inappropriate [config]
+
+XXX: need to work out a better fix.
+
+Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
+
+diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl
+--- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800
++++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800
+@@ -21,7 +21,8 @@
+ do "$gconfig{'os_type'}-9.1-ALL-lib.pl";
+ }
+ else {
+- do "$gconfig{'os_type'}-lib.pl";
++ #do "$gconfig{'os_type'}-lib.pl";
++ do "/usr/libexec/webmin/net/debian-linux-lib.pl";
+ }
+
+ # list_hosts()
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
index 5467ed3..1d10507 100644
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ b/recipes-extended/webmin/webmin_1.570.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c"
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-warnings-register 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-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
+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 = "r6"
+PR = "r8"
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://setup.sh \
@@ -22,6 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://mount-excludefs.patch \
file://samba-config-fix.patch \
file://proftpd-config-fix.patch \
+ file://net-lib.pl.patch \
file://media-tomb.patch"
inherit allarch perlnative update-rc.d