From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a1c:23ca:: with SMTP id j193mr880071wmj.1.1546841169458; Sun, 06 Jan 2019 22:06:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e452:: with SMTP id t18ls3965099wrm.3.gmail; Sun, 06 Jan 2019 22:06:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN77XZ9GdVskO3OXzeOwgARNgAfGEpALTQxWuWe4h63hgcS/s8c2a1e3YrQRuNzijTTR2Z0u X-Received: by 2002:a5d:64ca:: with SMTP id y10mr2917953wrv.28.1546841168958; Sun, 06 Jan 2019 22:06:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546841168; cv=none; d=google.com; s=arc-20160816; b=TPJlm9RThlO2cPUqHIR9sWDshMYFHWd/pOvtkVPgQu/2pUinOpWM18kCkHLet94wUO AFT+tEzk27Q4Ai9eTWBQA38/LWZTqc4uxIfm/7BkjjvSQ4k+4CYAJY5/if+6ldhmP1vn 9GSR8GfysZ6KKeB3IkdW12on6+YdHh80/U3UP9iuiUUof/jY4aGOUzjGgwfxKQ4L3DCC c0Y+LrIp/DRNzQ+oWNx95zpyMXyzgQl6FwspmahD8ReAFU4SKsYGo2/tzGULAMhUi58Q qf7yvyFOiRm4rRsVhLDZHCZIzdmEIN59sDtXyEBPe3mHK8jPGOE9xBLl2ZDy2Rf8Jat6 MhpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=R4FTofNHpbO0GoF0CAD8c3N18wz/vKGp3QxReBWaTEE=; b=wNcyxCVPEk4q06brl9xq2DDDdCnVUHUt8v4oqMZ8siBfaJcrVEFXWA0IV//gTqwKVR NdHBVAZ6+t4ZqX1C+CJSzW/eFEOBQ9yNGuHGP3NJsX9LpAXETPfe83uU4T7OCMoSv0tB M9W+3DcL4yJr7HuW1kZ9grYlGm5thvqO0N0fzaJcRyN5o74yc1nPnRoIUh3qek2fmeyI zZocgbOE+I2AXhYWVps7+rcp71kKXwlJ5FY0mCahKrqdqA/Tta7IyamxcG7kDiiHtD2D UsWn8qnNfQkqtUpN5RRU4MYxdV+bBO8r6fB5c45FTitqQnFbhC++QfXis/4LfBmXxkf3 YTJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 20si270297wmy.2.2019.01.06.22.06.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jan 2019 22:06:08 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x07668mW009344 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 7 Jan 2019 07:06:08 +0100 Received: from [167.87.33.204] ([167.87.33.204]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0766719023310 for ; Mon, 7 Jan 2019 07:06:07 +0100 Subject: [PATCH 10/7] bitbake.conf: Clean up and enhance OVERRIDES From: Jan Kiszka To: isar-users References: Message-ID: Date: Mon, 7 Jan 2019 07:06:07 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: wL2qVieqCLEJ From: Jan Kiszka We do no use any "local" override, and there is no TARGET_OS and TARGET_ARCH in Isar. Rather adopt the OE core ordering of arch:machine:distro and also add the "forcevariable" the OE provides. Signed-off-by: Jan Kiszka --- meta/conf/bitbake.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b067a0d..0e521bb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -28,7 +28,6 @@ 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'}" @@ -55,6 +54,8 @@ BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs" CACHE = "${TMPDIR}/cache" +OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable" + # Codename of the repository created by the caching class DEBDISTRONAME = "isar" @@ -66,8 +67,6 @@ REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db" REPO_BASE_DIR = "${DL_DIR}/base-apt/apt" REPO_BASE_DB_DIR = "${DL_DIR}/base-apt/db" -OVERRIDES_append = ":${DISTRO}:${DISTRO_ARCH}" - BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ -- 2.16.4