RE: [OE-core] [PATCH 1/2] scripts/oe-setup-builddir: copy site.conf.sample out of template directories (if it exists)

[Peter Kjellerstedt <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 6 juli 2022 20:23
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: [OE-core] [PATCH 1/2] scripts/oe-setup-builddir: copy
> site.conf.sample out of template directories (if it exists)
> 
> This allows:
> 
> 1. Showing users where and how to define these settings correctly when setting up
> a build from templates in poky (meta-poky/conf/site.conf.sample has commented
> out examples and was previously unused).
> 
> 2. Distributing site-specific settings with template configurations in other layers,
> so there's no need to set them up separately.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  scripts/oe-setup-builddir | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
> index 54048e62ec..5ad6dd4138 100755
> --- a/scripts/oe-setup-builddir
> +++ b/scripts/oe-setup-builddir
> @@ -64,6 +64,7 @@ if [ -n "$TEMPLATECONF" ]; then
>      fi
>      OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample"
>      OECORELOCALCONF="$TEMPLATECONF/local.conf.sample"
> +    OECORESITECONF="$TEMPLATECONF/site.conf.sample"
>      OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt"
>  fi
> 
> @@ -77,9 +78,11 @@ You had no conf/local.conf file. This configuration
> file has therefore been
>  created for you with some default values. You may wish to edit it to, for
>  example, select a different MACHINE (target hardware). See conf/local.conf
>  for more information as common configuration options are commented.
> -
> +Also check conf/site.conf for site specific settings such as proxies and
> +download cache locations.
>  EOM
>      cp -f "$OECORELOCALCONF" "$BUILDDIR/conf/local.conf"
> +    cp -f "$OECORESITECONF" "$BUILDDIR/conf/site.conf" || true
>      SHOWYPDOC=yes
>  fi
> 
> @@ -107,6 +110,7 @@ fi
>  # Prevent disturbing a new GIT clone in same console
>  unset OECORELOCALCONF
>  unset OECORELAYERCONF
> +unset OECORESITECONF
> 
>  # Ending the first-time run message. Show the YP Documentation banner.
>  if [ ! -z "$SHOWYPDOC" ]; then
> --
> 2.30.2

While I can't speak for others, this change will break our build environment. 
We have a global site.conf file in an NFS directory that everyone use. It 
contains all proxy settings and similar that are required to build inside the 
corporate environment. Copying a dummy site.conf file into the local build 
directory will prevent the global file from being used.

//Peter