summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-11-20 17:36:06 -0500
committerScott Murray <scott.murray@konsulko.com>2024-04-24 12:29:35 -0400
commit2adab8ddeaf4c3d9ea25eed5c1b132dc3a10ad80 (patch)
tree9bf864bc890583ddf8a98414861742ffb83e3b09
parent6a92e37be1d70dc36f8443ec9c107fb50a4aa309 (diff)
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>
-rw-r--r--meta-agl-core/conf/distro/poky-agl.conf5
-rw-r--r--meta-agl-core/conf/local.conf.sample6
-rw-r--r--meta-agl-core/conf/templates/base/local.conf.sample3
3 files changed, 2 insertions, 12 deletions
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 19a21ad44..1833c252f 100644
--- 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 ecc9b141a..4cfae4ceb 100644
--- 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 7f2c0b11a..be49ed00d 100644
--- 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