diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-10-31 14:00:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-01 11:09:05 +0000 |
commit | 2e0f7cfe0efa9d331785e1fcac95bd17b997983b (patch) | |
tree | 0d7017f58d3c2f7d9699322bc270409e96656f0b | |
parent | a04b6115b10145a1669a14bf3146cc38b728e679 (diff) | |
download | poky-2e0f7cfe0efa9d331785e1fcac95bd17b997983b.tar.gz |
groff: fix pkg_postinst and remove unneeded do_install_prepend
Fix to take $D into consideration in pkg_postinst so that the postinst
script could run at rootfs time.
The existence of ${D} is ensured by the in base.bbclass.
do_install[dirs] = "${D} ${S} ${B}"
So there's no need for this do_install_prepend.
(From OE-Core rev: 4facf4df0bc0d71d11ba53737faff6f2c6e5863b)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/groff/groff_1.18.1.4.bb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb index 9838698010..28105f8b43 100644 --- a/meta/recipes-extended/groff/groff_1.18.1.4.bb +++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb | |||
@@ -21,16 +21,10 @@ SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287" | |||
21 | SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d" | 21 | SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d" |
22 | PARALLEL_MAKE = "" | 22 | PARALLEL_MAKE = "" |
23 | 23 | ||
24 | |||
25 | do_configure (){ | 24 | do_configure (){ |
26 | oe_runconf | 25 | oe_runconf |
27 | } | 26 | } |
28 | 27 | ||
29 | do_install_prepend() { | ||
30 | install -m 0755 -d ${D} | ||
31 | } | ||
32 | |||
33 | |||
34 | do_install_append() { | 28 | do_install_append() { |
35 | mkdir -p ${D}${sysconfdir}/groff | 29 | mkdir -p ${D}${sysconfdir}/groff |
36 | cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/ | 30 | cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/ |
@@ -38,8 +32,8 @@ do_install_append() { | |||
38 | } | 32 | } |
39 | 33 | ||
40 | pkg_postinst_${PN}() { | 34 | pkg_postinst_${PN}() { |
41 | ln -s ${bindir}/tbl ${bindir}/gtbl | 35 | ln -s tbl $D${bindir}/gtbl |
42 | echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> ${sysconfdir}/profile | 36 | echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> $D${sysconfdir}/profile |
43 | echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> ${sysconfdir}/profile | 37 | echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> $D${sysconfdir}/profile |
44 | } | 38 | } |
45 | 39 | ||