From d369a45ae7c6b82f7ae337a56a673eed5afc461b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 31 Aug 2022 13:11:49 +0200 Subject: meta/conf: move default configuration templates into meta/conf/templates/default This sets the ground for standardizing (and enforcing) the location of configuration templates: let's start with the default one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes-global/sanity.bbclass | 6 +++--- meta/conf/conf-notes.txt | 19 ------------------- meta/conf/templates/default/conf-notes.txt | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta/conf/conf-notes.txt create mode 100644 meta/conf/templates/default/conf-notes.txt (limited to 'meta') diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index c90fc84b76..2d1ff7072c 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass @@ -42,7 +42,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \ SANITY_DIFF_TOOL ?= "meld" -SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/local.conf.sample" +SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" python oecore_update_localconf() { # Check we are using a valid local.conf current_conf = d.getVar('CONF_VERSION') @@ -62,7 +62,7 @@ is a good way to visualise the changes.""" raise NotImplementedError(failmsg) } -SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample" +SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/site.conf.sample" python oecore_update_siteconf() { # If we have a site.conf, check it's valid current_sconf = d.getVar('SCONF_VERSION') @@ -82,7 +82,7 @@ is a good way to visualise the changes.""" raise NotImplementedError(failmsg) } -SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/bblayers.conf.sample" +SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/bblayers.conf.sample" python oecore_update_bblayers() { # bblayers.conf is out of date, so see if we can resolve that diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt deleted file mode 100644 index cfd1f1977b..0000000000 --- a/meta/conf/conf-notes.txt +++ /dev/null @@ -1,19 +0,0 @@ - -### Shell environment set up for builds. ### - -You can now run 'bitbake ' - -Common targets are: - core-image-minimal - core-image-full-cmdline - core-image-sato - core-image-weston - meta-toolchain - meta-ide-support - -You can also run generated qemu images with a command like 'runqemu qemux86-64'. - -Other commonly useful commands are: - - 'devtool' and 'recipetool' handle common recipe tasks - - 'bitbake-layers' handles common layer tasks - - 'oe-pkgdata-util' handles common target package tasks diff --git a/meta/conf/templates/default/conf-notes.txt b/meta/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..cfd1f1977b --- /dev/null +++ b/meta/conf/templates/default/conf-notes.txt @@ -0,0 +1,19 @@ + +### Shell environment set up for builds. ### + +You can now run 'bitbake ' + +Common targets are: + core-image-minimal + core-image-full-cmdline + core-image-sato + core-image-weston + meta-toolchain + meta-ide-support + +You can also run generated qemu images with a command like 'runqemu qemux86-64'. + +Other commonly useful commands are: + - 'devtool' and 'recipetool' handle common recipe tasks + - 'bitbake-layers' handles common layer tasks + - 'oe-pkgdata-util' handles common target package tasks -- cgit v1.2.3-54-g00ecf