2017-08-03 14:55 GMT+03:00 Henning Schild <henning.schild@siemens.com>:

> force isar to always use a bitbake.conf from its bitbake
> the diff went into a file that needs to be looked at later
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  .../{bitbake.conf.sample => isar-bitbake.conf}     | 32
> ++-------------------
>  scripts/isar-setup-builddir                        | 33
> +++++++++++++++++++---
>  2 files changed, 31 insertions(+), 34 deletions(-)
>  rename meta/conf/{bitbake.conf.sample => isar-bitbake.conf} (59%)
>
> diff --git a/meta/conf/bitbake.conf.sample b/meta/conf/isar-bitbake.conf
> similarity index 59%
> rename from meta/conf/bitbake.conf.sample
> rename to meta/conf/isar-bitbake.conf
> index 9d7c1f4..7469ea7 100644
> --- a/meta/conf/bitbake.conf.sample
> +++ b/meta/conf/isar-bitbake.conf
> @@ -1,4 +1,4 @@
> -# Copyright (C) 2003  Chris Larson
> +# Copyright (C) 2017  Siemens AG
>  #
>  # Permission is hereby granted, free of charge, to any person obtaining a
>  # copy of this software and associated documentation files (the
> "Software"),
> @@ -18,45 +18,17 @@
>  # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>  # OTHER DEALINGS IN THE SOFTWARE.
>
> -B = "${S}"
> -CVSDIR = "${DL_DIR}/cvs"
> -DEPENDS = ""
> -DEPLOY_DIR = "${TMPDIR}/deploy"
> +
>  DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}"
> -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
> -DL_DIR = "${TMPDIR}/downloads"
>  SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
> -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
> -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/
> ${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
> -FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
> -GITDIR = "${DL_DIR}/git"
> -IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
> -IMAGE_ROOTFS = "${TMPDIR}/rootfs"
>  MKTEMPCMD = "mktemp -q ${TMPBASE}"
>  MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
> -OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"
> -P = "${PN}-${PV}"
> -PERSISTENT_DIR = "${TMPDIR}/cache"
> -PF = "${PN}-${PV}-${PR}"
> -PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0]
> or 'defaultpkgname'}"
> -PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2]
> or 'r0'}"
> -PROVIDES = ""
> -PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1]
> or '1.0'}"
>  RESUMECOMMAND = ""
>  RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P
> ${DL_DIR} ${URI}"
> -S = "${WORKDIR}/${P}"
> -SRC_URI = "file://${FILE}"
>  STAMPS_DIR ?= "${TMPDIR}/stamps"
> -STAMP = "${TMPDIR}/stamps/${PF}"
> -SVNDIR = "${DL_DIR}/svn"
> -T = "${WORKDIR}/temp"
> -TARGET_ARCH = "${BUILD_ARCH}"
> -TMPDIR = "${TOPDIR}/tmp"
>  UPDATECOMMAND = ""
>  UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update ${CVSCOOPTS}"
>  UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
> -WORKDIR = "${TMPDIR}/work/${PF}"
> -PERSISTENT_DIR = "${TMPDIR}/cache"
>  BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs"
>  CACHE = "${TMPDIR}/cache"
>
> diff --git a/scripts/isar-setup-builddir b/scripts/isar-setup-builddir
> index 070a316..d400694 100755
> --- a/scripts/isar-setup-builddir
> +++ b/scripts/isar-setup-builddir
> @@ -106,10 +106,35 @@ EOM
>      SHOWYPDOC=yes
>  fi
>
> -if [ ! -f "$BUILDDIR/conf/bitbake.conf" ]; then
> -    cp "$ISARROOT/meta/conf/bitbake.conf.sample" \
> -       "$BUILDDIR/conf/bitbake.conf"
> -fi
> +cat <<EOF > $BUILDDIR/conf/bitbake.conf
> +# ********************************************
> +# THIS FILE IS GENERATED! DO NOT MESS WITH IT!
> +# ********************************************
> +
> +# ---------
> +# begin original bitbake.conf
> +# ---------
> +
> +EOF
> +cat "$ISARROOT/bitbake/conf/bitbake.conf" >> \
> +  "$BUILDDIR/conf/bitbake.conf"
> +cat <<EOF >> $BUILDDIR/conf/bitbake.conf
> +# ---------
> +# end original bitbake.conf
> +# ---------
> +
> +# ---------
> +# begin isar-bitbake.conf
> +# ---------
> +
> +EOF
> +cat "$ISARROOT/meta/conf/isar-bitbake.conf" >> \
> +  "$BUILDDIR/conf/bitbake.conf"
> +cat <<EOF >> $BUILDDIR/conf/bitbake.conf
> +# ---------
> +# end isar-bitbake.conf
> +# ---------
> +EOF
>
>  # Ending the first-time run message. Show the no documentation banner.
>  if [ ! -z "$SHOWYPDOC" ]; then
> --
> 2.13.0
>
>
Merged to asmirnov/next