Handle image-prelink removal

Upstream oe-core has removed image-prelink.bbclass, which had already
been disabled locally in the poky-agl distro configuration.  Remove
the dangling references to match upstream, and avoid errors in some
configurations.

Bug-AGL: SPEC-4578

Change-Id: I0a8114dacf29d76170676ccc37252eef80d77408
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 19a21ad..1833c25 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -106,11 +106,6 @@ CONNECTIVITY_CHECK_URIS ?= ""
 # Not yet upstreamed; should be submitted.
 SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
 
-#Redefined USER_CLASSES
-#Disable prelink. It is unmaintained and likely will go away.
-#default: USER_CLASSES ?= "buildstats image-prelink"
-USER_CLASSES = "buildstats"
-
 # AGL uses 4 optimization levels
 # 2 for ARM 32bit 
 #   - a high and a medium setting for the CCARGS

diff --git a/meta-agl-core/conf/local.conf.sample b/meta-agl-core/conf/local.conf.sample
index ecc9b14..4cfae4c 100644 (file)
--- a/meta-agl-core/conf/local.conf.sample
+++ b/meta-agl-core/conf/local.conf.sample
@@ -148,11 +148,7 @@ 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-prelink"
+USER_CLASSES ?= "buildstats"
 
 #
 # Runtime testing of images

diff --git a/meta-agl-core/conf/templates/base/local.conf.sample b/meta-agl-core/conf/templates/base/local.conf.sample
index 7f2c0b1..be49ed0 100644 (file)
--- a/meta-agl-core/conf/templates/base/local.conf.sample
+++ b/meta-agl-core/conf/templates/base/local.conf.sample
@@ -149,8 +149,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-prelink' in order to prelink the filesystem image
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 #
 # Runtime testing of images