summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 17:21:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 14:05:12 +0100
commita91448bf731ef29a841a93e991e7b75efb5f1e28 (patch)
treef8d9234dbbdd083ad60cc5b06b8e57ef6c91896f /meta-poky
parent66dba027289d7dd20df4bae9ae4307ae3a225216 (diff)
downloadpoky-a91448bf731ef29a841a93e991e7b75efb5f1e28.tar.gz
poky-altcfg: Replace poky-lsb with poky-altcfg
LSB has been removed, replace poky-lsb with poky-altcfg, a place where we can test different configurations on the autobuilder as well as showing an example of how to subclass a distro configuration. (From meta-yocto rev: 00fdefff55717331a220fe624f29c387970d31d7) 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.inc6
-rw-r--r--meta-poky/conf/distro/poky-altcfg.conf11
-rw-r--r--meta-poky/conf/distro/poky-lsb.conf13
3 files changed, 17 insertions, 13 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 dff5804530..9926c1bb02 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,8 @@
1# Add an extra DISTRO_FEATURE
1DISTRO_FEATURES_append = " pam" 2DISTRO_FEATURES_append = " pam"
3
4# Use the LTSI Kernel
2PREFERRED_VERSION_linux-yocto ?= "4.19%" 5PREFERRED_VERSION_linux-yocto ?= "4.19%"
6
7# Ensure the kernel nfs server is enabled
8KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf
new file mode 100644
index 0000000000..c132349afd
--- /dev/null
+++ b/meta-poky/conf/distro/poky-altcfg.conf
@@ -0,0 +1,11 @@
1#
2# An example of subclassing a distro, primarily used for testing alternate configuration
3# combinations on the Yocto Project autobuilder
4#
5require conf/distro/poky.conf
6
7DISTRO = "poky-altcfg"
8DISTROOVERRIDES = "poky:poky-altcfg"
9#DISTROOVERRIDES = "poky:linuxstdbase"
10
11require conf/distro/include/poky-distro-alt-test-config.inc
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 @@
1
2require conf/distro/poky.conf
3
4DISTRO = "poky-lsb"
5DISTROOVERRIDES = "poky:linuxstdbase"
6
7DISTRO_FEATURES_append = " pam"
8
9# Ensure the kernel nfs server is enabled
10KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
11
12# Use the LTSI Kernel for LSB Testing
13PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%"