From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:adf:b603:: with SMTP id f3mr1480255wre.306.1572463393024; Wed, 30 Oct 2019 12:23:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f091:: with SMTP id n17ls341060wro.4.gmail; Wed, 30 Oct 2019 12:23:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzG6/bCxFQqt4tp8Cc2f9+ZaSK6Nd/tgfZmoy08VHx1hEFQxWx6wUr0GvMjfPuppigOSI+q X-Received: by 2002:a05:6000:4c:: with SMTP id k12mr1543040wrx.100.1572463392426; Wed, 30 Oct 2019 12:23:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572463392; cv=none; d=google.com; s=arc-20160816; b=mheVwqyE2uUaY1X1PdHutPhttGg7Z1InT7Xwfs5nEEBlvr4OLEEsowaP8yvGJbB+g6 HB4MkxRahFIAGpzIF0bKoWfNFy9FjWZHq9poJ6UIlrNlf7hNAKSrEb7WswK/EaTdLJBk zcDd3jNnnMbolboSuKvgzSA36JjXAQPvGIWdg8Ut0BEE9lQOij7Z8SbW6H/VmZJnqplh +s0P6KiU13OVbeqc25gh36883W3nkUQ4jXR/qaPsuzrApbDydExCVqxKR6mR8LyQyp6C 3dT8r4SjnlcBls4JztZyJVhAwk+pb9G1EPJYMc//jo+rqJFu8huCLe2+tYElRFrEwSev rp5Q== 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:subject:to:from:date; bh=dF/45vssVDk5cmJe6q1NgLOzEhFFRJVL6D12zh88p9w=; b=ZFHTmSkd1UXnVu54Cr9iTVwfaMh7QjNP1KT2Od8MBA4heF68x0aQGGynkPQ6SupUKz GfSfznfp0LilO2AllurQtqBj06LBaJcEqdrZPBTy1ROS6h6nFqEojnW5lacpr0Rk0Cla yNX7tGJWe+JRzhjIH1Iy/xpHvEWC/H3qqSrTGV5gnvPr3O/bXfI71VTPorXqjZx5j/BY kYeWWDDT+hShgIAOVR8wDN6kSFQUQje82FTpmlUh1Eo9MWXkUwIYso+65SjKrcOBG+0t OYPZBVlLCmAPp9dZyxsAGTNJIrn3bREWNVDox2nRXRlReiIM8UXT8dhq9GYZ2oaO58rO NnwA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id e17si126375wre.3.2019.10.30.12.23.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2019 12:23:12 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9UJNC7t016524 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 30 Oct 2019 20:23:12 +0100 Received: from md1za8fc.ad001.siemens.net ([139.22.36.186]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9UJNBmY017437 for ; Wed, 30 Oct 2019 20:23:11 +0100 Date: Wed, 30 Oct 2019 20:23:05 +0100 From: Henning Schild To: Subject: Re: [PATCH 04/17] base-apt: add deb-src packages as well Message-ID: <20191030202305.4ca2ccc8@md1za8fc.ad001.siemens.net> In-Reply-To: <20191028170132.28072-5-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> <20191028170132.28072-5-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: VnbFyjOsb0WI There is a small section in the user-manual claiming that this does not work, it needs to be removed in the next version of this commit. Henning On Mon, 28 Oct 2019 18:01:19 +0100 Henning Schild wrote: > 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. > 14230 > 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"