From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a17:906:ccde:: with SMTP id ot30mr3787217ejb.244.1580226177562; Tue, 28 Jan 2020 07:42:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:ce99:: with SMTP id y25ls4195447edv.6.gmail; Tue, 28 Jan 2020 07:42:56 -0800 (PST) X-Google-Smtp-Source: APXvYqxgixhmShcxmaxpYPhPUN00JvBkkBAD8KlCeeojA/fNsy6jJ3QtWsEBFdFrK1ftGH/uRv2L X-Received: by 2002:a05:6402:2079:: with SMTP id bd25mr2177157edb.317.1580226176884; Tue, 28 Jan 2020 07:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226176; cv=none; d=google.com; s=arc-20160816; b=GgOhNWVBRrystxTFEwHjMRY0UmO9Lby4fQ4VGcTnqBEhgfEvGo4d/883VbmlGS/IYS 3Dojm780fNKj64lCTTIdboib92OrjuH3+ZP8FCAE9FtF3EcCdGQS9XGWskesZiPRShHJ jhHh7yRwS+9AgYK139ETqSlSeJW0NoYbk4u1cnMXCB71zywd32bDWDgtEzC+/4Yuog+v 1XKLWxqHBnJmvktDqFGsVh7Fy/nMNbMx/Nv8i+eVBKuHvsYNhYNoc5D3elxEJGcf8nA6 Vj/n8Fb+gmewRcLv+X6brS4DcZ6K33Lton5RxsTIal/WWV1VHEPvrhVZ07ULPVHuPIz5 wkbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZlCLwhSmZOCFre60Czbiv50hpZ5vlXT/VoHyfV4lUWM=; b=yh1hGaNN1FdHH2LkqULeG9qAFxn79wYEovcumVSBzHq2+VfvdB8rNt9o8ZKfWpI6HY +KrCNjvn/g8bglhkcRAnjDdeZxiA5YmpwTeNCJ++Rg6a6Wm1ZZdmksgbkCPv2TdYxlmG I0j4qiyHyvksxGxjd8Gpu7S91t4wEXlA3RnMj94AMbethnCnDf8O80n/EByJnvxtW8Si o2gQ2Db8OQHfDEIhAZZc5OVFFgc9DqxsvtWVaTih/dWJMKTPlVKT/fo3Bx6pveehKBlb cMpCmr1StB0YxhxYThPQCmTugGYoPK2VEa3QKf+I1ZYc55MTRPBuzeiLmHR8pgsu63KE mZsg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pnJul795; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com. [2a00:1450:4864:20::32e]) by gmr-mx.google.com with ESMTPS id n21si1010180eja.0.2020.01.28.07.42.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:42:56 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) client-ip=2a00:1450:4864:20::32e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pnJul795; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x32e.google.com with SMTP id t23so3050053wmi.1 for ; Tue, 28 Jan 2020 07:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZlCLwhSmZOCFre60Czbiv50hpZ5vlXT/VoHyfV4lUWM=; b=pnJul795kC6pP71hUyn1Rd6OvuBFZy0BNHndvh9Y+fLgqyltzJ7BLX3uKRDXMkO434 Pmc7JAQM8Jbqxgj5QG1VAKdc/YQRF+6DFuiAZ/Jl45cJGqSmq1S2VXWL4+szDaKiYQns BdHAonuHzbsQecO+aKbEpH2fAEqPbtMbZgs0Weo4Ksjv37DC0B8a8ROZRI6hiEKmkUmX Dn0B01QOE9LTynFELHR5hm1YDE2d0N6QVYAw/w5aX/MBdE7ngQVUrhsqgjQ9TnCg5AaV Jtcql1kTyCZDCVlzH5kmDRmqbE8JmgyxLGTNWkKukf4L/mnTlFgRdbX2LgHF6FcnLD1V hwSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZlCLwhSmZOCFre60Czbiv50hpZ5vlXT/VoHyfV4lUWM=; b=ZcgDMqz2XKLP4rEDF6zMpEFQsWcyihW3hbpTgdRfgQ4K1ZIevxNvE3FMyBPyg6WCcV 6Dgc0eSX2bx7ZCdAj+ZIh6ErkvoS56PNCU9RHf249ZraK56WYrJGmYzYaExLlLTgr+b5 HfADVxGS46TtQOVvBd/w+++bgFqzUnutGfOE4TjyV5wBPEpMV5vws+CqVE6UdEd5YlM0 4PWKdvjlooR985KNq/u3da1fawybLZsuwlJ4U6WI717pZNgVO7/Qa8SQUopYLW8hZklF CeAfIsp3e1JoeAEG/Fj/55gTHQeXl4DYOSjvgDq1iKFxIRxM2KQCx2Vq37WVIQ1f3Hiq DzeQ== X-Gm-Message-State: APjAAAViiZfr5LS0NE64nf2iWh4DGzzcH8BV3nnYuPLh5o4IkskSCSf2 LmqtczNb2n0k8D1gxn3W2tVx3KSyAbk= X-Received: by 2002:a05:600c:2c06:: with SMTP id q6mr6038629wmg.154.1580226176400; Tue, 28 Jan 2020 07:42:56 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:42:56 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 05/26] base-apt: add deb-src packages as well Date: Tue, 28 Jan 2020 21:11:52 +0530 Message-Id: <20200128154213.22353-6-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: 61eFRhZMTd+H 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 1f08c70..db25adc 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 880ddef..dc4c1dc 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.17.1