From b187b6ac8f4f21e06524a9f05e3cff0374b927c6 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 6 Mar 2019 12:47:00 +0100 Subject: buildconf: moved to meta-toradex-distro Signed-off-by: Max Krummenacher --- buildconf/README | 6 -- buildconf/bblayers.conf | 37 ------- buildconf/export | 27 ----- buildconf/local.conf | 278 ------------------------------------------------ 4 files changed, 348 deletions(-) delete mode 100644 buildconf/README delete mode 100644 buildconf/bblayers.conf delete mode 100644 buildconf/export delete mode 100644 buildconf/local.conf diff --git a/buildconf/README b/buildconf/README deleted file mode 100644 index a5f3ce7..0000000 --- a/buildconf/README +++ /dev/null @@ -1,6 +0,0 @@ -export is the script used to source the needed environment into the -running shell. export gets copied to oe-core/ by the repo tool. This -is also the folder where it needs to be sourced. - -if build/conf/local.conf does not exist export copies local.conf -and bblayers.conf as the initial configuration. diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf deleted file mode 100644 index bd527b8..0000000 --- a/buildconf/bblayers.conf +++ /dev/null @@ -1,37 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "7" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ${TOPDIR}/../layers/meta-toradex-nxp \ - ${TOPDIR}/../layers/meta-freescale \ - ${TOPDIR}/../layers/meta-freescale-3rdparty \ - \ - ${TOPDIR}/../layers/meta-toradex-tegra \ - \ - ${TOPDIR}/../layers/meta-toradex-bsp-common \ - \ - ${TOPDIR}/../layers/meta-openembedded/meta-oe \ - ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \ - ${TOPDIR}/../layers/meta-openembedded/meta-gnome \ - ${TOPDIR}/../layers/meta-openembedded/meta-xfce \ - ${TOPDIR}/../layers/meta-openembedded/meta-initramfs \ - ${TOPDIR}/../layers/meta-openembedded/meta-networking \ - ${TOPDIR}/../layers/meta-openembedded/meta-multimedia \ - ${TOPDIR}/../layers/meta-openembedded/meta-python \ - ${TOPDIR}/../layers/meta-lxde \ - ${TOPDIR}/../layers/meta-browser \ - ${TOPDIR}/../layers/meta-qt4 \ - ${TOPDIR}/../layers/meta-qt5 \ - ${TOPDIR}/../layers/meta-qt5-extra \ - ${TOPDIR}/../layers/meta-rust \ - ${TOPDIR}/../layers/meta-freescale-distro \ - ${TOPDIR}/../layers/meta-toradex-demos \ - \ - \ - ${TOPDIR}/../layers/openembedded-core/meta \ - ${TOPDIR}/../layers/meta-yocto/meta-poky \ -" diff --git a/buildconf/export b/buildconf/export deleted file mode 100644 index aea4b28..0000000 --- a/buildconf/export +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -ECHO=`which echo` -BUILDDIR="../../build" -FIRST_TIME=0 -cd layers/openembedded-core -if [ ! -f ${BUILDDIR}/conf/local.conf ]; then - FIRST_TIME=1 -fi - -. ./oe-init-build-env ${BUILDDIR} - -echo "" -echo "Toradex targets are:" -echo " console-tdx-image" -echo " other (unsupported) targets may be found in" -echo " meta-toradex-demos/recipes-images/images/" - -if [ $FIRST_TIME -eq 1 ]; then - mkdir -p conf - cp ../layers/meta-toradex-demos/buildconf/*.conf conf/ - - echo "" - $ECHO -e "\033[1mA sample conf/local.conf file has been created" - $ECHO -e "Check and edit the file to adapt to your local needs\033[0m" - echo "The following likely need your attention:" - echo "BB_NUMBER_THREADS, PARALLEL_MAKE, DL_DIR" -fi diff --git a/buildconf/local.conf b/buildconf/local.conf deleted file mode 100644 index 8105fd7..0000000 --- a/buildconf/local.conf +++ /dev/null @@ -1,278 +0,0 @@ -# meta-freescale otherwise defaults to wayland -DISTRO_FEATURE_FOR_REMOVAL = "wayland" -DISTRO_FEATURE_FOR_REMOVAL_mx8 = "" -DISTRO_FEATURES_remove = "${DISTRO_FEATURE_FOR_REMOVAL}" - -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Parallelism Options -# -# These two options control how much parallelism BitBake should use. The first -# option determines how many tasks bitbake should run in parallel: -# -#BB_NUMBER_THREADS ?= "4" -# -# Default to setting automatically based on cpu count -BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" -# -# The second option controls how many processes make should run in parallel when -# running compile tasks: -# -#PARALLEL_MAKE ?= "-j 4" -# -# Default to setting automatically based on cpu count -PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" -# -# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would -# be appropriate for example. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. These are the -# machines which for the Toradex Colibri and Apalis computer on module families -# -#MACHINE ?= "apalis-imx6" -#MACHINE ?= "apalis-tk1" -#MACHINE ?= "apalis-tk1-mainline" -# -MACHINE ?= "colibri-imx6" -#MACHINE ?= "colibri-imx6ull" -#MACHINE ?= "colibri-imx7" -#MACHINE ?= "colibri-imx7-emmc" -#MACHINE ?= "colibri-vf" - -# -# There are also a selection of emulated machines available which can boot and run -# in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Where to place images and sw packages -# -# This places the build output in parallel to build and layers thus -# if you have several build directories you need to adjust deploy -# to something unique, e.g. "${TOPDIR}/../deploy_fb" "${TOPDIR}/../deploy_x11" -DEPLOY_DIR = "${TOPDIR}/../deploy" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to ipk: -PACKAGE_CLASSES ?= "package_ipk" - -# -# SDK/ADT target architecture -# -# This variable specifies the architecture to build SDK/ADT 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 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "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-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. -# package-management deploys the package meta data of deployed packeges -EXTRA_IMAGE_FEATURES = "debug-tweaks package-management" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# 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" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" - -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -PACKAGECONFIG_pn-qemu-native = "sdl" -ASSUME_PROVIDED += "libsdl-native" - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" - -# Delete the the source/object/binary files once a package is built to preserve disk space -INHERIT += "rm_work" - -# Add Toradex source mirror -INHERIT += "toradex-mirrors" - -# Use this distro -DISTRO = "poky" - -# What image type(s) are to be built? -IMAGE_FSTYPES_append = " tar.bz2" - -# Don't generate the mirror tarball for SCM repos, the snapshot is enough -# BB_GENERATE_MIRROR_TARBALLS = "0" - -PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" - -# Log information on images and packages -INHERIT += "buildhistory" -BUILDHISTORY_COMMIT = "1" - -# This file does not need to exist, if it does it can be used to influence machine specific -# configurations without copying the machine file. -include conf/machine/include/${MACHINE}.inc -- cgit v1.2.3