From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467463440282681344 X-Received: by 10.28.131.208 with SMTP id f199mr1886532wmd.11.1506959518860; Mon, 02 Oct 2017 08:51:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.229.10 with SMTP id c10ls2020810wmh.10.canary-gmail; Mon, 02 Oct 2017 08:51:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBzJYOvCEb/PGAj0AscKz95VkpJzQpEBTZTKGH+hGcqZw/bvknJmftljdVQm1wLoVFi9Okc X-Received: by 10.28.175.2 with SMTP id y2mr349500wme.7.1506959518578; Mon, 02 Oct 2017 08:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506959518; cv=none; d=google.com; s=arc-20160816; b=uxzguCAC3mlZTieiPhE5qrNCsX7gL3Ro2+/21H6m3QWv3LIHqCxwhnQHA8xD5ZW2Fy 3XrbtDCdFrfWaBkugLaLdt+8gSMKqRGZKUOowkQXZzk/evSdnBS2nv5Qlao+mKMC3aoU tNW7JsAJFghw+OShs98S5BlKbmLPBWFkiOiKdlfORKEBvNJowU0ExBv6UZ8ouIvyd1m/ 52+BfMMdp3kE4A6ZopUSuYGqTSEytwIQc4w6o32UmiAb/XAY7PmA14BSMyWTktg9Woc4 eZb/FavIYF+lFrNP8x0Q84VLqgbE++krxiScQu6mNmrDPlLUtuzQRcSGkpbNYOIrjMdC OqVQ== 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:cc:to:subject :arc-authentication-results; bh=V72amPKymBFez0VzTpshS7MMHRL+zGMw4AVd4wgRPAw=; b=V/3mdvukp9rgW4cwNhTwIMwTv38atuP9k7vAehW4i7VUamrCy9KxGR8K0www8PwjYa LEN0WcSFEnAvij21d2vEviEjDxS/K4mYGurwS/suer+wkrzqgjwYLoxOqUy/2RCfWUww UvMyFLSBOj2/Ei9qR8W8qnrrfQ1joV/UzYszFj2UuOwi7gUigqFzcMQTDJxDsDnNjOqR Ed/oMVzxabjP9tVEfLonNtuqY1kS83siaGqoM1+A6D5zT0ktioTMqdOFJCLmOw6DdrLu H/afKF5RvWrCZmUS9T4P9I/7vBkNDkolLEL0seGKnjJtNFh9j/aWxa9aEoKved2d3PS8 rb4g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id h17si1321922wmd.0.2017.10.02.08.51.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Oct 2017 08:51:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v92Fpt2h020989 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 2 Oct 2017 17:51:56 +0200 Subject: Re: [PATCH v3 1/4] meta-isar-bin: Add reprepro configs To: Henning Schild Cc: isar-users@googlegroups.com References: <20170925100000.5368-1-asmirnov@ilbers.de> <20170925100000.5368-2-asmirnov@ilbers.de> <20170925132514.6257d606@md1em3qc> From: Alexander Smirnov Message-ID: <17a33d72-d209-c75b-5031-cd7d86a23915@ilbers.de> Date: Mon, 2 Oct 2017 18:51:50 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170925132514.6257d606@md1em3qc> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: x2Aaq0fx0Wz0 On 09/25/2017 02:25 PM, Henning Schild wrote: > Am Mon, 25 Sep 2017 12:59:57 +0300 > schrieb Alexander Smirnov : > >> Add template for reprepro configuration file and function that >> generates final config for specific deistro. >> >> Signed-off-by: Alexander Smirnov >> --- >> meta-isar-bin/conf/layer.conf | 11 +++++++++++ >> meta-isar-bin/files/distributions.in | 3 +++ >> meta-isar/conf/bblayers.conf.sample | 1 + >> meta/classes/image.bbclass | 13 +++++++++++++ >> 4 files changed, 28 insertions(+) >> create mode 100644 meta-isar-bin/conf/layer.conf >> create mode 100644 meta-isar-bin/files/distributions.in >> >> diff --git a/meta-isar-bin/conf/layer.conf >> b/meta-isar-bin/conf/layer.conf new file mode 100644 >> index 0000000..3518184 >> --- /dev/null >> +++ b/meta-isar-bin/conf/layer.conf >> @@ -0,0 +1,11 @@ >> +# This software is a part of ISAR. >> +# Copyright (C) 2017 ilbers GmbH >> + >> +# Codename of the repository created by the caching class >> +DEBDISTRONAME = "isar" >> + >> +# Path to the caching repository >> +DEBCACHEDIR ?= "${LAYERDIR}/apt" >> + >> +# Path to the configuration files templates used by `reprepro` >> +DEBFILESDIR ?= "${LAYERDIR}/files" >> diff --git a/meta-isar-bin/files/distributions.in >> b/meta-isar-bin/files/distributions.in new file mode 100644 >> index 0000000..cd214c6 >> --- /dev/null >> +++ b/meta-isar-bin/files/distributions.in >> @@ -0,0 +1,3 @@ >> +Codename: {DISTRO_NAME} >> +Architectures: i386 armhf amd64 source >> +Components: main >> diff --git a/meta-isar/conf/bblayers.conf.sample >> b/meta-isar/conf/bblayers.conf.sample index 80867e7..53a362b 100644 >> --- a/meta-isar/conf/bblayers.conf.sample >> +++ b/meta-isar/conf/bblayers.conf.sample >> @@ -8,6 +8,7 @@ BBFILES ?= "" >> BBLAYERS ?= " \ >> ##ISARROOT##/meta \ >> ##ISARROOT##/meta-isar \ >> + ##ISARROOT##/meta-isar-bin \ >> " >> BBLAYERS_NON_REMOVABLE ?= " \ >> ##ISARROOT##/meta \ >> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass >> index 5bf9524..9ab9b19 100644 >> --- a/meta/classes/image.bbclass >> +++ b/meta/classes/image.bbclass >> @@ -10,6 +10,19 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" >> >> inherit ${IMAGE_TYPE} >> >> +CACHE_CONF_DIR = "${DEBCACHEDIR}/${DISTRO}/conf" >> +do_cache_config[dirs] = "${CACHE_CONF_DIR}" >> +do_cache_config[stamp-extra-info] = "${DISTRO}" >> + >> +do_cache_config() { >> + if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then >> + sed -e "s#{DISTRO_NAME}#"${DEBDISTRONAME}"#g" \ >> + ${DEBFILESDIR}/distributions.in > >> ${CACHE_CONF_DIR}/distributions >> + fi >> +} >> + >> +addtask cache_config before do_fetch > > Looking at the patch from Claudius, this one should probably use the > fetcher for the .in-file as well. The step would naturally go after > do_unpack. > I've thought about this and tried to implement, but seems it's not the case here: - Default fetch task for each image will copy template to each image workspace, while it's needed only if there is no already generated config. - This config should be generated once per-distro. So I think this should stay like it is for now. Alex > Henning > >> do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}" >> >> # Install Debian packages, that were built from sources > -- With best regards, Alexander Smirnov ilbers GmbH Baierbrunner Str. 28c D-81379 Munich +49 (89) 122 67 24-0 http://ilbers.de/ Commercial register Munich, HRB 214197 General manager: Baurzhan Ismagulov