Re: [PATCH 1/2] meta: Only use isar's own bitbake.conf

[Jan Kiszka <jan.kiszka@siemens.com>]

On 10.12.18 10:31, Claudius Heine wrote:
> Hi Jan,
> 
> On 07/12/2018 15.30, [ext] Jan Kiszka wrote:
>> On 27.11.18 10:53, Harald Seiler wrote:
>>> Similarly to yocto, this commit makes isar only
>>> use its own bitbake.conf.  It also adds necessary
>>> variables from bitbake's config so everything still
>>> works.
>>>
>>> Signed-off-by: Harald Seiler <hws@denx.de>
>>> ---
>>>   meta/conf/isar-bitbake.conf | 28 ++++++++++++++++++++++++++++
>>>   scripts/isar-setup-builddir | 21 ---------------------
>>>   2 files changed, 28 insertions(+), 21 deletions(-)
>>>
>>> diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf
>>> index bc52d08..f23bf6e 100644
>>> --- a/meta/conf/isar-bitbake.conf
>>> +++ b/meta/conf/isar-bitbake.conf
>>> @@ -18,6 +18,34 @@
>>>   # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>>>   # OTHER DEALINGS IN THE SOFTWARE.
>>> +# Variables from bitbake/conf/bitbake.conf
>>> +B = "${S}"
>>> +CVSDIR = "${DL_DIR}/cvs"
>>> +DEPENDS = ""
>>> +DEPLOY_DIR = "${TMPDIR}/deploy"
>>> +FILESPATH = 
>>> "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" 
>>>
>>> +FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}"
>>> +GITDIR = "${DL_DIR}/git"
>>> +IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
>>> +IMAGE_ROOTFS = "${TMPDIR}/rootfs"
>>> +OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"
>>> +P = "${PN}-${PV}"
>>> +PF = "${PN}-${PV}-${PR}"
>>> +PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 
>>> 'defaultpkgname'}"
>>> +PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 
>>> 'r0'}"
>>> +PROVIDES = ""
>>> +PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or 
>>> '1.0'}"
>>> +S = "${WORKDIR}/${P}"
>>> +SRC_URI = "file://${FILE}"
>>> +STAMP = "${TMPDIR}/stamps/${PF}"
>>> +SVNDIR = "${DL_DIR}/svn"
>>> +T = "${WORKDIR}/temp"
>>> +TARGET_ARCH = "${BUILD_ARCH}"
>>> +TMPDIR = "${TOPDIR}/tmp"
>>> +PERSISTENT_DIR = "${TMPDIR}/cache"
>>> +GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}"
>>> +
>>> +# isar specific config
>>>   WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}"
>>>   DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap"
>>>   DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
>>> diff --git a/scripts/isar-setup-builddir b/scripts/isar-setup-builddir
>>> index cabe732..d344148 100755
>>> --- a/scripts/isar-setup-builddir
>>> +++ b/scripts/isar-setup-builddir
>>> @@ -110,30 +110,9 @@ 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
>>>
>>
>> This series is still pending, I just realized (while writing "all 
>> configuration starts with bitbake.conf").
>>
>> Looks good, I just think we should simply rename isar-bitbake.conf to 
>> bitbake.conf and copy that in during setup.
> 
> Why? That is not how it is done in current versions of OE.
> 
> The copying process implemented here is a relic from an older bitbake version, 
> where it didn't support loading the bitbake.conf from a layer.

Ah, you mean, we do not need to copy at all? That would be even better!

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux