diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-05-23 12:43:34 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-23 10:27:46 +0100 |
| commit | 881880992ac0edc5f928f7e3d2a8f3f993284df6 (patch) | |
| tree | 6ed4834c55aa1c438875eaebe97bba5c89636d52 | |
| parent | 99175cabc3936733dd92fac5ebc6f865b864fe92 (diff) | |
| download | openembedded-core-881880992ac0edc5f928f7e3d2a8f3f993284df6.tar.gz openembedded-core-881880992ac0edc5f928f7e3d2a8f3f993284df6.tar.bz2 openembedded-core-881880992ac0edc5f928f7e3d2a8f3f993284df6.zip | |
dpkg: modify the run-postinst script to enable postinst logging
Enable postinst logging by checking the configuration in ${sysconfdir}
/default/postinst.
In this way, the postinst logging is enabled if 'debug-tweaks' is
in IMAGE_FEATURES, and at the same time, we avoid unnecessary rebuilt
if IMAGE_FEATURES is changed.
[YOCTO #4262]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index d773fbdc5a..619777701f 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -35,10 +35,6 @@ do_configure () { autotools_do_configure } -POSTLOG ?= "/var/log/postinstall.log" -REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" -REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG" - DPKG_INIT_POSITION ?= "98" do_install_append () { @@ -67,7 +63,12 @@ if [ "x$D" != "x" ] && [ -f $D/var/lib/dpkg/status ]; then # this happens at S98 where our good 'ole packages script used to run echo "#!/bin/sh -dpkg --configure -a ${REDIRECT_CMD} +[ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst +if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then + dpkg --configure -a >\$LOGFILE 2>&1 +else + dpkg --configure -a +fi rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts " > $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts chmod 0755 $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts |