From 75750cb10c90017f58693c4e13c93361c1351e3c Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 9 Dec 2021 13:31:33 +0100
Subject: [PATCH] local.conf.sample: Drop image-mklibs

image-mklibs was removed in oe-core due to python3 incompatibility and
lack of testing. This change drops them from local.conf sample files as
well.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
 flavours/linux/local.conf.sample  | 5 +----
 flavours/zephyr/local.conf.sample | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index a387b6f5..63f7de3a 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -131,11 +131,8 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
-# 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
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 #
 # Runtime testing of images
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index 35a1ec49..de9d8778 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -134,11 +134,8 @@ PACKAGE_CLASSES ?= "package_rpm"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
-# 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
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 #
 # Runtime testing of images
-- 
GitLab