From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:4987:: with SMTP id r7mr2722643wrq.424.1584291757790; Sun, 15 Mar 2020 10:02:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:548b:: with SMTP id h11ls7877925wrv.9.gmail; Sun, 15 Mar 2020 10:02:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvAYfhsW9OI4rFfUz2fTlDEPA6z9HC6U4H8KY8gZmbqdfEQhL//i+bHJkmFEWXaaQNpWNhB X-Received: by 2002:a05:6000:1186:: with SMTP id g6mr16653555wrx.331.1584291757248; Sun, 15 Mar 2020 10:02:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584291757; cv=none; d=google.com; s=arc-20160816; b=scejzom8zxJsBvBjEbEjnPP1lB0HKQEvtHnmySTi0GCc+tcvfFRf9Mkz5gVvtf3lH0 3oXNnfnaarYM0StcgeKZ2im3buM7aXLU/GY47bMgNsWvk7RV6DUj8GUID7+iux1fJU77 PzczoBuds57IgfKte0r2AvitfmiO0xCphs7xUAS0X1WEyc5LOOfFvDzsrcxn3fLj0R0t YMMUHqAE9O6NgnVPH0T248CffZLVIREJnP/TI4DbnkZY4rmQeM9Th/yMMdAtaBZ+9O2m +6kYhyoHSCB8hxyEKA7KVGPQDHX+8BdakK6re6t/coBpZVr+goDMQusP3+fEOBnF+XqL 5tIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=0Zfmors4dKBQpHfOPXOz1cVMR9YHCrUsoU3pAPMwFrk=; b=VBEdFGj6y6P4gJddh24wt1eQatUULxL0bVHN9XlCAHQOXDAhGgbhIEKjSiCT34llWM KnDFO73Kc0WG+8n1r2g1NDwNbYJ/Xsr8R8sT/xCUhFaxVf70jyh5IopRgH+UVApPM8uD E7aAOZxfim/NMlO5ftij9KS+uG/gaBvt4wQ4N/jKyLsEWkXizo/Tw+DPYjRIZ0AHR/sk i6knpfDYBRKsQVcSd7SYuyx44MHXeLoHeh1oa5A9D57ockO65O2lnUChi831GkIm1Qa6 QkjPhCsHVN8aU415r9Zw8pnskWIUGoSe2UPZC5RGiC1Ck9b50lanHlYd7xodbIt7D17z PnNQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o194si875897wme.2.2020.03.15.10.02.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 15 Mar 2020 10:02:37 -0700 (PDT) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de ([88.74.195.131]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 02FH2a03013944 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Mar 2020 18:02:36 +0100 Received: from yssyq.m.ilbers.de (localhost [127.0.0.1]) by yssyq.m.ilbers.de (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTPS id 02FH2FZh013567 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sun, 15 Mar 2020 18:02:15 +0100 Received: (from ibr@localhost) by yssyq.m.ilbers.de (8.15.2/8.15.2/Submit) id 02FH2FZU013566 for isar-users@googlegroups.com; Sun, 15 Mar 2020 18:02:15 +0100 From: Baurzhan Ismagulov To: isar-users@googlegroups.com Subject: [PATCH] base-apt, isar-apt: Split code and configuration Date: Sun, 15 Mar 2020 18:02:15 +0100 Message-Id: <20200315170215.13524-1-ibr@radix50.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200315165852.nb4okarmcw5pwwnv@yssyq.m.ilbers.de> References: <20200315165852.nb4okarmcw5pwwnv@yssyq.m.ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ypsd0XyhNNyH From: Baurzhan Ismagulov Signed-off-by: Baurzhan Ismagulov --- meta/classes/repository.bbclass | 10 ++++------ meta/recipes-devtools/base-apt/base-apt.bb | 3 +++ meta/recipes-devtools/base-apt/files/distributions.in | 3 +++ meta/recipes-devtools/isar-apt/files/distributions.in | 3 +++ meta/recipes-devtools/isar-apt/isar-apt.bb | 5 ++++- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/base-apt/files/distributions.in create mode 100644 meta/recipes-devtools/isar-apt/files/distributions.in diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 80502dc..c70138f 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -8,7 +8,8 @@ repo_create() { local dir="$1" local dbdir="$2" local codename="$3" - local keyfiles="$4" + local distros_in="$4" + local keyfiles="$5" if [ -n "${GNUPGHOME}" ]; then export GNUPGHOME="${GNUPGHOME}" @@ -16,11 +17,8 @@ repo_create() { if [ ! -f "${dir}"/conf/distributions ]; then mkdir -p "${dir}"/conf/ - cat < "${dir}"/conf/distributions -Codename: ${codename} -Architectures: i386 armhf arm64 amd64 mipsel riscv64 source -Components: main -EOF + sed -e "s#{CODENAME}#${codename}#g" ${distros_in} \ + >"${dir}"/conf/distributions if [ -n "${keyfiles}" ] ; then local option="" for key in ${keyfiles}; do diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 408dd63..da3e32e 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -6,6 +6,8 @@ inherit repository +SRC_URI = "file://distributions.in" + BASE_REPO_KEY ?= "" KEYFILES ?= "" @@ -50,6 +52,7 @@ repo() { repo_create "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ "${BASE_DISTRO_CODENAME}" \ + "${WORKDIR}/distributions.in" \ "${KEYFILES}" if [ -d '${BUILDCHROOT_HOST_DIR}/var/cache/apt' ] && 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..3cf7ea5 --- /dev/null +++ b/meta/recipes-devtools/base-apt/files/distributions.in @@ -0,0 +1,3 @@ +Codename: {CODENAME} +Architectures: i386 armhf arm64 amd64 mipsel riscv64 source +Components: main diff --git a/meta/recipes-devtools/isar-apt/files/distributions.in b/meta/recipes-devtools/isar-apt/files/distributions.in new file mode 100644 index 0000000..3cf7ea5 --- /dev/null +++ b/meta/recipes-devtools/isar-apt/files/distributions.in @@ -0,0 +1,3 @@ +Codename: {CODENAME} +Architectures: i386 armhf arm64 amd64 mipsel riscv64 source +Components: main diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb index c53b01f..0458bac 100644 --- a/meta/recipes-devtools/isar-apt/isar-apt.bb +++ b/meta/recipes-devtools/isar-apt/isar-apt.bb @@ -6,6 +6,8 @@ inherit repository +SRC_URI = "file://distributions.in" + do_cache_config[stamp-extra-info] = "${DISTRO}" do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" @@ -14,7 +16,8 @@ do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_cache_config() { repo_create "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ - "${DEBDISTRONAME}" + "${DEBDISTRONAME}" \ + "${WORKDIR}/distributions.in" } addtask cache_config after do_unpack before do_build -- 2.20.1