diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2015-11-02 16:59:37 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:40 +0000 |
| commit | 37ddd3e6a22afc9c725bbd6a823c1d2dd7cf3012 (patch) | |
| tree | deb0dac0a28fd338c6f0a80e1aa0f14ebbf83cb0 /meta-yocto/conf | |
| parent | 9cc221dcb6af71ae8a4faa3297269ae80c7e35dd (diff) | |
| download | poky-37ddd3e6a22afc9c725bbd6a823c1d2dd7cf3012.tar.gz | |
Revert "local.conf.sample: Disable image-prelink by default"
This reverts commit 6dd28030f323d7106a02ec54ce4e249561ab0836.
Prelink now works properly again. Re-enable the functionality.
(From meta-yocto rev: 582cfda2ebaddaa3707e38c30d98cb61f28f33d9)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
| -rw-r--r-- | meta-yocto/conf/local.conf.sample | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index bf6dd90cc8..371349d3f2 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample | |||
| @@ -151,9 +151,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" | |||
| 151 | # - 'image-swab' to perform host system intrusion detection | 151 | # - 'image-swab' to perform host system intrusion detection |
| 152 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | 152 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink |
| 153 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | 153 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended |
| 154 | # NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised | 154 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
| 155 | # that you do NOT run the prelinker at this time. | ||
| 156 | USER_CLASSES ?= "buildstats image-mklibs" | ||
| 157 | 155 | ||
| 158 | # | 156 | # |
| 159 | # Runtime testing of images | 157 | # Runtime testing of images |