From 1016ec972a954f99081810e38d65fbf95743c1f4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Feb 2022 08:48:35 -0800
Subject: [PATCH] yoe: Use renamed SKIP_RECIPE and BB_ENV_PASSTHROUGH_ADDITIONS
 variable and flags

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 envsetup.sh                          |  6 +++---
 sources/meta-yoe/conf/distro/yoe.inc | 29 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 71a9fc8d3..87f6d77dc 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -145,16 +145,16 @@ export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV
 # Make sure Bitbake doesn't filter out the following variables from our
 # environment.
 #--------------------------------------------------------------------------
-BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \
+BB_ENV_PASSTHROUGH_ADDITIONS_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \
 HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \
 all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \
 SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
 SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \
 OE_BASE IMG_VERSION BUILDHISTORY_RESET YOE_PROFILE DOCKER"
 
-BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')"
+BB_ENV_PASSTHROUGH_ADDITIONS="$(echo $BB_ENV_PASSTHROUGH_ADDITIONS $BB_ENV_PASSTHROUGH_ADDITIONS_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')"
 
-export BB_ENV_EXTRAWHITE
+export BB_ENV_PASSTHROUGH_ADDITIONS
 #--------------------------------------------------------------------------
 # Specify proxy information
 #--------------------------------------------------------------------------
diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc
index c6c5e9dd8..dcb358c0b 100644
--- a/sources/meta-yoe/conf/distro/yoe.inc
+++ b/sources/meta-yoe/conf/distro/yoe.inc
@@ -162,21 +162,20 @@ SWUPDATE_INIT = "tiny"
 # Use 1GB DRAM for QEMU machines, helps in running tests
 QB_MEM = "-m 1024"
 
-INHERIT += "blacklist"
-PNBLACKLIST[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/"
-PNBLACKLIST[smartrefrigerator] = "Needs porting to QT > 5.6"
-PNBLACKLIST[qmlbrowser] = "Needs porting to QT > 5.6"
-PNBLACKLIST[minehunt] = "Needs porting to QT > 5.6"
-PNBLACKLIST[homeautomation] = "Needs porting to QT > 5.6"
-PNBLACKLIST[samegame] = "Needs porting to QT > 5.6"
-PNBLACKLIST[applicationlauncher] = "Needs porting to QT > 5.6"
-PNBLACKLIST[spacetouch] = "Needs porting to libplanes 1.0"
-PNBLACKLIST[qtviewplanes] = "Needs porting to libplanes 1.0"
-PNBLACKLIST[egt-thermostat] = "Needs porting to egt 0.8.2+"
-PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need to be tested so much"
-PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to be tested so much"
-PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to be tested so much"
-PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need to be tested so much"
+SKIP_RECIPE[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/"
+SKIP_RECIPE[smartrefrigerator] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[qmlbrowser] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[minehunt] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[homeautomation] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[samegame] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[applicationlauncher] = "Needs porting to QT > 5.6"
+SKIP_RECIPE[spacetouch] = "Needs porting to libplanes 1.0"
+SKIP_RECIPE[qtviewplanes] = "Needs porting to libplanes 1.0"
+SKIP_RECIPE[egt-thermostat] = "Needs porting to egt 0.8.2+"
+SKIP_RECIPE[bigbuckbunny-1080p] = "big and doesn't really need to be tested so much"
+SKIP_RECIPE[bigbuckbunny-480p] = "big and doesn't really need to be tested so much"
+SKIP_RECIPE[bigbuckbunny-720p] = "big and doesn't really need to be tested so much"
+SKIP_RECIPE[tearsofsteel-1080p] = "big and doesn't really need to be tested so much"
 
 RDEPENDS:packagegroup-meta-multimedia:remove:pn-packagegroup-meta-multimedia = "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p tearsofsteel-1080p"
 RDEPENDS:packagegroup-meta-oe-fortran-packages:remove:pn-packagegroup-meta-oe = "lapack octave suitesparse"