summaryrefslogtreecommitdiff
path: root/poky/meta-poky/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta-poky/conf/distro')
-rw-r--r--poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc2
-rw-r--r--poky/meta-poky/conf/distro/poky-lsb.conf3
-rw-r--r--poky/meta-poky/conf/distro/poky.conf3
3 files changed, 6 insertions, 2 deletions
diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
new file mode 100644
index 000000000..081584f39
--- /dev/null
+++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
@@ -0,0 +1,2 @@
+DISTRO_FEATURES_append = " pam"
+PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%"
diff --git a/poky/meta-poky/conf/distro/poky-lsb.conf b/poky/meta-poky/conf/distro/poky-lsb.conf
index 5c7e2720a..9b36c87c4 100644
--- a/poky/meta-poky/conf/distro/poky-lsb.conf
+++ b/poky/meta-poky/conf/distro/poky-lsb.conf
@@ -4,8 +4,7 @@ require conf/distro/poky.conf
DISTRO = "poky-lsb"
DISTROOVERRIDES = "poky:linuxstdbase"
-DISTRO_FEATURES_append = " pam largefile opengl"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+DISTRO_FEATURES_append = " pam"
# Ensure the kernel nfs server is enabled
KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf
index 78621e6db..ac6368dda 100644
--- a/poky/meta-poky/conf/distro/poky.conf
+++ b/poky/meta-poky/conf/distro/poky.conf
@@ -56,10 +56,13 @@ SANITY_TESTED_DISTROS ?= " \
ubuntu-18.04 \n \
fedora-28 \n \
fedora-29 \n \
+ fedora-30 \n \
centos-7 \n \
debian-8 \n \
debian-9 \n \
+ debian-10 \n \
opensuse-42.3 \n \
+ opensuseleap-15.1 \n \
"
#
# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in