From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:4b4e:: with SMTP id w14mr12860672wrs.187.1580481003551; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:65d0:: with SMTP id e16ls4328049wrw.1.gmail; Fri, 31 Jan 2020 06:30:02 -0800 (PST) X-Google-Smtp-Source: APXvYqy8xqRXE7t4/60HL5sB19vfchmQDcdJQOH6gyWzq7g4z4ObVVS4f3GrlWEher4IrYH/1IdE X-Received: by 2002:adf:b60f:: with SMTP id f15mr13064205wre.372.1580481002872; Fri, 31 Jan 2020 06:30:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481002; cv=none; d=google.com; s=arc-20160816; b=U+B0tigg2EbVXq465n8cgQRTeIQL/ErFppMgjWIl7t+owTGC6RJBwNU3R5/FQQmB3s nXJ6FHXYb/TVbxu7TcTI/NLYPs8X+JxJLwPkdfn8F6I1HvTYoXD9CMSwLh1jXrFm75PN IrM6axRzNshZjAFHMUVmU188Kbhtix9D2nrHLCvbTIffFNQMeNxGQtxtodmZv63e0/BE 7m94l9qr7JKwJWpkSpK157ZEMBqmGjTz10x6YGL0tr7r1XMRz08346Y87mbhOZwfpNi/ Fuk3HJfuyzpPSFkWGXH5DfQtB38xmgwQH65S2wQfTAkGVfoc9Johjff6nZNYjtfATca8 zVvA== 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=qlTPwu0pHAGz62dJfIL4qBSo8v4yEUslAqQdTtc/lRg=; b=IJlm903MLhgSXwAYNTLoMWlyGNhVoYWGffgr+R2sc5SJJN/s76n3VPuxqBbDr3pnUM upUUEmoKSpO26gqlHcjtlBsbsDYXFWRCK9hmImBa+K4NgVyeS6qZDXmXu5mYuS+Mcbyg Fh3J1x26ig45PVfaP5nOXuEkJRxf7i3uww6NHN1HmpUxmrZyNiyMqy/l87Ya7W7nMwe+ nlwBESEINXGuDtAK5LzATctqIOdpqWSDKsdmJw2jM23VYQFPzC0fNEfOxUYDPUELazAh X8EMgGquTNbwqduUUgiMCm+746yvfgKXX6mRdBQXrKuHkNnIUNprb12uECnws1NINmo3 hH+A== 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 d191si456550wmd.2.2020.01.31.06.30.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:02 -0800 (PST) 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 00VEU2j3022717 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RJ030231; Fri, 31 Jan 2020 15:30:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 05/26] base-apt: add deb-src packages as well Date: Fri, 31 Jan 2020 15:29:39 +0100 Message-Id: <20200131143000.14873-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: /Yx9RkK7hfi+ 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 1f08c703..db25adca 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 880ddefc..dc4c1dcd 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