summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-08-25 19:56:57 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 14:05:12 +0100
commit66dba027289d7dd20df4bae9ae4307ae3a225216 (patch)
tree8e0cf9b55085094f5cf7475f46427ca3be48c7d6 /meta-poky
parentf7298d88ea3a8069b22fd5ffa13500ec600a9674 (diff)
downloadopenembedded-core-contrib-66dba027289d7dd20df4bae9ae4307ae3a225216.tar.gz
Remove LSB support bits
LSB as a standard isn't current and isn't well suited to embedded anyway. Its putting artifical constraints on the system and with modern layer technology, would now be better off as its own layer. As such its time to split it out. (From meta-yocto rev: 8bb0237a74c2b66d0d0f19e600a5fb39df67894f) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky')
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc2
-rw-r--r--meta-poky/conf/distro/poky-tiny.conf3
-rw-r--r--meta-poky/conf/local.conf.sample.extended2
3 files changed, 2 insertions, 5 deletions
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-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