]> code.ossystems Code Review - openembedded-core.git/commitdiff
groff: fix pkg_postinst and remove unneeded do_install_prepend
authorChen Qi <Qi.Chen@windriver.com>
Thu, 31 Oct 2013 06:00:11 +0000 (14:00 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 1 Nov 2013 11:08:31 +0000 (11:08 +0000)
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.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-extended/groff/groff_1.18.1.4.bb

index 9838698010499301d2740aae2b3bcaa960fa5ee0..28105f8b43c16760f25270c03680795fbde28ca9 100644 (file)
@@ -21,16 +21,10 @@ SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287"
 SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d"
 PARALLEL_MAKE = ""
 
-
 do_configure (){
     oe_runconf
 }
 
-do_install_prepend() {
-       install -m 0755 -d ${D}
-}
-
-
 do_install_append() {
        mkdir -p ${D}${sysconfdir}/groff
        cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/
@@ -38,8 +32,8 @@ do_install_append() {
 }
 
 pkg_postinst_${PN}() {
-       ln -s ${bindir}/tbl ${bindir}/gtbl
-       echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> ${sysconfdir}/profile
-       echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> ${sysconfdir}/profile
+       ln -s tbl $D${bindir}/gtbl
+       echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> $D${sysconfdir}/profile
+       echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> $D${sysconfdir}/profile
 }