[OE-core] [PATCH 4/4] Revert "local.conf.sample: Disable image-prelink by default"

[Khem Raj]

On Mon, Nov 2, 2015 at 4:07 PM, Mark Hatle <mark.hatle at windriver.com> wrote:
> This reverts commit 6dd28030f323d7106a02ec54ce4e249561ab0836.
>
> Prelink now works properly again.  Re-enable the functionality.
>
> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
> ---
>  meta/conf/local.conf.sample | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
> index 9d1480e..3ae24ab 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"

With all the discussions around benefits of it recently, I think its
better disabled IMO,