Remove unused sample-file bblayers-zeus-browser.conf.sample
PATCH v2 1/5 Remove unused sample-file bblayers-zeus-browser.conf.sample
--- sample-files/bblayers-zeus-browser.conf.sample | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 sample-files/bblayers-zeus-browser.conf.sample
sample-files/bblayers-zeus-browser.conf.sample deleted +0 -12
@@ -1,12 +0,0 @@ -# This template file was created by taking the oe-core/meta/conf/bblayers.conf -# file and removing the BBLAYERS section at the end. - -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "6" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -OVERRIDES = "forcevariable" -LAYERSERIES_COMPAT_browser-layer_forcevariable = "zeus"
Signature · 1 line
2.17.1
PATCH v2 2/5 Add layers for split meta-ti master branch
The latest master meta-ti split into two layers, add new layers here.
--- configs/arago-master-config.txt | 2 +- configs/distroless-master-config.txt | 2 +- configs/poky-master-config.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
configs/arago-master-config.txt +1 -1
@@ -7,7 +7,7 @@ meta-arago,git://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-d meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers= meta-virtualization,git://git.yoctoproject.org/meta-virtualization,master,HEAD,layers= meta-openembedded,git://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers= +meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp 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
configs/distroless-master-config.txt +1 -1
@@ -1,7 +1,7 @@ # This file takes repo entries in the format # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,git://git.openembedded.org/bitbake,master,HEAD -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers= +meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp 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
configs/poky-master-config.txt +1 -1
@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,git://git.openembedded.org/bitbake,master,HEAD poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers= +meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp 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-v2.conf.sample
Signature · 1 line
2.17.1
PATCH v2 3/5 Remove image-prelink from sample USER_CLASSES
In reply to Andrew DavisPrelinking hasn't worked on ARM in a while so this class was removed in the latests core master. Remove it here.
--- sample-files/local-arago64-v2.conf.sample | 4 +--- sample-files/local-poky-v2.conf.sample | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
sample-files/local-arago64-v2.conf.sample +1 -3
@@ -112,11 +112,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - '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-prelink" +USER_CLASSES ?= "buildstats" # By default disable interactive patch resolution (tasks will just fail instead): PATCHRESOLVE = "noop"
sample-files/local-poky-v2.conf.sample +1 -3
@@ -109,11 +109,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - '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-prelink" +USER_CLASSES ?= "buildstats" # By default disable interactive patch resolution (tasks will just fail instead): PATCHRESOLVE = "noop"
Signature · 1 line
2.17.1
PATCH v2 4/5 Build Poky in a directory named poky-tmp vs arago-tmp
In reply to Andrew DavisThis also allows us to keep version of both should we need.
--- sample-files/local-poky-v2.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sample-files/local-poky-v2.conf.sample +1 -1
@@ -48,7 +48,7 @@ SSTATE_DIR = "${OEBASE}/build/sstate-cache" # 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. -TMPDIR = "${OEBASE}/build/arago-tmp" +TMPDIR = "${OEBASE}/build/poky-tmp" # # Machine Selection
Signature · 1 line
2.17.1
PATCH v2 5/5 Build Poky using meta-yocto instead of combined poky repo
In reply to Andrew DavisThe Poky repo contains meta-yocto plus extra bits needed for an all-in-one build, but since we already pull in tools with this script like bitbake and oe-core, lets use those and save some space/bandwidth.
--- configs/poky-master-config.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
configs/poky-master-config.txt +3 -1
@@ -1,8 +1,10 @@ # This file takes repo entries in the format # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] + bitbake,git://git.openembedded.org/bitbake,master,HEAD -poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp +meta-yocto,git://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp 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-poky-v2.conf.sample
Signature · 1 line
2.17.1
Series applied to master.
Quoted 24 lines · Andrew Davis
Signed-off-by Andrew Davis <[email protected]>--- sample-files/bblayers-zeus-browser.conf.sample | 12 ------------ 1 file changed, 12 deletions(-)delete mode 100644 sample-files/bblayers-zeus-browser.conf.sample
sample-files/bblayers-zeus-browser.conf.sample deleted +0
-12@@ -1,12 +0,0 @@ -# This template file was created by taking the oe-core/meta/conf/bblayers.conf -# file and removing the BBLAYERS section at the end. - -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "6" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -OVERRIDES = "forcevariable" -LAYERSERIES_COMPAT_browser-layer_forcevariable = "zeus"
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Re: [meta-arago][oe-layersetup PATCH v2 1/5] Remove unused sample-file
In reply to Andrew Davismeta-arago / na / 20220428171851.19270-1-afd
PRC Results: FAIL
=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed
=========================================================
apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [meta-arago][oe-layersetup PATCH v2 1/5] Remove unused sample-file bblayers-zeus-browser.conf.sample
- Submitter: From: Andrew Davis <[email protected]>
- Date: Date: Thu, 28 Apr 2022 12:18:47 -0500
- Num Patches: 5
- Mailing List (public inbox) Commit SHA: 669da9b7c86d47d6de84ba8e07b2374dc2632468
Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master
- Commit Author: LCPD Automation Script <[email protected]>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202508010100
- Commit SHA: 644f8b47f0eef26bda636717f5838871ec67d138
Patches
----------------------------------------
FAIL - [meta-arago][oe-layersetup PATCH v2 1/5] Remove unused sample-file bblayers-zeus-browser.conf.sample
error: sample-files/bblayers-zeus-browser.conf.sample: does not exist in index
Applying: Remove unused sample-file bblayers-zeus-browser.conf.sample
Patch failed at 0001 Remove unused sample-file bblayers-zeus-browser.conf.sample