Skip to contentSkip to conversation

configs, local.conf: update to version 2 due to new override syntax

PATCH New Denys Dmytriyenko 1 participant 1 message Aug 3, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs, local.conf: update to version 2 due to new override syntax

From: Denys Dmytriyenko <[email protected]>

Also image-mklibs class has been deprecated, so remove it from local.conf

---
 configs/arago-master-config.txt                                      | 2 +-
 configs/distroless-master-config.txt                                 | 2 +-
 configs/poky-master-config.txt                                       | 2 +-
 .../{local-arago64.conf.sample => local-arago64-v2.conf.sample}      | 5 ++---
 sample-files/{local-poky.conf.sample => local-poky-v2.conf.sample}   | 5 ++---
 sample-files/{local.conf.sample => local-v2.conf.sample}             | 5 ++---
 6 files changed, 9 insertions(+), 12 deletions(-)
 copy sample-files/{local-arago64.conf.sample => local-arago64-v2.conf.sample} (97%)
 copy sample-files/{local-poky.conf.sample => local-poky-v2.conf.sample} (97%)
 copy sample-files/{local.conf.sample => local-v2.conf.sample} (97%)
configs/arago-master-config.txt +1 -1
index 0788679..e4c6d7f 100644
@@ -11,4 +11,4 @@ meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
 meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
 oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
-OECORELOCALCONF=./sample-files/local-arago64.conf.sample
+OECORELOCALCONF=./sample-files/local-arago64-v2.conf.sample
configs/distroless-master-config.txt +1 -1
index c8c400c..8211bd5 100644
@@ -5,4 +5,4 @@ meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
 meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
 oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
-OECORELOCALCONF=./sample-files/local.conf.sample
+OECORELOCALCONF=./sample-files/local-v2.conf.sample
configs/poky-master-config.txt +1 -1
index 1dc261f..f213411 100644
@@ -5,4 +5,4 @@ poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yoct
 meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
 meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
-OECORELOCALCONF=./sample-files/local-poky.conf.sample
+OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
sample-files/local-arago64-v2.conf.sample renamed from sample-files/local-arago64.conf.sample +2 -3
similarity index 97%
copy from sample-files/local-arago64.conf.sample
copy to sample-files/local-arago64-v2.conf.sample
index 68f0bff..9549e8a 100644
@@ -1,5 +1,5 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 #
 # Where to place downloads
@@ -112,12 +112,11 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable 
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"
sample-files/local-poky-v2.conf.sample renamed from sample-files/local-poky.conf.sample +2 -3
similarity index 97%
copy from sample-files/local-poky.conf.sample
copy to sample-files/local-poky-v2.conf.sample
index ba5d4c1..5cbe6ef 100644
@@ -1,5 +1,5 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 #
 # Where to place downloads
@@ -109,12 +109,11 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable 
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"
sample-files/local-v2.conf.sample renamed from sample-files/local.conf.sample +2 -3
similarity index 97%
copy from sample-files/local.conf.sample
copy to sample-files/local-v2.conf.sample
index e60bedc..e0df8f5 100644
@@ -1,5 +1,5 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 #
 # Where to place downloads
@@ -109,12 +109,11 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable 
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"
Signature · 1 line
2.7.4