From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a1c:7e45:: with SMTP id z66mr571634wmc.12.1547616753021; Tue, 15 Jan 2019 21:32:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8186:: with SMTP id 6ls1033249wra.9.gmail; Tue, 15 Jan 2019 21:32:32 -0800 (PST) X-Google-Smtp-Source: ALg8bN4LnQS/4ARCyK9cDtXI4dRluHA3ngfpzKegWjyn0gZemPjoXM1bygq1cHE9hz7ZHxwOCKSa X-Received: by 2002:a5d:4811:: with SMTP id l17mr455034wrq.29.1547616752529; Tue, 15 Jan 2019 21:32:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616752; cv=none; d=google.com; s=arc-20160816; b=08zS+jVi9O4hN9RuF9l4yHmha9VzHM7mZavQCjkF2ieedBIJwPDtXgjUNZ2+dDkwuV 3jdlxnDTfBYjM7dsd4VLctsuf5SKNislAMbP8gD5gWrVUSL9INlea3X68BPrOJsXR4ts AlsUir/ZUsVY2AiO1G7KtS5kghDlElejAN5mvPUqohPE0ZBBiwFPQZN6m+sA7T/EoQJU +CJpR1rfMZGJ6k60/si8vgMpAXH/KJC0ztA5/AsJEuT8QS4K0CuHQPcJbr9Xg1AcgioM n4OlXNwAMCiIzVAkfNVjgdlGpNrCBPnsrGiaT/4cH1cLkpcn7HqpcdfobXTTyAJCrA/B 8HMg== 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=vFzQ07c0I2c6XmN545rBUpe/gyphd2wskXjFrT8WSCo=; b=FM2G7rGIWHFd0DgL0PUusrg8BOHlcbLPIIjYYBGwYbsNtaMUtTMoes9frFCPDwrgtZ OxD2p6/a9FGPOhsrUCT4eA6h7PHXKHoQb0L9nzHkPNLLTDdcJxjpPiahgQjTM7Z6xCjD Dm2XrbqyVXh/9gAasN+7c5rvLlnMVrkXZ99P7tEWqdMTIVQeQKfrGKvKKdIgpXhM8lOW uOF2lnsCzokmxaIwtoJRrEoi5p5XE53gPrCPZjC6Anzsk/EsFQctJn5SJx4Dn6DkdKZq qzatJNDUpZQ1Ge7BFTAQjmEZ6FmKhxVlFrkXJIhItNLHz8oNZdhSI7hjXtgE9w/vvIsH /Atg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k39si2593060wre.2.2019.01.15.21.32.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:32 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0G5WWwm002016 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:32 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoO011496 for ; Wed, 16 Jan 2019 06:32:31 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 06/14] Move repo variables to proper conf file Date: Wed, 16 Jan 2019 06:32:19 +0100 Message-Id: <6e2f9edda74d552550aa907ea5b06f516394e978.1547616747.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 6tBJ6rQjXQdy From: Jan Kiszka These definitely do not belong to a layer.conf. Rather, they are so essential that placing them in the custom bitbake.conf is justified. Signed-off-by: Jan Kiszka --- meta-isar/conf/layer.conf | 11 ----------- meta/conf/bitbake.conf | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf index 5d3ae88..9939bdc 100644 --- a/meta-isar/conf/layer.conf +++ b/meta-isar/conf/layer.conf @@ -17,14 +17,3 @@ LAYERVERSION_isar = "3" LAYERSERIES_COMPAT_isar = "v0.6" LAYERDIR_isar = "${LAYERDIR}" - -# Codename of the repository created by the caching class -DEBDISTRONAME = "isar" - -# Isar apt repository paths -REPO_ISAR_DIR ?= "${DEPLOY_DIR}/isar-apt/apt" -REPO_ISAR_DB_DIR ?= "${DEPLOY_DIR}/isar-apt/db" - -# Base apt repository paths -REPO_BASE_DIR ?= "${DL_DIR}/base-apt/apt" -REPO_BASE_DB_DIR ?= "${DL_DIR}/base-apt/db" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7e8dea1..b067a0d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -55,6 +55,17 @@ BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs" CACHE = "${TMPDIR}/cache" +# Codename of the repository created by the caching class +DEBDISTRONAME = "isar" + +# Isar apt repository paths +REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/apt" +REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db" + +# Base apt repository paths +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 \ -- 2.16.4