imx8: Move all recipes in main layer and use generic conf files from distro layer

To avoid problems when meta-freescale is not present, recipes-imx is masked
when building for other HWs.

meta-freescale us now dynamically added to bblayers when building for HW23.

BugzID: 57911
This commit is contained in:
Alexandre Bard 2019-07-11 17:35:58 +02:00
parent 83ab5b38c2
commit f72bea9848
16 changed files with 4 additions and 102 deletions

View File

@ -37,3 +37,6 @@ UBOOT_CONFIG ??= "flash"
UBOOT_CONFIG[flash] = "imx8_nmhw23_defconfig"
MACHINE_FEATURES += "toby-l2"
ACCEPT_FSL_EULA = "1"

View File

@ -1,27 +0,0 @@
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
LCONF_VERSION = "7"
BBPATH = "${TOPDIR}"
BBFILES ?= ""
YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
BBLAYERS ?= " \
${YOCTOROOT}/meta \
${YOCTOROOT}/meta-poky \
${YOCTOROOT}/meta-yocto-bsp \
${YOCTOROOT}/meta-netmodule-bsp \
${YOCTOROOT}/meta-netmodule-bsp/recipes-bsp/imx8 \
${YOCTOROOT}/meta-netmodule-distro \
${YOCTOROOT}/meta-openembedded/meta-python \
${YOCTOROOT}/meta-openembedded/meta-oe \
${YOCTOROOT}/meta-openembedded/meta-networking \
${YOCTOROOT}/meta-openembedded/meta-filesystems \
${YOCTOROOT}/meta-updater \
${YOCTOROOT}/meta-freescale\
"
BBLAYERS_NON_REMOVABLE ?= " \
${YOCTOROOT}/meta \
${YOCTOROOT}/meta-yocto \
"

View File

@ -1,22 +0,0 @@
# Layer configuration for meta-imx8bsp layer
# Copyright 2012 Intel Corporation
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
# We have various recipe-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/*/*.bb ${LAYERDIR}/*/*.bbappend"
BBFILE_COLLECTIONS += "imx8bsp"
BBFILE_PATTERN_imx8bsp := "^${LAYERDIR}/"
BBFILE_PRIORITY_imx8bsp = "11"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_imx8bsp = "1"
LAYERDEPENDS_imx8bsp = "core freescale-layer"
LAYERSERIES_COMPAT_imx8bsp = "warrior"
LICENSE_PATH += "${LAYERDIR}/licenses"

View File

@ -1,52 +0,0 @@
BB_NUMBER_THREADS ?= "4"
PARALLEL_MAKE ?= "-j 4"
PACKAGE_CLASSES ?= "package_rpm"
USER_CLASSES ?= "buildstats image-mklibs image-prelink"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
STOPTASKS,/tmp,100M,100K \
ABORT,${TMPDIR},100M,1K \
ABORT,${DL_DIR},100M,1K \
ABORT,${SSTATE_DIR},100M,1K \
ABORT,/tmp,10M,1K"
ASSUME_PROVIDED += "libsdl-native"
CONF_VERSION = "1"
IMAGE_FEATURES_append = " debug-tweaks"
INHERIT += "rm_work"
ERROR_QA_remove += "version-going-backwards"
WARN_QA_append += "version-going-backwards"
INHERIT += "buildhistory"
BUILDHISTORY_COMMIT = "1"
BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
# Mirror GIT repo in download folders
BB_GENERATE_MIRROR_TARBALLS = "1"
# Add licences file to the rootfs
COPY_LIC_MANIFEST = "1"
COPY_LIC_DIRS = "1"
LICENSE_CREATE_PACKAGE = "1"
INHERIT += "buildstats-summary"
YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
SSTATE_DIR ?= "${HOME}/yocto-share/sstate-cache"
DL_DIR ?= "${HOME}/yocto-share/downloads"
BUILDHISTORY_DIR = "${HOME}/yocto-share/buildhistory"
TMPDIR = "${YOCTOROOT}/shared-build/tmp"
ACCEPT_FSL_EULA = "1"
### Environment variables needed to build
#MACHINE = "am335x-nmhw21"
#DISTRO = "netmodule-linux" / "netmodule-linux-ostree"
#OSTREE_BRANCHNAME = "${MACHINE}-vcu"
#OSTREE_OSNAME = "hancock-os"

View File

@ -16,7 +16,7 @@ SRCREV ?= "${AUTOREV}"
S = "${WORKDIR}/git"
inherit fsl-u-boot-localversion
#inherit fsl-u-boot-localversion
LOCALVERSION ?= "-${SRCBRANCH}"