summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2015-11-02 16:59:37 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:32:54 +0000
commitacde2739c628c0af172e8c6b4fe25f4705384cf7 (patch)
tree32535a20b2bd7d266683ffbd5572bc53be89afca
parentc725328f2ab5c9b220c552ed37c0d24b098a218d (diff)
downloadopenembedded-core-contrib-acde2739c628c0af172e8c6b4fe25f4705384cf7.tar.gz
openembedded-core-contrib-acde2739c628c0af172e8c6b4fe25f4705384cf7.tar.bz2
openembedded-core-contrib-acde2739c628c0af172e8c6b4fe25f4705384cf7.zip
Revert "local.conf.sample: Disable image-prelink by default"
This reverts commit 6dd28030f323d7106a02ec54ce4e249561ab0836. Prelink now works properly again. Re-enable the functionality. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/conf/local.conf.sample4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 9d1480e42e..3ae24aba9d 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -128,9 +128,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
-# NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised
-# that you do NOT run the prelinker at this time.
-USER_CLASSES ?= "buildstats image-mklibs"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
#