From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a1c:8083:: with SMTP id b125mr647542wmd.11.1547616755299; Tue, 15 Jan 2019 21:32:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:41c5:: with SMTP id o188ls137159wma.3.gmail; Tue, 15 Jan 2019 21:32:34 -0800 (PST) X-Google-Smtp-Source: ALg8bN6EKUgnLu/aGmRU5JCT82znRJtEIPZPLIhYAav+arPqOakfh3FK0rsd9kPQC2NwjsdLCKdi X-Received: by 2002:a1c:c91:: with SMTP id 139mr640075wmm.9.1547616754704; Tue, 15 Jan 2019 21:32:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616754; cv=none; d=google.com; s=arc-20160816; b=ozvZR86+EbCpqRqRLBxnGtiaKvhkGm3sZSyCJ9CyEBoN/qfwU7S12Zn1haCyNSGI7B RtxPa0U3tt2MHP86z76uAfooUG++4AL3+QLWBp9rAKrm+QS1Rh0so/OrQ7i4zaiCZuvV dq5Gul2AVOK4SlPl3aFUAZM3P+ZYZOZD0Xa2lvCIb1lJ6k9xjAlBIBTBjrPmU5ZZHFLs q8G7lKJ2tg11bntJUSpE4UHAp/dr9N8wWC8a4dazR0gPqQBYZvB6Ypx2LH/8IapQAtAI 4uDyeRW+kbdNCQvNiFjD8wmNWKexIdAmvdjdVguqInU6muDO0iZPhB5D4ggSugoM7tm7 nLxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=R4FTofNHpbO0GoF0CAD8c3N18wz/vKGp3QxReBWaTEE=; b=hoz06oeIO8n+g/yxSWnCDEQxAp/rdoSIbaid9FR4k0K1QWTefvwhxDKrVFXdmJvNTX 0mQfeXa5mVhraVPlEtjNRWWix22NHDNCn9o8hHfg2B/Z+kMg1o15iHVH6ttVDFRB1bF2 z99UYgEZHN2Vx3HDXs/vnoVShz09y58eiQKh2+DEqZIT8MSYpGUzkVPYlDZc/AVqm93C qsLKl7A+uxCAQTgli6jjMiO2sPTEcrdejdMKIeivzgOa8Vxycnh/ghmeOEQJl616DSqe AEANc5+B6Q5hjEGTKjWm5XCn11PChqIJJ4OBzuB4/qRDsPaz1J9hFOsp0nmiN+96Ip3I FDfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 64si931983wma.1.2019.01.15.21.32.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:34 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x0G5WY6i031967 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:34 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoU011496 for ; Wed, 16 Jan 2019 06:32:33 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 12/14] bitbake.conf: Clean up and enhance OVERRIDES Date: Wed, 16 Jan 2019 06:32:25 +0100 Message-Id: <21098894bfe9da088af726d0ce610dd69a14e07d.1547616747.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: avlt4+DqsfGm 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