From 7ac0a90471c47c32992d74f3823054a1ae02d5ad Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 15 Feb 2017 16:20:25 +0100 Subject: [PATCH] morty migration: meta-digi: sync config templates https://jira.digi.com/browse/DEL-3451 Signed-off-by: Javier Viguera --- sdk/config/ccardimx28js/bblayers.conf.sample | 11 ++++------- sdk/config/ccardimx28js/local.conf.sample | 13 ++++++------- sdk/config/ccimx6sbc/bblayers.conf.sample | 10 +++------- sdk/config/ccimx6sbc/local.conf.sample | 13 ++++++------- sdk/config/ccimx6ulsbc/bblayers.conf.sample | 10 +++------- sdk/config/ccimx6ulsbc/local.conf.sample | 13 ++++++------- sdk/config/ccimx6ulstarter/bblayers.conf.sample | 10 +++------- sdk/config/ccimx6ulstarter/conf-notes.txt | 1 + sdk/config/ccimx6ulstarter/local.conf.sample | 13 ++++++------- 9 files changed, 38 insertions(+), 56 deletions(-) diff --git a/sdk/config/ccardimx28js/bblayers.conf.sample b/sdk/config/ccardimx28js/bblayers.conf.sample index 69afda123..bc2ef9645 100644 --- a/sdk/config/ccardimx28js/bblayers.conf.sample +++ b/sdk/config/ccardimx28js/bblayers.conf.sample @@ -1,25 +1,22 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ + ##OEROOT##/meta-poky \ ##OEROOT##/meta-yocto-bsp \ ##DIGIBASE##/meta-openembedded/meta-oe \ ##DIGIBASE##/meta-openembedded/meta-python \ ##DIGIBASE##/meta-openembedded/meta-networking \ ##DIGIBASE##/meta-openembedded/meta-webserver \ ##DIGIBASE##/meta-qt5 \ + ##DIGIBASE##/meta-swupdate \ ##DIGIBASE##/meta-freescale \ ##DIGIBASE##/meta-fsl-demos \ ##DIGIBASE##/meta-digi/meta-digi-arm \ ##DIGIBASE##/meta-digi/meta-digi-dey \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ - " diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample index fa3340fd4..14fc4cdba 100644 --- a/sdk/config/ccardimx28js/local.conf.sample +++ b/sdk/config/ccardimx28js/local.conf.sample @@ -20,6 +20,7 @@ #MACHINE ?= "qemuarm" #MACHINE ?= "qemuarm64" #MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" #MACHINE ?= "qemuppc" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" @@ -129,9 +130,9 @@ DISTRO ?= "dey" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 @@ -152,14 +153,14 @@ PACKAGE_CLASSES ?= "package_rpm" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -173,9 +174,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - '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 -# NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised -# that you do NOT run the prelinker at this time. -USER_CLASSES ?= "buildstats image-mklibs" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" # # Runtime testing of images diff --git a/sdk/config/ccimx6sbc/bblayers.conf.sample b/sdk/config/ccimx6sbc/bblayers.conf.sample index a6dfc3e99..bc2ef9645 100644 --- a/sdk/config/ccimx6sbc/bblayers.conf.sample +++ b/sdk/config/ccimx6sbc/bblayers.conf.sample @@ -1,13 +1,13 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ + ##OEROOT##/meta-poky \ ##OEROOT##/meta-yocto-bsp \ ##DIGIBASE##/meta-openembedded/meta-oe \ ##DIGIBASE##/meta-openembedded/meta-python \ @@ -20,7 +20,3 @@ BBLAYERS ?= " \ ##DIGIBASE##/meta-digi/meta-digi-arm \ ##DIGIBASE##/meta-digi/meta-digi-dey \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ - " diff --git a/sdk/config/ccimx6sbc/local.conf.sample b/sdk/config/ccimx6sbc/local.conf.sample index 31908c8dc..8271d125c 100644 --- a/sdk/config/ccimx6sbc/local.conf.sample +++ b/sdk/config/ccimx6sbc/local.conf.sample @@ -20,6 +20,7 @@ #MACHINE ?= "qemuarm" #MACHINE ?= "qemuarm64" #MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" #MACHINE ?= "qemuppc" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" @@ -114,9 +115,9 @@ DISTRO ?= "dey" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 @@ -137,14 +138,14 @@ PACKAGE_CLASSES ?= "package_rpm" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -158,9 +159,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - '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 -# NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised -# that you do NOT run the prelinker at this time. -USER_CLASSES ?= "buildstats image-mklibs" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" # # Runtime testing of images diff --git a/sdk/config/ccimx6ulsbc/bblayers.conf.sample b/sdk/config/ccimx6ulsbc/bblayers.conf.sample index a6dfc3e99..bc2ef9645 100644 --- a/sdk/config/ccimx6ulsbc/bblayers.conf.sample +++ b/sdk/config/ccimx6ulsbc/bblayers.conf.sample @@ -1,13 +1,13 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ + ##OEROOT##/meta-poky \ ##OEROOT##/meta-yocto-bsp \ ##DIGIBASE##/meta-openembedded/meta-oe \ ##DIGIBASE##/meta-openembedded/meta-python \ @@ -20,7 +20,3 @@ BBLAYERS ?= " \ ##DIGIBASE##/meta-digi/meta-digi-arm \ ##DIGIBASE##/meta-digi/meta-digi-dey \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ - " diff --git a/sdk/config/ccimx6ulsbc/local.conf.sample b/sdk/config/ccimx6ulsbc/local.conf.sample index d8027ee34..73effac94 100644 --- a/sdk/config/ccimx6ulsbc/local.conf.sample +++ b/sdk/config/ccimx6ulsbc/local.conf.sample @@ -20,6 +20,7 @@ #MACHINE ?= "qemuarm" #MACHINE ?= "qemuarm64" #MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" #MACHINE ?= "qemuppc" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" @@ -114,9 +115,9 @@ DISTRO ?= "dey" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 @@ -137,14 +138,14 @@ PACKAGE_CLASSES ?= "package_rpm" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -158,9 +159,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - '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 -# NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised -# that you do NOT run the prelinker at this time. -USER_CLASSES ?= "buildstats image-mklibs" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" # # Runtime testing of images diff --git a/sdk/config/ccimx6ulstarter/bblayers.conf.sample b/sdk/config/ccimx6ulstarter/bblayers.conf.sample index a6dfc3e99..bc2ef9645 100644 --- a/sdk/config/ccimx6ulstarter/bblayers.conf.sample +++ b/sdk/config/ccimx6ulstarter/bblayers.conf.sample @@ -1,13 +1,13 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ + ##OEROOT##/meta-poky \ ##OEROOT##/meta-yocto-bsp \ ##DIGIBASE##/meta-openembedded/meta-oe \ ##DIGIBASE##/meta-openembedded/meta-python \ @@ -20,7 +20,3 @@ BBLAYERS ?= " \ ##DIGIBASE##/meta-digi/meta-digi-arm \ ##DIGIBASE##/meta-digi/meta-digi-dey \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ - " diff --git a/sdk/config/ccimx6ulstarter/conf-notes.txt b/sdk/config/ccimx6ulstarter/conf-notes.txt index 6756fcb41..811825d35 100644 --- a/sdk/config/ccimx6ulstarter/conf-notes.txt +++ b/sdk/config/ccimx6ulstarter/conf-notes.txt @@ -4,3 +4,4 @@ Digi Embedded Yocto provides the following image recipes: Expansion of native core-image-base by including all the support for the target device hardware like firmware files, rootfs customizations, etc. + diff --git a/sdk/config/ccimx6ulstarter/local.conf.sample b/sdk/config/ccimx6ulstarter/local.conf.sample index 16ad9f0c1..eb6e8708e 100644 --- a/sdk/config/ccimx6ulstarter/local.conf.sample +++ b/sdk/config/ccimx6ulstarter/local.conf.sample @@ -20,6 +20,7 @@ #MACHINE ?= "qemuarm" #MACHINE ?= "qemuarm64" #MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" #MACHINE ?= "qemuppc" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" @@ -114,9 +115,9 @@ DISTRO ?= "dey" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 @@ -137,14 +138,14 @@ PACKAGE_CLASSES ?= "package_rpm" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -158,9 +159,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - '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 -# NOTE: image-prelink is currently broken due to problems with the prelinker. It is advised -# that you do NOT run the prelinker at this time. -USER_CLASSES ?= "buildstats image-mklibs" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" # # Runtime testing of images