From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:4847:: with SMTP id n7mr9894541wrs.182.1585230212687; Thu, 26 Mar 2020 06:43:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fd03:: with SMTP id e3ls2844665wrr.0.gmail; Thu, 26 Mar 2020 06:43:32 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvDrTmBTjxvDY+qJq+S/Cr6Xnh5CVSzqLo6O4ny/IA4vRExIW1DWcyvDjRD0AcFq2r0eM1/ X-Received: by 2002:a5d:6104:: with SMTP id v4mr10032064wrt.213.1585230212198; Thu, 26 Mar 2020 06:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230212; cv=none; d=google.com; s=arc-20160816; b=bjWbr1tPcWMM1le6eBkiqGnSeAzs/chUlbhgRr7o1pS7pXE/r3AGDQN5EqQSy3yktI T65szk2Xpah4AmnjiLH0vb/f2msvRmO/kBttXA2l3pwKhyQuwqoAgnCA3YwFhL/UBmpj Wv1am4JTdL1DF2Ft9FYhdbQdsEfkTUb8wOIwgcVrYLt6loamw4zcYf2Wh9ZZvDb6hyBP 4oqukiKzjMEy8ii+s10zFYqvg7pa18KTi5d9ic0R2GUsRRvRDhH4P/8CigWD6F0ycznT vRCqdFExZj2lPKnNkQiVvHy3KdYpNgbIf7VyRa8tJwO9KxJwzXxd7I7kK4aJWfVaix3K hEpA== 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=TW0wK4vGkSgAlYEKL4+uA2zV/D7E/kDHoYucnCj9Pcw=; b=bq4Zx1FvIq7Foj2Xw7yR4Y3YDDpeUQc4uZHmz8cM6KcJr1TAqqT7aEu3XcEsw4H7f1 kL8D5ggRU0AyScnOIOjZZgvfSagXjAWhiQizYO+WQwBuIldGvEcPtS4S4KImFm5NO0CU UBupN5qIAr6436BohcTjOWTO0R9/PhzcOy1igC/Q33IOxWQ+oDQioLd63WhR2LAO2gGI EYmLsjwrf54S/uAXYHP+rJBdDNIm0UB9ERb+wrfRrfaWZawirT+ptaoBkAjb+gILmzq9 LgQNP2GSvmnUVRanNPpNjBG+ybuNBsjRoygHzqGWuee7Qsi9NJnilla7M1euJaezzez3 OlUQ== 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 i22si175363wml.0.2020.03.26.06.43.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:32 -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 02QDhVaf005996 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:31 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBb031897; Thu, 26 Mar 2020 14:43:31 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 05/29] base-apt: add deb-src packages as well Date: Thu, 26 Mar 2020 14:43:01 +0100 Message-Id: <20200326134325.8672-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: r6oe743RXSGV 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 6fc5730..4be7ad2 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 cf0fb5a..591ee04 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