From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a19:1709:: with SMTP id n9-v6mr405469lfi.35.1538482796534; Tue, 02 Oct 2018 05:19:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ce46:: with SMTP id e67-v6ls1345526lfg.7.gmail; Tue, 02 Oct 2018 05:19:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV62PbL+fG6C0dzJaLwyRqDr10ucibxE7xoSt+EnWRaEXnUFz+lyXX+rsIGSMd5tEHV/K/Ii1 X-Received: by 2002:ac2:4292:: with SMTP id m18-v6mr406188lfh.0.1538482795761; Tue, 02 Oct 2018 05:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538482795; cv=none; d=google.com; s=arc-20160816; b=eNqGXMU679SmJBL2qLtOlPShk3z5SoFkVADuVRRkpCgyPvptGUjWb2Kw80ul/wpm5X syawmoLydIAOc1BW9Fzo0I6C8QPd6jE6X3V8VBRc0pu67AFKnK5od3WTGX4rOnVPCs2T uFi4bFbdS16jGztmyAMm+RTmBSYl20eeU8BLkNQUbF6qUZV0asm3maoyw2HsqJLBtK2h syz8JCzl9E2hQBSKdU0luOFej0elQU27RgOW7EEjdTngtUZnjgDw1t3nERSk0mOU9jVG wJh4+mUjBbNxugCtSKa2HK3Rp2Yzq7rb2aYInNc04IHl2hlgEvoA0jq/qUytToz4221P n9dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=BYjwHux4srP7Z5ReuDcG2dNcg/GfRsLLoVFqfrLHTmE=; b=QicDLuE9OvJ7E3sN6s9yCwigytuV4FLtf929U+usb5EyTi+y96QcvfestsXInc15yE b2Vc7sDB8E2LY46yjVj0mmNQj/RJJo4RyN8TKpAqvaHABTpp8QXk0yMU53mp9+8dDiO9 RRal/pwQKvRfyjKSCG8R8JVBnD/qy0XxcqejEjOSbWyUhPiQBam75YR2pSXhuixt5Z03 HQbp8CqATHbhTZV/zN6FWPuHS5dcJG3afOrsjj6rPZ1jZNgb+pTLlRsy5ci7ZBymz37h VGUQYqDZrZr/+OZlw4tKPyj8/vDPvpRFjGaNMufXIZRxK0c33X6rwEhB1DrYn3gYzD6u iX+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id a199-v6si445737lfa.2.2018.10.02.05.19.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 05:19:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w92CJ7La013178 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 2 Oct 2018 14:19:54 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/9] base-apt: Introduce base implementaiton Date: Tue, 2 Oct 2018 14:19:00 +0200 Message-Id: <20181002121907.18476-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181002121907.18476-1-mosipov@ilbers.de> References: <20181002121907.18476-1-mosipov@ilbers.de> X-TUID: RoA1XIdRg7nI 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" 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" \ + ${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 -- 2.11.0