Signed-off-by: Adrian Bunk <[email protected]> --- .../distro/include/poky-distro-alt-test-config.inc | 2 +- meta-poky/conf/distro/poky-lsb.conf | 13 ------------- meta-poky/conf/distro/poky-tiny.conf | 3 --- meta-poky/conf/local.conf.sample.extended | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 meta-poky/conf/distro/poky-lsb.conf
diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 081584f397..dff5804530 100644 --- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -1,2 +1,2 @@ DISTRO_FEATURES_append = " pam" -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "4.19%" diff --git a/meta-poky/conf/distro/poky-lsb.conf b/meta-poky/conf/distro/poky-lsb.conf deleted file mode 100644 index 9b36c87c48..0000000000 --- a/meta-poky/conf/distro/poky-lsb.conf +++ /dev/null @@ -1,13 +0,0 @@ - -require conf/distro/poky.conf - -DISTRO = "poky-lsb" -DISTROOVERRIDES = "poky:linuxstdbase" - -DISTRO_FEATURES_append = " pam" - -# Ensure the kernel nfs server is enabled -KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" - -# Use the LTSI Kernel for LSB Testing -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%" diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 1f8b6e8ff3..8236b6f273 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf @@ -117,9 +117,6 @@ PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" PNBLACKLIST[core-image-clutter] = "not buildable with poky-tiny" PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended index 77e8be26fa..dc92a16f6c 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/meta-poky/conf/local.conf.sample.extended @@ -270,7 +270,7 @@ DISTRO_FEATURES_remove = "x11" # # By including the security_flags include file you enable flags # to the compiler and linker that cause them to generate more secure -# code, this is enabled by default in the poky-lsb distro. +# code. # This does affect compile speed slightly. # # Use the following line to enable the security compiler and linker flags to your build -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
