summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-amd/meta-ethanolx/conf/local.conf.sample3
-rw-r--r--meta-ampere/meta-jade/conf/local.conf.sample3
-rw-r--r--meta-asrock/meta-e3c246d4i/conf/local.conf.sample2
-rw-r--r--meta-bytedance/meta-g220a/conf/local.conf.sample2
-rw-r--r--meta-fii/meta-kudo/conf/local.conf.sample2
-rw-r--r--meta-inspur/meta-fp5280g2/conf/local.conf.sample2
-rw-r--r--meta-inspur/meta-on5263m5/conf/local.conf.sample4
-rw-r--r--meta-tyan/meta-s7106/conf/local.conf.sample2
8 files changed, 8 insertions, 12 deletions
diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/local.conf.sample
index d09cabf3ec..ae0ecf276b 100644
--- a/meta-amd/meta-ethanolx/conf/local.conf.sample
+++ b/meta-amd/meta-ethanolx/conf/local.conf.sample
@@ -148,11 +148,10 @@ 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
# - '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
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
#
# Runtime testing of images
diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample
index f393fceb26..3002e1491d 100644
--- a/meta-ampere/meta-jade/conf/local.conf.sample
+++ b/meta-ampere/meta-jade/conf/local.conf.sample
@@ -126,11 +126,10 @@ 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
# - '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
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
#
# Runtime testing of images
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
index 43a5b96ee8..b36c439c2b 100644
--- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
@@ -3,7 +3,7 @@ DISTRO ?= "openbmc-phosphor"
PACKAGE_CLASSES ?= "package_ipk"
SANITY_TESTED_DISTROS:append ?= " *"
EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \
diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/local.conf.sample
index e6f1ca4584..b83b7f8140 100644
--- a/meta-bytedance/meta-g220a/conf/local.conf.sample
+++ b/meta-bytedance/meta-g220a/conf/local.conf.sample
@@ -3,7 +3,7 @@ DISTRO ?= "openbmc-phosphor"
PACKAGE_CLASSES ?= "package_ipk"
SANITY_TESTED_DISTROS:append ?= " *"
EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \
diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample
index ad8272cf5a..f485bb649a 100644
--- a/meta-fii/meta-kudo/conf/local.conf.sample
+++ b/meta-fii/meta-kudo/conf/local.conf.sample
@@ -3,7 +3,7 @@ DISTRO ?= "openbmc-kudo"
PACKAGE_CLASSES ?= "package_ipk"
SANITY_TESTED_DISTROS:append ?= " *"
EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \
diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample
index 1e3361ff55..c84a34ba59 100644
--- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample
+++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample
@@ -3,7 +3,7 @@ DISTRO ?= "openbmc-fp5280g2"
PACKAGE_CLASSES ?= "package_ipk"
SANITY_TESTED_DISTROS:append ?= " *"
EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS ??= "\
STOPTASKS,${TMPDIR},1G,100K \
diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample
index 821133cf77..683666b432 100644
--- a/meta-inspur/meta-on5263m5/conf/local.conf.sample
+++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample
@@ -147,11 +147,9 @@ 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
# - '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
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
#
# Runtime testing of images
diff --git a/meta-tyan/meta-s7106/conf/local.conf.sample b/meta-tyan/meta-s7106/conf/local.conf.sample
index 1cfd495bfd..c9f35dbc3b 100644
--- a/meta-tyan/meta-s7106/conf/local.conf.sample
+++ b/meta-tyan/meta-s7106/conf/local.conf.sample
@@ -3,7 +3,7 @@ DISTRO ?= "openbmc-phosphor"
PACKAGE_CLASSES ?= "package_ipk"
SANITY_TESTED_DISTROS:append ?= " *"
EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \