[meta-arago,oe-layersetup,4/6] Rename BB_ENV_EXTRAWHITE to BB_ENV_PASSTHROUGH_ADDITIONS

Message ID 20220426200251.19417-4-afd@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,oe-layersetup,1/6] Remove unused sample-file bblayers-zeus-browser.conf.sample | expand

Commit Message

Andrew Davis April 26, 2022, 8:02 p.m. UTC
This variable was renamed upstream, rename it in our setenv file.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 oe-layertool-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Denys Dmytriyenko April 26, 2022, 9:08 p.m. UTC | #1
On Tue, Apr 26, 2022 at 03:02:49PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> This variable was renamed upstream, rename it in our setenv file.

This will break dunfell...


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  oe-layertool-setup.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
> index f171f94..72416b0 100755
> --- a/oe-layertool-setup.sh
> +++ b/oe-layertool-setup.sh
> @@ -853,7 +853,7 @@ unset BITBAKEDIR
>  unset SCRIPTS
>  export PATH
>  export BUILDDIR=${builddir}
> -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
> +export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>  EOM
>  }
Andrew Davis April 26, 2022, 9:23 p.m. UTC | #2
On 4/26/22 4:08 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 26, 2022 at 03:02:49PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
>> This variable was renamed upstream, rename it in our setenv file.
> 
> This will break dunfell...
> 


And not doing it breaks master...

