summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-06-26 16:33:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:34:23 +0100
commitf4552c83cdf07ae124539072a8492bf8b41a2b37 (patch)
tree3d07291154f3e0094bbbe682f9932a3436e061e0 /meta
parentb9056faa8b5c8e86e399b452ad57bad945be937c (diff)
downloadpoky-f4552c83cdf07ae124539072a8492bf8b41a2b37.tar.gz
mc: Don't remove libdir and split helpers into packages
It contains helper programs that are needed to make mc do the right actions for the various file formats it understands. The helpers are perl, python and shell scripts, split them out so the core mc does not try to pull in perl and python, it will still run without these helpers. [YOCTO #4432] (From OE-Core rev: 6d0205576ef1e8a62c469b883dc0c962440469a7) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mc/mc_4.7.5.2.bb26
-rw-r--r--meta/recipes-extended/mc/mc_4.8.8.bb23
2 files changed, 46 insertions, 3 deletions
diff --git a/meta/recipes-extended/mc/mc_4.7.5.2.bb b/meta/recipes-extended/mc/mc_4.7.5.2.bb
index e7ccc77caf..52e4f401a3 100644
--- a/meta/recipes-extended/mc/mc_4.7.5.2.bb
+++ b/meta/recipes-extended/mc/mc_4.7.5.2.bb
@@ -20,6 +20,28 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-
20FILES_${PN}-dbg += "${libexecdir}/mc/.debug/" 20FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
21 21
22do_install_append () { 22do_install_append () {
23 sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* 23 sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*
24 24 sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/*
25} 25}
26
27PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers-python ${BPN}-helpers ${BPN}-fish"
28
29DESCRIPTION_${BPN}-helpers-perl = "Midnight Commander perl based helper scripts"
30FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \
31 ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \
32 ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \
33 ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \
34 ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \
35 ${libexecdir}/mc/extfs.d/uzip"
36RDEPENDS_${BPN}-helpers-perl = "perl"
37
38DESCRIPTION_${BPN}-helpers-python = "Midnight Commander python based helper scripts"
39FILES_${BPN}-helpers-python = "${libexecdir}/mc/extfs.d/s3+ ${libexecdir}/mc/extfs.d/uc1541"
40RDEPENDS_${BPN}-helpers-python = "python"
41
42DESCRIPTION_${BPN}-helpers = "Midnight Commander shell helper scripts"
43FILES_${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*"
44
45DESCRIPTION_${BPN}-fish = "Midnight Commander Fish scripts"
46FILES_${BPN}-fish = "${libexecdir}/mc/fish"
47
diff --git a/meta/recipes-extended/mc/mc_4.8.8.bb b/meta/recipes-extended/mc/mc_4.8.8.bb
index 20ae797999..94924adae7 100644
--- a/meta/recipes-extended/mc/mc_4.8.8.bb
+++ b/meta/recipes-extended/mc/mc_4.8.8.bb
@@ -19,5 +19,26 @@ FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
19 19
20do_install_append () { 20do_install_append () {
21 sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* 21 sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*
22 rm -rf ${D}${libdir} 22 sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/*
23} 23}
24
25PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers-python ${BPN}-helpers ${BPN}-fish"
26
27DESCRIPTION_${BPN}-helpers-perl = "Midnight Commander perl based helper scripts"
28FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \
29 ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \
30 ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \
31 ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \
32 ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \
33 ${libexecdir}/mc/extfs.d/uzip"
34RDEPENDS_${BPN}-helpers-perl = "perl"
35
36DESCRIPTION_${BPN}-helpers-python = "Midnight Commander python based helper scripts"
37FILES_${BPN}-helpers-python = "${libexecdir}/mc/extfs.d/s3+ ${libexecdir}/mc/extfs.d/uc1541"
38RDEPENDS_${BPN}-helpers-python = "python"
39
40DESCRIPTION_${BPN}-helpers = "Midnight Commander shell helper scripts"
41FILES_${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*"
42
43DESCRIPTION_${BPN}-fish = "Midnight Commander Fish scripts"
44FILES_${BPN}-fish = "${libexecdir}/mc/fish"