diff options
| -rw-r--r-- | meta/classes-global/sanity.bbclass | 6 | ||||
| -rw-r--r-- | meta/conf/templates/default/conf-notes.txt (renamed from meta/conf/conf-notes.txt) | 0 | ||||
| -rwxr-xr-x | scripts/oe-setup-builddir | 6 |
3 files changed, 6 insertions, 6 deletions
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/templates/default/conf-notes.txt index cfd1f1977b..cfd1f1977b 100644 --- a/meta/conf/conf-notes.txt +++ b/meta/conf/templates/default/conf-notes.txt diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index a13860c7d9..89ae30f609 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -62,7 +62,7 @@ fi unset SHOWYPDOC if [ -z "$OECORELOCALCONF" ]; then - OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" + OECORELOCALCONF="$OEROOT/meta/conf/templates/default/local.conf.sample" fi if [ ! -r "$BUILDDIR/conf/local.conf" ]; then cat <<EOM @@ -77,7 +77,7 @@ EOM fi if [ -z "$OECORELAYERCONF" ]; then - OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" + OECORELAYERCONF="$OEROOT/meta/conf/templates/default/bblayers.conf.sample" fi if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then cat <<EOM @@ -117,7 +117,7 @@ EOM fi if [ -z "$OECORENOTESCONF" ]; then - OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" + OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" fi [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" unset OECORENOTESCONF |