From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a05:651c:102c:: with SMTP id w12mr168586ljm.74.1583877402120; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a58b:: with SMTP id m11ls2734463ljp.0.gmail; Tue, 10 Mar 2020 14:56:41 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsXhGikPTD3njTKGAnonkCi5YWbZg5tW41lfIQcgVnUBL6huedsqjuE27L8aUFQTUPfrNF2 X-Received: by 2002:a2e:8896:: with SMTP id k22mr165142lji.246.1583877401501; Tue, 10 Mar 2020 14:56:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877401; cv=none; d=google.com; s=arc-20160816; b=Zn67PLjEP7rR1TdWlrSH9BAAohVXttCJFg0JHhIYbRTiz6e8qwueXRREaZE4xIVLni yeL8b9CCeg4wtbfDZHcjsim23AOv7RhmNCc1WeXmTEXd1ftOB9DMLnmlBduYZLICV+F5 u5RZSkH6qTQXvohk9panLEY0e7hHbe6Avm7M94ex/dhYPXkeMw66ol/ukCCUx1rPzDya 9qnpQpXTUNvuv7qHuZyI9Jlr977JH3TCNDmr6PXOtZPyPaYnquFDO/g6VrAwRaPt2row YrsUfSq2kLKOj0flwio1eBnKr54owlOhfwbeYq0GpmhbDUVUP/LniuHT9gPA61CAygN3 SDIQ== 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=0FdJYz4ewxrNVv3KTWP4MG2+iw7i2fAuaxFklkXD63cgqZsDfO1B+0Yg5A0OvNSwk2 ryJiYke1V0xQ8KChdMOQpe8pM99HpeZ4M8f19YbsKdd8WmpbK2vf40G7NMPsWcwo+oR0 ErfhnjZYAyGJryuuFbKJjZfRJdTjBg8yz81Z4/X5tGTLKBNZ2OmCl7AMIExKmAdPHilK 9wuNgfmefOI0GDZTQCHltIexo0AeJXrhPzj+4EHIx8SMf2AGF9BnosEgXO3DAWARreK3 KttTpuY95A88gBTCek72Feoqhj57zl26rg2ruHvLfJGMbeYRYvVPt2d/DHm5PywD25bQ +Lng== 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 u8si8841lfu.3.2020.03.10.14.56.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:41 -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 02ALueac027815 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:40 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5n026985; Tue, 10 Mar 2020 22:56:40 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 05/29] base-apt: add deb-src packages as well Date: Tue, 10 Mar 2020 22:56:07 +0100 Message-Id: <20200310215631.24859-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: /pFY3fu8evkk 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