summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf/local.conf.sample
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-08-15 16:29:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-19 10:23:55 +0100
commit63dcfa8f1394475073f6dbb5f3f6ede284d5a305 (patch)
treeccfe320e30fd5e58bcc5b3d44d8da45933faa04f /meta-poky/conf/local.conf.sample
parentfc16cfc01ac0a5af1a3d90edc8bbda5f2efbf70c (diff)
downloadpoky-63dcfa8f1394475073f6dbb5f3f6ede284d5a305.tar.gz
Revert "local.conf.sample: Disable prelink by default"
This reverts commit 300f858ba07c938427ccd05a3d7220027a03d461. Reenable prelink (From meta-yocto rev: 91705d8ae9f56d1de4f0fdcd6a9654b75921aa8c) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf/local.conf.sample')
-rw-r--r--meta-poky/conf/local.conf.sample3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample
index a7b2d8065d..365b6eb20c 100644
--- a/meta-poky/conf/local.conf.sample
+++ b/meta-poky/conf/local.conf.sample
@@ -152,8 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
152# - 'image-swab' to perform host system intrusion detection 152# - 'image-swab' to perform host system intrusion detection
153# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink 153# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
154# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended 154# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
155# image-prelink disabled for now due to issues with IFUNC symbol relocation 155USER_CLASSES ?= "buildstats image-mklibs image-prelink"
156USER_CLASSES ?= "buildstats image-mklibs"
157 156
158# 157#
159# Runtime testing of images 158# Runtime testing of images