summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Jean Texier <texier.pj2@gmail.com>2021-08-04 16:17:52 +0200
committerAndrei Gherzan <andrei@gherzan.com>2021-08-04 21:36:05 +0300
commit7fb784a402fa3ef8f75a857396d8f14ed36c72a6 (patch)
tree657ff9930d34c73de0489033dc5b01002bc2ce7b
parent5689280cd85b1b5fe8b18615cbd0f6982bd9982c (diff)
downloadmeta-raspberrypi-7fb784a402fa3ef8f75a857396d8f14ed36c72a6.tar.gz
kas: local.conf: bump CONF_VERSION variable
Since commit 5452f1ba337685cf89d3429e08255450ab90b96f ("local.conf.sample: Bump version so users update their config") in OE-Core, we need to update the default local.conf due to the new syntax. Fixes: ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:oecore_update_localconf(d) 0003: File: '/work/poky/meta/classes/sanity.bbclass', lineno: 56, function: oecore_update_localconf 0052: 0053:is a good way to visualise the changes.""" 0054: failmsg = d.expand(failmsg) 0055: *** 0056: raise NotImplementedError(failmsg) 0057:} 0058: 0059:SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample" 0060:python oecore_update_siteconf() { Exception: NotImplementedError: Your version of local.conf was generated from an older/newer version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing. Matching the version numbers will remove this message. "meld conf/local.conf /work/poky/meta*/conf/local.conf.sample" is a good way to visualise the changes. Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
-rw-r--r--kas-poky-rpi.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/kas-poky-rpi.yml b/kas-poky-rpi.yml
index 3e43e2e..7430009 100644
--- a/kas-poky-rpi.yml
+++ b/kas-poky-rpi.yml
@@ -42,7 +42,7 @@ local_conf_header:
42 reduce_diskspace: | 42 reduce_diskspace: |
43 INHERIT += "rm_work_and_downloads" 43 INHERIT += "rm_work_and_downloads"
44 standard: | 44 standard: |
45 CONF_VERSION = "1" 45 CONF_VERSION = "2"
46 PACKAGE_CLASSES = "package_rpm" 46 PACKAGE_CLASSES = "package_rpm"
47 SDKMACHINE = "x86_64" 47 SDKMACHINE = "x86_64"
48 USER_CLASSES = "buildstats image-prelink" 48 USER_CLASSES = "buildstats image-prelink"