1 files changed, 9 insertions, 0 deletions

diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample
index 365b6eb20c..422210ac0a 100644
--- a/meta-poky/conf/local.conf.sample
+++ b/meta-poky/conf/local.conf.sample
@@ -219,6 +219,15 @@ BB_DISKMON_DIRS = "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
 
+# Prelinker tests are currently failing on ARM and PPC.  Prevent us from
+# running on those architectures until the failure is explained.
+USER_CLASSES_remove_arm = 'image-prelink'
+USER_CLASSES_remove_armeb = 'image-prelink'
+USER_CLASSES_remove_aarch64 = 'image-prelink'
+USER_CLASSES_remove_aarch64eb = 'image-prelink'
+USER_CLASSES_remove_powerpc = 'image-prelink'
+USER_CLASSES_remove_powerpc64 = 'image-prelink'
+
 
 #
 # Qemu configuration