diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:16 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | 6e342a0c76adbab316d7b49e2f6c7a3bae1a50c4 (patch) | |
tree | e1fac897b268e65e257551db2ddb85f3b18582cb /meta/recipes-extended | |
parent | 08cde8263a909da9e59c5a9e12769ed23e7ecbbe (diff) | |
download | poky-6e342a0c76adbab316d7b49e2f6c7a3bae1a50c4.tar.gz |
mc: upgrade 4.8.30 -> 4.8.31
Fish vfs was renamed to shell vfs:
https://github.com/MidnightCommander/mc/commit/6ca4ab4b4ef0f42e9b56103038b7f45e146cbdc8
(From OE-Core rev: 3dc97bf745239a817af956e354b9b991bf108e59)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/mc/files/nomandate.patch | 5 | ||||
-rw-r--r-- | meta/recipes-extended/mc/mc_4.8.31.bb (renamed from meta/recipes-extended/mc/mc_4.8.30.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch index 4ebaaa2fa7..92fa443865 100644 --- a/meta/recipes-extended/mc/files/nomandate.patch +++ b/meta/recipes-extended/mc/files/nomandate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001 | 1 | From 78c5fd90a052f95157b3914c708a08b2eeab0154 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 4 Feb 2020 18:12:15 +0000 | 3 | Date: Tue, 4 Feb 2020 18:12:15 +0000 |
4 | Subject: [PATCH] mc: Fix manpage date indeterminism | 4 | Subject: [PATCH] mc: Fix manpage date indeterminism |
@@ -15,13 +15,12 @@ RP 2020/2/4 | |||
15 | 15 | ||
16 | Upstream-Status: Inappropriate [OE specficic reproducibility workaround] | 16 | Upstream-Status: Inappropriate [OE specficic reproducibility workaround] |
17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
18 | |||
19 | --- | 18 | --- |
20 | doc/man/date-of-man-include.am | 2 +- | 19 | doc/man/date-of-man-include.am | 2 +- |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
22 | 21 | ||
23 | diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am | 22 | diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am |
24 | index c6b1e69..165a796 100644 | 23 | index 96f9f10..d734c5d 100644 |
25 | --- a/doc/man/date-of-man-include.am | 24 | --- a/doc/man/date-of-man-include.am |
26 | +++ b/doc/man/date-of-man-include.am | 25 | +++ b/doc/man/date-of-man-include.am |
27 | @@ -1,5 +1,5 @@ | 26 | @@ -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 index 258ac38e15..69c32887a2 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" | |||
11 | SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ |
12 | file://nomandate.patch \ | 12 | file://nomandate.patch \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "38171f22f889e3030ec9055463d3ecd7843984ab24e6497d8294d1c441a7ddb4" | 14 | SRC_URI[sha256sum] = "f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841" |
15 | 15 | ||
16 | inherit autotools gettext pkgconfig | 16 | inherit autotools gettext pkgconfig |
17 | 17 | ||
@@ -39,7 +39,7 @@ do_install:append () { | |||
39 | rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 | 39 | rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 |
40 | } | 40 | } |
41 | 41 | ||
42 | PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" | 42 | PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-shell" |
43 | 43 | ||
44 | SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" | 44 | SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" |
45 | FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ | 45 | FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ |
@@ -53,5 +53,5 @@ RDEPENDS:${BPN}-helpers-perl = "perl" | |||
53 | SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" | 53 | SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" |
54 | FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" | 54 | FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" |
55 | 55 | ||
56 | SUMMARY:${BPN}-fish = "Midnight Commander Fish scripts" | 56 | SUMMARY:${BPN}-shell = "Midnight Commander Shell scripts" |
57 | FILES:${BPN}-fish = "${libexecdir}/mc/fish" | 57 | 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 e9531fa838..8dc62954a2 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 = "\ | |||
42 | less \ | 42 | less \ |
43 | makedevs \ | 43 | makedevs \ |
44 | mc \ | 44 | mc \ |
45 | mc-fish \ | 45 | mc-shell \ |
46 | mc-helpers \ | 46 | mc-helpers \ |
47 | mc-helpers-perl \ | 47 | mc-helpers-perl \ |
48 | ncurses \ | 48 | ncurses \ |