From: Mark Hatle <mark.hatle@windriver.com>
Date: Mon, 15 Aug 2016 21:29:34 +0000 (-0500)
Subject: Revert "local.conf.sample: Disable prelink by default"
X-Git-Tag: uninative-1.4~509
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0b191e4bf0cba77669497d272dda46c536f7e527;p=openembedded-core.git

Revert "local.conf.sample: Disable prelink by default"

This reverts commit 300f858ba07c938427ccd05a3d7220027a03d461.

Reenable prelink

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 2949ffba1c..85c5e21fb5 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -129,8 +129,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-# image-prelink disabled for now due to issues with IFUNC symbol relocation
-USER_CLASSES ?= "buildstats image-mklibs"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 
 #