From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a05:600c:210d:: with SMTP id u13mr15410202wml.92.1584779520577; Sat, 21 Mar 2020 01:32:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cbd4:: with SMTP id n20ls3908417wmi.1.gmail; Sat, 21 Mar 2020 01:32:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtvcCQiPjZKd5rUk23cnZd/NliPSP3St13x2kt1Php9nsetvOCInkFXFFAhkjWBGrgZPL1o X-Received: by 2002:a1c:f00a:: with SMTP id a10mr9635173wmb.102.1584779520050; Sat, 21 Mar 2020 01:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779520; cv=none; d=google.com; s=arc-20160816; b=LQp1NL3DelfaXb0ObyS8V4T55U3vWJuiiQAf1h/6YMsc2/HcBANz09ie/E9jzx1ms8 +5F6r7vUhAyOFAFbHc+v7W+Ea97R//il4GKBXMGbIR6k38B1+wxhO1l0VZ9GpoL3a6N0 Hreol29YghK3TWWbzhOS2BXXDRA/RqOdWc8lZCNYAPWPfZMSTwnfeW9fYHX5mY+dW0ja iux+DVt9P3eOoPyFPRVjmg5hipNGiHn8n7ZVn4OblhEsTBEUm4mqNpdv16FWkV9Q8dmE bJlRWQbsA+VXFOy3Npf4oA2tUATR7uGNHSul6TPGbApXt4ijaT9JWNi6Jn779RRn5M94 qxDQ== 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=k0r+4zzIpv51IhwVtQCVgwY/NkzUwFKy+MBg030ZFiA=; b=HSErxA3n8egTXFXIaqUNYMudbecw5hvqMfB+Li5elkrEl2G+SUPx7L1VEc+f8JIDwO HLNd2GS4sY4o78r9GKpR/wyDbwRkWnbqugvmYYoAN2+v/cF3q0rGfCjZVXsgIB8rthok yorF+YBX819DETTQ29Zump+q07J9yElfNYWyoZxc7uEIWFquEf82rAz2bs3JxQPeCPB6 FW/8kvI3MuDZSNlJGdK6ulF1xfNtHN/urKNhfC47qzup0TIg8CpHDim7ZlathT2FbiFT bjN4rARVPstsWVCBNjje9eLOSLNJy+3WkrFQIvbrGV5uMiWFAcekyd1rcLJAY47o+14X PaxQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id v12si404005wrp.5.2020.03.21.01.31.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:00 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8VxqU002797 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:31:59 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGJ021533; Sat, 21 Mar 2020 09:31:59 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 05/29] base-apt: add deb-src packages as well Date: Sat, 21 Mar 2020 09:31:24 +0100 Message-Id: <20200321083148.26160-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: CCQS1J6yIJaa 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 6fc57303..4be7ad27 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 30db5493..f8b9ba34 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 cf0fb5a2..591ee04a 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