diff options
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg.inc')
-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 () { | |||
35 | autotools_do_configure | 35 | autotools_do_configure |
36 | } | 36 | } |
37 | 37 | ||
38 | POSTLOG ?= "/var/log/postinstall.log" | ||
39 | REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" | ||
40 | REDIRECT_CMD[vardepsexclude] += "IMAGE_FEATURES POSTLOG" | ||
41 | |||
42 | DPKG_INIT_POSITION ?= "98" | 38 | DPKG_INIT_POSITION ?= "98" |
43 | 39 | ||
44 | do_install_append () { | 40 | do_install_append () { |
@@ -67,7 +63,12 @@ if [ "x$D" != "x" ] && [ -f $D/var/lib/dpkg/status ]; then | |||
67 | 63 | ||
68 | # this happens at S98 where our good 'ole packages script used to run | 64 | # this happens at S98 where our good 'ole packages script used to run |
69 | echo "#!/bin/sh | 65 | echo "#!/bin/sh |
70 | dpkg --configure -a ${REDIRECT_CMD} | 66 | [ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst |
67 | if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then | ||
68 | dpkg --configure -a >\$LOGFILE 2>&1 | ||
69 | else | ||
70 | dpkg --configure -a | ||
71 | fi | ||
71 | rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | 72 | rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts |
72 | " > $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | 73 | " > $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts |
73 | chmod 0755 $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | 74 | chmod 0755 $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts |