summaryrefslogtreecommitdiffstats
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:04:54 +0100
commit00fdefff55717331a220fe624f29c387970d31d7 (patch)
tree33a8aeed6c8fa88d188c6add88248a94ae6f1c09
parent8bb0237a74c2b66d0d0f19e600a5fb39df67894f (diff)
downloadmeta-yocto-00fdefff55717331a220fe624f29c387970d31d7.tar.gz
meta-yocto-00fdefff55717331a220fe624f29c387970d31d7.tar.bz2
meta-yocto-00fdefff55717331a220fe624f29c387970d31d7.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 dff5804..9926c1b 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 0000000..c132349
--- /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 9b36c87..0000000
--- 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%"