From: Denys Dmytriyenko <denis@denix.org>
To: reatmon@ti.com
Cc: Praneeth Bajjuri <praneeth@ti.com>, meta-arago@lists.yoctoproject.org
Subject: Re: [meta-arago] [oe-layersetup][master][PATCH v2] oe-layersetup: Add config option for inclusive vars
Date: Tue, 26 Jul 2022 17:44:55 -0400 [thread overview]
Message-ID: <20220726214455.GV18692@denix.org> (raw)
In-Reply-To: <20220726213532.2414-1-reatmon@ti.com>
On Tue, Jul 26, 2022 at 04:35:32PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> Part of the transition to kirkstone was to rename some variables
> to align with community standards. Since oe-layersetup needs to
> work with both dunfell and kirkstone, we need a way to control
> which branch we are pointing to so that we can put the correct
> variables in the conf/setenv file.
Looks good to me.
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> v2: Removed change to /bin/bash that made it into v1.
>
> configs/arago-dunfell-config.txt | 1 +
> configs/arago-dunfell-next-config.txt | 1 +
> configs/arago-dunfell-wip-config.txt | 1 +
> configs/arago-kirkstone-config.txt | 1 +
> configs/arago-master-config.txt | 1 +
> configs/distroless-dunfell-config.txt | 1 +
> configs/distroless-kirkstone-config.txt | 1 +
> configs/distroless-master-config.txt | 1 +
> configs/poky-dunfell-config.txt | 1 +
> configs/poky-kirkstone-config.txt | 1 +
> configs/poky-master-config.txt | 1 +
> oe-layertool-setup.sh | 25 ++++++++++++++++++++++++-
> 12 files changed, 35 insertions(+), 1 deletion(-)
>
> diff --git a/configs/arago-dunfell-config.txt b/configs/arago-dunfell-config.txt
> index 60cc72a..c5084a0 100644
> --- a/configs/arago-dunfell-config.txt
> +++ b/configs/arago-dunfell-config.txt
> @@ -16,3 +16,4 @@ OECORELAYERCONF=./sample-files/bblayers.conf.sample
> # use below for OECORELAYERCONF to mark it compatible with dunfell
> #OECORELAYERCONF=./sample-files/bblayers-dunfell-browser.conf.sample
> OECORELOCALCONF=./sample-files/local-arago64.conf.sample
> +BITBAKE_INCLUSIVE_VARS=no
> diff --git a/configs/arago-dunfell-next-config.txt b/configs/arago-dunfell-next-config.txt
> index e2eb202..7ad9f92 100644
> --- a/configs/arago-dunfell-next-config.txt
> +++ b/configs/arago-dunfell-next-config.txt
> @@ -16,3 +16,4 @@ OECORELAYERCONF=./sample-files/bblayers.conf.sample
> # use below for OECORELAYERCONF to mark it compatible with dunfell
> #OECORELAYERCONF=./sample-files/bblayers-dunfell-browser.conf.sample
> OECORELOCALCONF=./sample-files/local-arago64.conf.sample
> +BITBAKE_INCLUSIVE_VARS=no
> diff --git a/configs/arago-dunfell-wip-config.txt b/configs/arago-dunfell-wip-config.txt
> index 60f9f0d..b8c9cce 100644
> --- a/configs/arago-dunfell-wip-config.txt
> +++ b/configs/arago-dunfell-wip-config.txt
> @@ -16,3 +16,4 @@ OECORELAYERCONF=./sample-files/bblayers.conf.sample
> # use below for OECORELAYERCONF to mark it compatible with dunfell
> #OECORELAYERCONF=./sample-files/bblayers-dunfell-browser.conf.sample
> OECORELOCALCONF=./sample-files/local-arago64.conf.sample
> +BITBAKE_INCLUSIVE_VARS=no
> diff --git a/configs/arago-kirkstone-config.txt b/configs/arago-kirkstone-config.txt
> index 0f3c001..ebe130a 100644
> --- a/configs/arago-kirkstone-config.txt
> +++ b/configs/arago-kirkstone-config.txt
> @@ -12,3 +12,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,kirkstone,HEAD,layers=meta-arm:meta
> oe-core,git://git.openembedded.org/openembedded-core,kirkstone,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-arago64-v2.conf.sample
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
> index 532a145..93d93b5 100644
> --- a/configs/arago-master-config.txt
> +++ b/configs/arago-master-config.txt
> @@ -12,3 +12,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-ar
> oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-arago64-v2.conf.sample
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/configs/distroless-dunfell-config.txt b/configs/distroless-dunfell-config.txt
> index 0d2ab28..bb03ac7 100644
> --- a/configs/distroless-dunfell-config.txt
> +++ b/configs/distroless-dunfell-config.txt
> @@ -6,3 +6,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,dunfell,HEAD,layers=meta-arm:meta-a
> oe-core,git://git.openembedded.org/openembedded-core,dunfell,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local.conf.sample
> +BITBAKE_INCLUSIVE_VARS=no
> diff --git a/configs/distroless-kirkstone-config.txt b/configs/distroless-kirkstone-config.txt
> index 3b33992..4cafca7 100644
> --- a/configs/distroless-kirkstone-config.txt
> +++ b/configs/distroless-kirkstone-config.txt
> @@ -6,3 +6,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,kirkstone,HEAD,layers=meta-arm:meta
> oe-core,git://git.openembedded.org/openembedded-core,kirkstone,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-v2.conf.sample
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/configs/distroless-master-config.txt b/configs/distroless-master-config.txt
> index 5c55459..e67f916 100644
> --- a/configs/distroless-master-config.txt
> +++ b/configs/distroless-master-config.txt
> @@ -6,3 +6,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-ar
> oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-v2.conf.sample
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/configs/poky-dunfell-config.txt b/configs/poky-dunfell-config.txt
> index 6c768e7..5f6c45b 100644
> --- a/configs/poky-dunfell-config.txt
> +++ b/configs/poky-dunfell-config.txt
> @@ -6,3 +6,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,dunfell,HEAD,layers=meta-arm:meta-a
> meta-ti,git://git.yoctoproject.org/meta-ti,dunfell,HEAD,layers=
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-poky.conf.sample
> +BITBAKE_INCLUSIVE_VARS=no
> diff --git a/configs/poky-kirkstone-config.txt b/configs/poky-kirkstone-config.txt
> index 0e57c64..815cabf 100644
> --- a/configs/poky-kirkstone-config.txt
> +++ b/configs/poky-kirkstone-config.txt
> @@ -8,3 +8,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,kirkstone,HEAD,layers=meta-arm:meta
> oe-core,git://git.openembedded.org/openembedded-core,kirkstone,HEAD,layers=meta
> OECORELAYERCONF=./sample-files/bblayers.conf.sample
> OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
> index a541501..272a14b 100644
> --- a/configs/poky-master-config.txt
> +++ b/configs/poky-master-config.txt
> @@ -8,3 +8,4 @@ meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-ar
> 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
> +BITBAKE_INCLUSIVE_VARS=yes
> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
> index e05737b..e404290 100755
> --- a/oe-layertool-setup.sh
> +++ b/oe-layertool-setup.sh
> @@ -38,6 +38,7 @@ OECORELAYERCONF="" # sample configuration file used for bblayers.conf
> OECORELAYERCONFPATH="" # stores the path of the OECORELAYERCONFPATH variable
> OECORELOCALCONF="" # sample configuration file used for local.conf
> OECORELOCALCONFPATH="" # stores the path of the OECORELOCALCONFPATH variable
> +BITBAKE_INCLUSIVE_VARS="no"
> outputfile="" # file to save output to if -o is used
> inputfile="" # file containing initial layers if -f is used
> interactive="n" # flag for interactive mode. Default is n
> @@ -158,6 +159,14 @@ parse_oecore_line() {
> eval $var=$val
> }
>
> +# Input is a line of the form BITBAKE.*=value
> +parse_bitbake_line() {
> + var=`echo $1 | cut -d= -f1`
> + val=`echo $1 | cut -d= -f2`
> + eval $var=$val
> +}
> +
> +
>
> # Input is a repository description line as detailed in the usage section
> # There is a second optional input that can be passed to prefix the variable
> @@ -243,6 +252,15 @@ parse_input_file() {
> continue
> fi
>
> + # If the line starts with OECORE then parse the OECORE setting
> + echo $line | grep -e "^BITBAKE.*=" > /dev/null
> + if [ "$?" = "0" ]
> + then
> + parse_bitbake_line $line
> + output="$output""$line\n"
> + continue
> + fi
> +
> # Since the line is not a comment or an OECORE setting let's assume
> # it is a repository information line and parse it
> parse_repo_line $line
> @@ -853,8 +871,13 @@ 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"
> EOM
> +
> + if [ "$BITBAKE_INCLUSIVE_VARS" == "no" ]; then
> + echo "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\"" >> $confdir/setenv
> + else
> + echo "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\"" >> $confdir/setenv
> + fi
> }
>
>
> --
> 2.17.1
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#13967): https://lists.yoctoproject.org/g/meta-arago/message/13967
> Mute This Topic: https://lists.yoctoproject.org/mt/92637754/3617104
> Group Owner: meta-arago+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [denis@denix.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
prev parent reply other threads:[~2022-07-26 21:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-26 21:35 [oe-layersetup][master][PATCH v2] oe-layersetup: Add config option for inclusive vars Ryan Eatmon
2022-07-26 21:44 ` Denys Dmytriyenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220726214455.GV18692@denix.org \
--to=denis@denix.org \
--cc=meta-arago@lists.yoctoproject.org \
--cc=praneeth@ti.com \
--cc=reatmon@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.