From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a1c:c189:: with SMTP id r131-v6mr279627wmf.15.1538490004869; Tue, 02 Oct 2018 07:20:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:d950:: with SMTP id q77-v6ls315985wmg.22.canary-gmail; Tue, 02 Oct 2018 07:20:04 -0700 (PDT) X-Google-Smtp-Source: ACcGV62+Tpk1fehwXWdyxoGygOS/tBWnvNvz4yy478WTMR7txm91Nq2c41c+R/ruvBhnGFh0AC7+ X-Received: by 2002:a1c:4b04:: with SMTP id y4-v6mr307096wma.7.1538490004442; Tue, 02 Oct 2018 07:20:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538490004; cv=none; d=google.com; s=arc-20160816; b=Ol7LHPN8UwdOkr72MuUtvBJhBX7hR+rxYGTQ/0OdHFCm6JeT47ME9sSwAfdCTVTrNp Kr+x3MBQRNllT6NGTl/8V4ddOvwZLarRM2gTL+hQtO2g4UvHjT8ZIsfs9AViyFhUPP8c wvJmLhbYuJImo8aR/j0SOQRwEDNAAxgO1FKO1JpiHoTCOfaaS8R1K37KVd8Ey0UmCyEf kKTNFwEkA/km0WLwK1QP2+Z+QwiRsZ4VUFQqtD/OnOxWqi6nKk/owzxGAvh8x0I/MSPE yU8q4jjZ2YArDUw11Jpbk5Cri2nmr17jTSJGTf6X5BUD65BflsS4G2bf/FNIwo2Cz/XW +OgQ== 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:from:references:to:subject; bh=VdRStzdV1g9TOpBLMMAg/Ym35dJlvl+I/pbZ9RLIJoQ=; b=fEyQNkML2+v427bUOoTt+nqu/DY1300PSMkebTqcOp7GrOxMdmUcd54lNJ/ToNGSdj s6sNh3DMgImNnXg+btyX+zH8KyokXxxXwfwul3m6EzyBrhU54sJ2SZ22l7cWdUfpKCc1 /SNfHUltdUkTql2XHXbRawlsbMA/PbvxfxRUtCjLKIg63sLxZfWwoAsaNSbC34PsW/9I 6yGeDSmsQ56Sz+fy9Kp15+rdAMjxUYTLEJgZ5ZWEl1YYlCXQpUFbsbFowtci41Sq/A9L ZxCI+yrneXmPcnRzxo5EdsIxQ/my4eQ8deT/6wpS9iK48BF/D/BfhqavFSy56VUXUGiF pvlA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z21-v6si573448wmi.2.2018.10.02.07.20.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 07:20:04 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@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 w92EK3v3014508 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 2 Oct 2018 16:20:03 +0200 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w92EK37s021345; Tue, 2 Oct 2018 16:20:03 +0200 Subject: Re: [PATCH 2/9] base-apt: Introduce base implementaiton To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20181002121907.18476-1-mosipov@ilbers.de> <20181002121907.18476-3-mosipov@ilbers.de> From: Claudius Heine Message-ID: <15ec8ffb-d3b0-c9dd-e983-ad6defe2145e@siemens.com> Date: Tue, 2 Oct 2018 16:20:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20181002121907.18476-3-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 93MTBHteqjlc Hi Maxim, On 10/2/18 2:19 PM, Maxim Yu. Osipov wrote: > From: Alexander Smirnov > > Signed-off-by: Alexander Smirnov > --- > meta-isar/conf/layer.conf | 10 ++++--- > meta/recipes-devtools/base-apt/base-apt.bb | 31 ++++++++++++++++++++++ > .../base-apt/files/distributions.in | 3 +++ > 3 files changed, 40 insertions(+), 4 deletions(-) > create mode 100644 meta/recipes-devtools/base-apt/base-apt.bb > create mode 100644 meta/recipes-devtools/base-apt/files/distributions.in > > diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf > index cd42f06..ae1b3c5 100644 > --- a/meta-isar/conf/layer.conf > +++ b/meta-isar/conf/layer.conf > @@ -20,8 +20,10 @@ LAYERDIR_isar = "${LAYERDIR}" > # Codename of the repository created by the caching class > DEBDISTRONAME = "isar" > > -# Path to the Isar apt repository > -DEPLOY_DIR_APT ?= "${DEPLOY_DIR}/apt" > +# Isar apt repository paths > +DEPLOY_DIR_APT ?= "${DEPLOY_DIR}/isar-apt/apt" > +DEPLOY_DIR_DB ?= "${DEPLOY_DIR}/isar-apt/db" > > -# Path to the Isar databases used by `reprepro` > -DEPLOY_DIR_DB ?= "${DEPLOY_DIR}/db" > +# Base apt repository paths > +BASE_APT_DIR ?= "${DEPLOY_DIR}/base-apt/apt" > +BASE_APT_DB ?= "${DEPLOY_DIR}/base-apt/db" I don't like those variable names. IMO it would be ok to break the variable backwards compatibility here and unify that. How about: REPO_ISAR_DIR REPO_ISAR_DB_DIR REPO_CACHE_DIR REPO_CACHE_DB_DIR The db directory is reprepro specific so the main variable should point the the correct repository path. IMO > diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb > new file mode 100644 > index 0000000..6ff1164 > --- /dev/null > +++ b/meta/recipes-devtools/base-apt/base-apt.bb > @@ -0,0 +1,31 @@ > +# This software is a part of ISAR. > +# Copyright (C) 2018 ilbers GmbH > + > +SRC_URI = "file://distributions.in" > + > +inherit base-apt-helper > + > +CACHE_CONF_DIR = "${BASE_APT_DIR}/${DISTRO_NAME}/conf" > +do_cache_config[dirs] = "${CACHE_CONF_DIR}" > +do_cache_config[stamp-extra-info] = "${DISTRO}" > +do_cache_config[lockfiles] = "${BASE_APT_DIR}/isar.lock" > + > +# Generate reprepro config for current distro if it doesn't exist. Once it's > +# generated, this task should do nothing. > +do_cache_config() { > + if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then > + sed -e "s#{DISTRO_NAME}#"${DISTRO_SUITE}"#g" \ Mixing DISTRO_NAME and DISTRO_SUITE. They are different, try to be consistent. Cheers, Claudius > + ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions > + fi > + > + path_cache="${BASE_APT_DIR}/${DISTRO_NAME}" > + path_databases="${BASE_APT_DB}/${DISTRO_NAME}" > + > + if [ ! -d "${path_databases}" ]; then > + reprepro -b ${path_cache} \ > + --dbdir ${path_databases} \ > + export ${DISTRO_SUITE} > + fi > +} > + > +addtask cache_config after do_build > diff --git a/meta/recipes-devtools/base-apt/files/distributions.in b/meta/recipes-devtools/base-apt/files/distributions.in > new file mode 100644 > index 0000000..cc82c57 > --- /dev/null > +++ b/meta/recipes-devtools/base-apt/files/distributions.in > @@ -0,0 +1,3 @@ > +Codename: {DISTRO_NAME} > +Architectures: i386 armhf arm64 amd64 source > +Components: main > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de