Patchwork [1/3] groff: fix pkg_postinst and remove unneeded do_install_prepend

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Oct. 31, 2013, 6 a.m.
Message ID <67bc23cf500fe1ab119107f0d08b9370dfc14161.1383188560.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/60847/
State Accepted
Commit 2e0f7cfe0efa9d331785e1fcac95bd17b997983b
Headers show

Comments

Qi.Chen@windriver.com - Oct. 31, 2013, 6 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

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>
---
 meta/recipes-extended/groff/groff_1.18.1.4.bb |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Patch

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 9838698..28105f8 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"
 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
 }