From a91448bf731ef29a841a93e991e7b75efb5f1e28 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Aug 2019 17:21:23 +0100 Subject: 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 --- .../conf/distro/include/poky-distro-alt-test-config.inc | 6 ++++++ meta-poky/conf/distro/poky-altcfg.conf | 11 +++++++++++ meta-poky/conf/distro/poky-lsb.conf | 13 ------------- 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 meta-poky/conf/distro/poky-altcfg.conf delete mode 100644 meta-poky/conf/distro/poky-lsb.conf (limited to 'meta-poky') 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 @@ +# Add an extra DISTRO_FEATURE DISTRO_FEATURES_append = " pam" + +# Use the LTSI Kernel PREFERRED_VERSION_linux-yocto ?= "4.19%" + +# Ensure the kernel nfs server is enabled +KERNEL_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 @@ +# +# An example of subclassing a distro, primarily used for testing alternate configuration +# combinations on the Yocto Project autobuilder +# +require conf/distro/poky.conf + +DISTRO = "poky-altcfg" +DISTROOVERRIDES = "poky:poky-altcfg" +#DISTROOVERRIDES = "poky:linuxstdbase" + +require 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 @@ - -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%" -- cgit v1.2.3-54-g00ecf