There is a check for BB_ENV_EXTRAWHITE, having it set will halt
build (think the check is in bitbake but haven't looked).


> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   oe-layertool-setup.sh | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>> index f171f94..72416b0 100755
>> --- a/oe-layertool-setup.sh
>> +++ b/oe-layertool-setup.sh
>> @@ -853,7 +853,7 @@ unset BITBAKEDIR
>>   unset SCRIPTS
>>   export PATH
>>   export BUILDDIR=${builddir}
>> -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>> +export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>   EOM
>>   }
Ryan Eatmon April 28, 2022, 4:11 p.m. UTC | #3
On 4/26/2022 16:23, Andrew Davis wrote:
> On 4/26/22 4:08 PM, Denys Dmytriyenko wrote:
>> On Tue, Apr 26, 2022 at 03:02:49PM -0500, Andrew F. Davis via 
>> lists.yoctoproject.org wrote:
>>> This variable was renamed upstream, rename it in our setenv file.
>>
>> This will break dunfell...
>>
> 
> 
> And not doing it breaks master...
> 
> There is a check for BB_ENV_EXTRAWHITE, having it set will halt
> build (think the check is in bitbake but haven't looked).
> 

This one patch seems to be the only hold out.  We clearly cannot break 
our current production.  Do you want to resubmit the series without this 
patch and we can keep looking in this issue separately?



>>
>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>> ---
>>>   oe-layertool-setup.sh | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>>> index f171f94..72416b0 100755
>>> --- a/oe-layertool-setup.sh
>>> +++ b/oe-layertool-setup.sh
>>> @@ -853,7 +853,7 @@ unset BITBAKEDIR
>>>   unset SCRIPTS
>>>   export PATH
>>>   export BUILDDIR=${builddir}
>>> -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy 
>>> ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID 
>>> SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS 
>>> PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD 
>>> SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND 
>>> TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 
>>> TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES 
>>> TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE 
>>> ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO 
>>> TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>> +export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC 
>>> http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy 
>>> SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE 
>>> BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE 
>>> SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE 
>>> TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 
>>> TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES 
>>> TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE 
>>> ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO 
>>> TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>>   EOM
>>>   }
Andrew Davis April 28, 2022, 4:48 p.m. UTC | #4
On 4/28/22 11:11 AM, Ryan Eatmon wrote:
> 
> On 4/26/2022 16:23, Andrew Davis wrote:
>> On 4/26/22 4:08 PM, Denys Dmytriyenko wrote:
>>> On Tue, Apr 26, 2022 at 03:02:49PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
>>>> This variable was renamed upstream, rename it in our setenv file.
>>>
>>> This will break dunfell...
>>>
>>
>>
>> And not doing it breaks master...
>>
>> There is a check for BB_ENV_EXTRAWHITE, having it set will halt
>> build (think the check is in bitbake but haven't looked).
>>
> 
> This one patch seems to be the only hold out.  We clearly cannot break our current production.  Do you want to resubmit the series without this patch and we can keep looking in this issue separately?
> 
> 


Not sure what your tooling looks like, but could you just
take all the other patch in this series skipping this one?

Or do you need a full resend?

Andrew


> 
>>>
>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>> ---
>>>>   oe-layertool-setup.sh | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>>>> index f171f94..72416b0 100755
>>>> --- a/oe-layertool-setup.sh
>>>> +++ b/oe-layertool-setup.sh
>>>> @@ -853,7 +853,7 @@ unset BITBAKEDIR
>>>>   unset SCRIPTS
>>>>   export PATH
>>>>   export BUILDDIR=${builddir}
>>>> -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>>> +export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>>>   EOM
>>>>   }
>
Ryan Eatmon April 28, 2022, 5:09 p.m. UTC | #5
On 4/28/2022 11:48, Andrew Davis wrote:
> On 4/28/22 11:11 AM, Ryan Eatmon wrote:
>>
>> On 4/26/2022 16:23, Andrew Davis wrote:
>>> On 4/26/22 4:08 PM, Denys Dmytriyenko wrote:
>>>> On Tue, Apr 26, 2022 at 03:02:49PM -0500, Andrew F. Davis via 
>>>> lists.yoctoproject.org wrote:
>>>>> This variable was renamed upstream, rename it in our setenv file.
>>>>
>>>> This will break dunfell...
>>>>
>>>
>>>
>>> And not doing it breaks master...
>>>
>>> There is a check for BB_ENV_EXTRAWHITE, having it set will halt
>>> build (think the check is in bitbake but haven't looked).
>>>
>>
>> This one patch seems to be the only hold out.  We clearly cannot break 
>> our current production.  Do you want to resubmit the series without 
>> this patch and we can keep looking in this issue separately?
>>
>>
> 
> 
> Not sure what your tooling looks like, but could you just
> take all the other patch in this series skipping this one?
> 
> Or do you need a full resend?


Full resend as v2 would be best.  Cleanest for the mailing list history 
and for Patchwork.


> Andrew
> 
> 
>>
>>>>
>>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>>> ---
>>>>>   oe-layertool-setup.sh | 2 +-
>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>>>>> index f171f94..72416b0 100755
>>>>> --- a/oe-layertool-setup.sh
>>>>> +++ b/oe-layertool-setup.sh
>>>>> @@ -853,7 +853,7 @@ unset BITBAKEDIR
>>>>>   unset SCRIPTS
>>>>>   export PATH
>>>>>   export BUILDDIR=${builddir}
>>>>> -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy 
>>>>> ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID 
>>>>> SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS 
>>>>> PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD 
>>>>> SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND 
>>>>> TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 
>>>>> TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES 
>>>>> TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE 
>>>>> ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO 
>>>>> TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>>>> +export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC 
>>>>> http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy 
>>>>> SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE 
>>>>> BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE 
>>>>> SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE 
>>>>> TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 
>>>>> TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES 
>>>>> TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE 
>>>>> ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO 
>>>>> TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
>>>>>   EOM
>>>>>   }
>>

Patch

diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
index f171f94..72416b0 100755
--- a/oe-layertool-setup.sh
+++ b/oe-layertool-setup.sh
@@ -853,7 +853,7 @@  unset BITBAKEDIR
 unset SCRIPTS
 export PATH
 export BUILDDIR=${builddir}
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
+export BB_ENV_PASSTHROUGH_ADDITIONS="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER OEBASE META_SDK_PATH TOOLCHAIN_TYPE TOOLCHAIN_BRAND TOOLCHAIN_BASE TOOLCHAIN_PATH TOOLCHAIN_PATH_ARMV5 TOOLCHAIN_PATH_ARMV7 TOOLCHAIN_PATH_ARMV8 EXTRA_TISDK_FILES TISDK_VERSION ARAGO_BRAND ARAGO_RT_ENABLE ARAGO_SYSTEST_ENABLE ARAGO_KERNEL_SUFFIX TI_SECURE_DEV_PKG_CAT TI_SECURE_DEV_PKG_AUTO TI_SECURE_DEV_PKG_K3 ARAGO_SYSVINIT SYSFW_FILE"
 EOM
 }