summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-28 20:36:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 14:46:53 +0100
commitd18aba9c1cb5b2cf77cfb2dff150e9003b2e63ef (patch)
tree3404d38282c2f5c8a6ced065375f5e6bd0a0cc64
parentdd31ff210a0eaf93cdcdfa2e53dada5183bcc5b8 (diff)
downloadpoky-d18aba9c1cb5b2cf77cfb2dff150e9003b2e63ef.tar.gz
prelink_git.bb: Only block the postinst script when no image-prelink
If image-prelink is being used, the system will automatically prelink the target image. This avoids the need to run the postinst prelink script at first boot. However, if the user has not enabled image prelinking -- then we do enable the script to run on first boot. (From OE-Core rev: a0ba05596a704a006ee7b97392c20b871085b1e6) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index b57c145353..c653d4d67a 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" 10LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
11SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c" 11SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
12PV = "1.0+git${SRCPV}" 12PV = "1.0+git${SRCPV}"
13PR = "r3" 13PR = "r4"
14 14
15# 15#
16# The cron script attempts to re-prelink the system daily -- on 16# The cron script attempts to re-prelink the system daily -- on
@@ -58,11 +58,13 @@ do_install_append () {
58 install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink 58 install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink
59} 59}
60 60
61# If we're using image-prelink, we want to skip this on the host side
62# but still do it if the package is installed on the target...
61pkg_postinst_prelink() { 63pkg_postinst_prelink() {
62#!/bin/sh 64#!/bin/sh
63 65
64if [ "x$D" != "x" ]; then 66if [ "x$D" != "x" ]; then
65 exit 1 67 ${@base_contains('USER_CLASSES', 'image-prelink', 'exit 0', 'exit 1', d)}
66fi 68fi
67 69
68prelink -a 70prelink -a