From: Alexander Kanavin Date: Wed, 6 Mar 2024 15:42:16 +0000 (-0800) Subject: mc: upgrade 4.8.30 -> 4.8.31 X-Git-Tag: 2024-04-scarthgap~214 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc97bf745239a817af956e354b9b991bf108e59;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git mc: upgrade 4.8.30 -> 4.8.31 Fish vfs was renamed to shell vfs: https://github.com/MidnightCommander/mc/commit/6ca4ab4b4ef0f42e9b56103038b7f45e146cbdc8 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/conf/distro/include/no-gplv3.inc b/meta/conf/distro/include/no-gplv3.inc index d515fd4ad6b..b3eb936d94f 100644 --- a/meta/conf/distro/include/no-gplv3.inc +++ b/meta/conf/distro/include/no-gplv3.inc @@ -6,7 +6,7 @@ # will be a cost in reduced functionality. # Settings for full-cmdline -RDEPENDS:packagegroup-core-full-cmdline-utils:remove = "bash bc coreutils cpio ed findutils gawk grep mc mc-fish mc-helpers mc-helpers-perl sed tar time" +RDEPENDS:packagegroup-core-full-cmdline-utils:remove = "bash bc coreutils cpio ed findutils gawk grep mc mc-shell mc-helpers mc-helpers-perl sed tar time" RDEPENDS:packagegroup-core-full-cmdline-dev-utils:remove = "diffutils m4 make patch" RDEPENDS:packagegroup-core-full-cmdline-multiuser:remove = "gzip" diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ae34a8a90b3..df71695a97d 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -40,7 +40,7 @@ RDEPENDS:packagegroup-self-hosted-host-tools = "\ iptables \ lsb-release \ mc \ - mc-fish \ + mc-shell \ mc-helpers \ mc-helpers-perl \ parted \ diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch index 4ebaaa2fa73..92fa443865d 100644 --- a/meta/recipes-extended/mc/files/nomandate.patch +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -1,4 +1,4 @@ -From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001 +From 78c5fd90a052f95157b3914c708a08b2eeab0154 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Feb 2020 18:12:15 +0000 Subject: [PATCH] mc: Fix manpage date indeterminism @@ -15,13 +15,12 @@ RP 2020/2/4 Upstream-Status: Inappropriate [OE specficic reproducibility workaround] Signed-off-by: Richard Purdie - --- doc/man/date-of-man-include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am -index c6b1e69..165a796 100644 +index 96f9f10..d734c5d 100644 --- a/doc/man/date-of-man-include.am +++ b/doc/man/date-of-man-include.am @@ -1,5 +1,5 @@ diff --git a/meta/recipes-extended/mc/mc_4.8.30.bb b/meta/recipes-extended/mc/mc_4.8.31.bb similarity index 91% rename from meta/recipes-extended/mc/mc_4.8.30.bb rename to meta/recipes-extended/mc/mc_4.8.31.bb index 258ac38e157..69c32887a24 100644 --- a/meta/recipes-extended/mc/mc_4.8.30.bb +++ b/meta/recipes-extended/mc/mc_4.8.31.bb @@ -11,7 +11,7 @@ RRECOMMENDS:${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://nomandate.patch \ " -SRC_URI[sha256sum] = "38171f22f889e3030ec9055463d3ecd7843984ab24e6497d8294d1c441a7ddb4" +SRC_URI[sha256sum] = "f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841" inherit autotools gettext pkgconfig @@ -39,7 +39,7 @@ do_install:append () { rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 } -PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" +PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-shell" SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ @@ -53,5 +53,5 @@ RDEPENDS:${BPN}-helpers-perl = "perl" SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" -SUMMARY:${BPN}-fish = "Midnight Commander Fish scripts" -FILES:${BPN}-fish = "${libexecdir}/mc/fish" +SUMMARY:${BPN}-shell = "Midnight Commander Shell scripts" +FILES:${BPN}-shell = "${libexecdir}/mc/shell" diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index e9531fa8381..8dc62954a21 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -42,7 +42,7 @@ RDEPENDS:packagegroup-core-full-cmdline-utils = "\ less \ makedevs \ mc \ - mc-fish \ + mc-shell \ mc-helpers \ mc-helpers-perl \ ncurses \