From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a05:6402:286:: with SMTP id l6mr6042772edv.11.1546428860101; Wed, 02 Jan 2019 03:34:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:b656:: with SMTP id c22ls8661466ede.0.gmail; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/VOlXlmPI9oEQsed0CzEUYBjt2OBKjy1eRwCUMl4iFjKjMCmimUgC1m0uVqZx3rEUvDKd3C X-Received: by 2002:a50:b4a1:: with SMTP id w30mr6063028edd.2.1546428859675; Wed, 02 Jan 2019 03:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546428859; cv=none; d=google.com; s=arc-20160816; b=qJpLJMRIXb2vlcIPIb+ogIlaeVF275QZziZ1DS8FC5Yixs3qf/RyHPSsrsRpji+KKG Acq66A6clxAY/F0ZXnmr3/DuYZvNKwQL3m5++g1umf92VKu+7rjUzKl86OQBO4Vwr0db ciHj7FugMQFvMd3hmhU+GJ6N2MmSnAMiUfrE+iJj1EG6n88JRwrZ6q5uwUmgCaI7Bcdj blPWjWOBT80jdikfJo0TJFYU0/4Y4wrZTUMGuyoYn6TAEkwK0YQsVM67IoCoHO5VKs06 k79BrB+Gk8GVCGjhcOA0h2J1qdm57lZ/3u3f+MryfX0bVld+ImrwA9FT5vB44txodCAH eXcw== 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=LI7udu3pv6nMQ1bOOKjciUlZ7a6AbZizRzOzJvPBEosL5Fv7JQA/uTBGtnQRqntCTA bxfsYGMnhklHDzz+zw2EX9mvsZBFKO60GDhrRK55ManJE+K2oPj7LssODUwuRtGa4QPp LEUpX/7lQJIAirmN+5p2znPIcK5gMTf6dGMhdHAV4YaxnPZtPlSu1ZR9SizHMLA+l1hU eyoCV71yxHvBYNyZh9lxtT0131uIgNIZ9ucd/ja9oMqB7U5k+Q9GUhQ3KiVC/bfCrOmX 5iOu33EYvRI8WlWn3q4V7Z1Gvg+TB5L4YSGap3XW2ZOcsVQ1b1NoFTrxlDNaMVbSONIp o8+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id i2-v6si1820388ejj.1.2019.01.02.03.34.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 03:34:19 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x02BYIks012820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 2 Jan 2019 12:34:19 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x02BYIYQ009562 for ; Wed, 2 Jan 2019 12:34:18 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 6/7] Move repo variables to proper conf file Date: Wed, 2 Jan 2019 12:34:16 +0100 Message-Id: <81e63fb917df65c4ce6ff2b7619ba1d42690ba14.1546428857.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 0+a6Zm/Gdv/J 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