From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123828785152 X-Received: by 2002:adf:ca07:: with SMTP id o7mr23970260wrh.49.1576497015296; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f403:: with SMTP id g3ls6238954wro.3.gmail; Mon, 16 Dec 2019 03:50:14 -0800 (PST) X-Google-Smtp-Source: APXvYqzrOKX+44pZgN62BtJ9s+pollI615HzqHGJaTKmgiLWETu9XgnEI2zcYq5GrgQ9v1MY1arI X-Received: by 2002:adf:e6cb:: with SMTP id y11mr30404551wrm.345.1576497014729; Mon, 16 Dec 2019 03:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497014; cv=none; d=google.com; s=arc-20160816; b=uX/gujhdYaD0QJ7QoUk3z+3AYvcHgxfdBbOv2DFXEMNIR6+kjih0r+t2/Kqw9xXLLf DMx+6y5siAftJG+gkLv8RUA3Z6+UQ+4SvPb/6tCsw4tAEYd/lF6FOCTZmHttQ9CrOBe2 FwNYaqitZBGnmw7B8s7Ukl1mlI0ubRGFkMDW0YO2UtNNK6u3AZUmGOXajO21cZgpelad 4Gr5IA385rYQ/eh1eputmhNZGem6Zru7k81eogyDuv5mPUVkjMdw1JeF5HJGOd6lrR8H IFH4ZwqY78FQ62I9xT8MXBVwZSrFp3FPNFfvO8JSMqtcewqXZHb+iQBKgRUwIWYNqCo9 pEUg== 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:cc:to:from; bh=CMaE83BikS3ef/5z9RXDr6/Hrz4NQcYgwShbdhqfI10=; b=WG0+5YTc0jvqVe4rXVMPpb2jm9lgl+fzPCkt8R4m295W1G+QAki1ynHeD35eB6NcRA zwoQ8Fgt4dQjc44I97mLCffrbXB0PZnH22Qnu6ift1tBFTLU0oBVm4o+MMAitFD5KFGi mCKEsmk/TbhKA17lVOOJLM8uKDOyaVsASREW/9Bi91e4MJTXyd/qGDzMVLvKYy8tdS7p 0UP0v+9dZKevEwDe4/JSquYu2rIPIdyqylAjG/1B+UYp3MKaCMDKV659avskRm5Q1sMF 79jkjeXkkYtaa7jBDmIWl/ffC6UNquVO/8pEhuET+NfIRIHeiKOFxejTXXBGmXPsnd5X eQ9A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id g3si720037wrw.5.2019.12.16.03.50.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:14 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 xBGBoD1O024836 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:13 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWQ009084; Mon, 16 Dec 2019 12:50:13 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 05/25] base-apt: add deb-src packages as well Date: Mon, 16 Dec 2019 12:49:51 +0100 Message-Id: <20191216115011.17664-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 6cmEDJIuyzDb From: Henning Schild So far the deb-src packages downloaded via "apt://" where not cached. This commit fixes that and includes those packages into the cache. Signed-off-by: Henning Schild --- meta/classes/base-apt-helper.bbclass | 7 +++++++ meta/classes/image-cache-extension.bbclass | 4 ++++ meta/classes/repository.bbclass | 14 ++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 1f08c70..db25adc 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -52,4 +52,11 @@ populate_base_apt() { "${BASE_DISTRO_CODENAME}" \ "${package}" done + + find $search_dir -name '*.dsc' | while read package; do + repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${package}" + done } diff --git a/meta/classes/image-cache-extension.bbclass b/meta/classes/image-cache-extension.bbclass index 30db549..f8b9ba3 100644 --- a/meta/classes/image-cache-extension.bbclass +++ b/meta/classes/image-cache-extension.bbclass @@ -32,5 +32,9 @@ do_cache_base_repo() { if [ -d ${BUILDCHROOT_TARGET_DIR}/var/cache/apt ]; then populate_base_apt ${BUILDCHROOT_TARGET_DIR}/var/cache/apt fi + + if [ -d "${DEBSRCDIR}"/"${DISTRO}" ]; then + populate_base_apt "${DEBSRCDIR}"/"${DISTRO}" + fi } addtask cache_base_repo after do_rootfs do_install_imager_deps diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 880ddef..dc4c1dc 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -35,6 +35,20 @@ EOF fi } +repo_add_srcpackage() { + local dir="$1" + local dbdir="$2" + local codename="$3" + shift; shift; shift + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + reprepro -b "${dir}" --dbdir "${dbdir}" -C main -P source \ + includedsc "${codename}" \ + "$@" +} + repo_add_packages() { local dir="$1" local dbdir="$2" -- 2.24.1