diff options
Diffstat (limited to 'recipes-extended/webmin')
| -rw-r--r-- | recipes-extended/webmin/files/fdisk-partprobe-fix.patch | 16 | ||||
| -rw-r--r-- | recipes-extended/webmin/webmin_1.570.bb | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch new file mode 100644 index 0000000..2279c96 --- /dev/null +++ b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch @@ -0,0 +1,16 @@ +# Fix prepending partprobe command in fdisk module library code +# +# Upstream-status: Pending +# +# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- webmin-1.570.orig/fdisk/fdisk-lib.pl ++++ webmin-1.570/fdisk/fdisk-lib.pl +@@ -940,7 +940,7 @@ elsif ($_[0] eq "fatx") { + $cmd = "mkfs -t $_[0] $_[1]"; + } + if (&has_command("partprobe")) { +- $cmd .= "partprobe ; $cmd"; ++ $cmd = "partprobe ; $cmd"; + } + return $cmd; + } diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb index f0f9bed..deeda9d 100644 --- a/recipes-extended/webmin/webmin_1.570.bb +++ b/recipes-extended/webmin/webmin_1.570.bb @@ -9,12 +9,13 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-modul 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" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \ file://init-exclude.patch \ - file://net-generic.patch" + file://net-generic.patch \ + file://fdisk-partprobe-fix.patch" inherit allarch perlnative update-rc.d |