From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a1c:2c4:: with SMTP id 187mr296345wmc.78.1572282095490; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c151:: with SMTP id z17ls194162wmi.2.gmail; Mon, 28 Oct 2019 10:01:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzT6rwRVC1vozkYavlp2QbHq+uYEi8C3ksdr9ssZqc9tgCyG+TsepqBewh2NhTbC/uuvz2I X-Received: by 2002:a1c:7c07:: with SMTP id x7mr285074wmc.130.1572282094917; Mon, 28 Oct 2019 10:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282094; cv=none; d=google.com; s=arc-20160816; b=D+Wvb4SdCMW1aAzAA9sMomYwp3Ip/NOnAF1fpLLBokPP84VsOFsoTSKQ2m2EcCl9US F5i1lcO8ONid9RbNjwJoAEg9nGCYxP3IbpMn4RwveZsT9sHFzypF8WBKY7io1otJBmdk kNP4aViyVamHY8kYYUmniOxBrCHXRtLVHwCmBru19JVe/pYN2UGrYcqrEqzHI4/e+iOQ Lu9BCA/ch3ob8t3FtCIVCsPnHC48g7QSqshvK6gDJ2nVqQxROKVURw7K4eBxadwAKJrp bYelJ6N1FpQNgrwO36+ur6UIv4sJwbYrYE6OxCwiso1nqYEt2rtZ5RJSDFhoeSLivMR3 7ogw== 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=/VQpBq2qeIOL8kCpYL9oYsPcs0JZVg7T+9qFdEpG0oE=; b=Xmjn4IEsNM+5183C3tA8akc/58mPZN0ooW1yoELWezvESPEPc7edIsuhJVqtBrlHSD bXjcy4DAYAkpwkhsdiqWn22DVkB+99C6D80bsL3yVMnbig5kgCWgOyouqfMbUAJlbRXI vW29AlOCmr6gt/9jpCHoGJ4M7icXSS92TWNGSdsNCTCRCsDIM2n1rj3biWkFhlNZCJFv uhCnTNKosSqNZmLyZtsdWHrLPG5wzmgatRFq2Z2IpPe6jC4xY63pz05BgkHKCalODgdX aVY7PkGxinWSp4hT1+erW4iDlVJIP02aj6mmQxJ0QbWoJvMAbizeYPeVrX/hRplH0whP 34gA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id c12si18703wrn.2.2019.10.28.10.01.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x9SH1Ypr032242 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:34 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPA025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 04/17] base-apt: add deb-src packages as well Date: Mon, 28 Oct 2019 18:01:19 +0100 Message-Id: <20191028170132.28072-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: wX/SbN53SWTS 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 567eaea..3013edf 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 afd3aed..22d1f93 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -30,6 +30,20 @@ EOF fi } +repo_add_srcpackage() { + dir="$1" + dbdir="$2" + 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() { dir="$1" dbdir="$2" -- 2.23.0