The patch "fdisk-partprobe-fix.patch" has been accepted upstream and is no longer needed.
Signed-off-by: Kevin Strasser <kevin.stras...@linux.intel.com> --- .../webmin/files/fdisk-partprobe-fix.patch | 16 ---------------- .../webmin/{webmin_1.570.bb => webmin_1.590.bb} | 7 +++---- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 recipes-extended/webmin/files/fdisk-partprobe-fix.patch rename recipes-extended/webmin/{webmin_1.570.bb => webmin_1.590.bb} (96%) diff --git a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch deleted file mode 100644 index 2279c96..0000000 --- a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Fix prepending partprobe command in fdisk module library code -# -# Upstream-status: Pending -# -# Signed-off-by: Paul Eggleton <paul.eggle...@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.590.bb similarity index 96% rename from recipes-extended/webmin/webmin_1.570.bb rename to recipes-extended/webmin/webmin_1.590.bb index cf52030..a408092 100644 --- a/recipes-extended/webmin/webmin_1.570.bb +++ b/recipes-extended/webmin/webmin_1.590.bb @@ -9,13 +9,12 @@ 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-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature" -PR = "r13" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \ file://init-exclude.patch \ file://net-generic.patch \ - file://fdisk-partprobe-fix.patch \ file://remove-startup-option.patch \ file://disable-version-check.patch \ file://nfs-export.patch \ @@ -26,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://net-lib.pl.patch \ file://media-tomb.patch" -SRC_URI[md5sum] = "20b4f488637366c39458b9b93162eff3" -SRC_URI[sha256sum] = "3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54" +SRC_URI[md5sum] = "815005ed7f208dcfbda5308b446779c2" +SRC_URI[sha256sum] = "07b06612a8bc864388d86b55ec9a9adba0fa71ec60cc66d87c0e58280264182d" inherit allarch perlnative update-rc.d -- 1.7.9.5 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto