diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-31 13:12:25 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-01 10:07:02 +0100 |
| commit | c472d9ba9e970ad4c9bacf7851fcf6245fd03c40 (patch) | |
| tree | 50391490446809b7e0f3cba00177c303c9df35c9 | |
| parent | b16ecb48f6d7b5c8f1806841212f43ec96b58ee8 (diff) | |
| download | poky-c472d9ba9e970ad4c9bacf7851fcf6245fd03c40.tar.gz | |
meta-poky/conf: move default templates to conf/templates/default/
This follows the changes in oe-core, where templates are expected
to be under conf/templates.
(From meta-yocto rev: 29608bd03e1bffa124353061617b1d71370a4e5f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | .templateconf | 2 | ||||
| -rw-r--r-- | meta-poky/conf/templates/default/bblayers.conf.sample (renamed from meta-poky/conf/bblayers.conf.sample) | 0 | ||||
| -rw-r--r-- | meta-poky/conf/templates/default/conf-notes.txt (renamed from meta-poky/conf/conf-notes.txt) | 0 | ||||
| -rw-r--r-- | meta-poky/conf/templates/default/local.conf.sample (renamed from meta-poky/conf/local.conf.sample) | 0 | ||||
| -rw-r--r-- | meta-poky/conf/templates/default/local.conf.sample.extended (renamed from meta-poky/conf/local.conf.sample.extended) | 0 | ||||
| -rw-r--r-- | meta-poky/conf/templates/default/site.conf.sample (renamed from meta-poky/conf/site.conf.sample) | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/.templateconf b/.templateconf index 0fe6f82503..faf0348077 100644 --- a/.templateconf +++ b/.templateconf | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | # Template settings | 1 | # Template settings |
| 2 | TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf} | 2 | TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf/templates/default} |
diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/templates/default/bblayers.conf.sample index 8b1cbdfc5c..8b1cbdfc5c 100644 --- a/meta-poky/conf/bblayers.conf.sample +++ b/meta-poky/conf/templates/default/bblayers.conf.sample | |||
diff --git a/meta-poky/conf/conf-notes.txt b/meta-poky/conf/templates/default/conf-notes.txt index cfd1f1977b..cfd1f1977b 100644 --- a/meta-poky/conf/conf-notes.txt +++ b/meta-poky/conf/templates/default/conf-notes.txt | |||
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample index b96dc908f4..b96dc908f4 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/templates/default/local.conf.sample | |||
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/templates/default/local.conf.sample.extended index bc2dec9f52..bc2dec9f52 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/meta-poky/conf/templates/default/local.conf.sample.extended | |||
diff --git a/meta-poky/conf/site.conf.sample b/meta-poky/conf/templates/default/site.conf.sample index 5164fedf63..5164fedf63 100644 --- a/meta-poky/conf/site.conf.sample +++ b/meta-poky/conf/templates/default/site.conf.sample | |||