From patchwork Thu Nov 26 08:29:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 246 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp1570266oou; Thu, 26 Nov 2020 10:30:17 -0800 (PST) X-Received: by 2002:a17:902:8506:b029:d9:6dd:45ea with SMTP id bj6-20020a1709028506b02900d906dd45eamr3727372plb.72.1606415416979; Thu, 26 Nov 2020 10:30:16 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606415416; cv=pass; d=google.com; s=arc-20160816; b=G/w30Lc4pDX33h9p8ufqsHKIBNKfTxJnyLiPydcRGY6gFkiWBl+VOEV/XiwnxSV0vQ +rdFQWNdjvDShD5dmDQRqBuCSdJvH8ikQQHCCRV/RR8Hm9BB2YyzEFrUHcj88fDyzpXf bIdP52sYP6qCF2YR5If7DfV9xeE+q5CyrVXsNku+NYYAK564DlupldXfOcjCyBwOtCsL zlvGtK5iPoeKKMXBlN29IXnaJ5mgjgD4Wf47p5V2sPs+wcUxJ67s1UQHY2Wjkce7b3Vg cEIoTLLQ2Oprfc96KLG0RP2A1k2jB1Uo1DqFT7bak06lFusRJ/6GnlztbouheG5Rmu2X BmVg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=Sp62LBmXTGm/+C8LvVg+7LXLAqXTLmDBWdn83Cbmcms=; b=p03ypSuLKrklTUnbodNlEabLf5lKrUyUbHVTv/V5Rlu1i0zcUAlsJ1E4E4suFADQ1N oqzuGH7HGg7ZF7fd4usVXHxYmUeA0FhEp105KP+IUGt+EmAFuPKxIjURMCFUUcxDs0ic Ags7OWjjkXfN9JLZ7ZLscsf+shW9VUH6uEntFUtMl8f6snNnjUm/a5LLQq6wu+tbfr3d ashBDvmjCObB9Gzq0mOFh1GecVJtdTQ4Swplpky6rT2/CiMduM0SScsua7EyDf/JOx7E 0f4pdaRDuH3IgNvmW7ASeNb+hp3/qRl7HZCYPelysFQY3mh/eP7hV9zSqV+xOUE6G2nz CMrQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=XajWJ8FX; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbohi776qkgqepg2lgwy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOHI776QKGQEPG2LGWY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id k7sor2719886pfu.26.2020.11.26.10.30.16 (Google Transport Security); Thu, 26 Nov 2020 10:30:16 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbohi776qkgqepg2lgwy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=XajWJ8FX; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbohi776qkgqepg2lgwy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOHI776QKGQEPG2LGWY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606415416; cv=pass; d=google.com; s=arc-20160816; b=O+rNXf1oshNfJwrWB7GZYhQILHzxyr5CPi+rCZpjuDHnYnHR3K9fyv2FRJk6BmXAge Gz2njgfvig/2Ahg2je8ZV9QNr8lkeO/2kKwWpSsIdfXDtniNMSo5zKUYe2HO+GBsYxIm OSk+/QA5lIhP8XwXh472AHBn8lth2+pI3ixc3N8O4cQpY5EMW8myowQ2wz+cOgm8O8v4 nAx1IcDoDGczkDRAD1J69A/Cc0C/jooXZEmyOTXeeK6kZDLo0V+4DQNAsRudJldfZ+Xj 6RNwjQuUT7/P4VlGw6ELpheIr1F16tKvsvrINuilBw+ciNA72fCJo0CqL71ldnSjWkgJ urBQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=Sp62LBmXTGm/+C8LvVg+7LXLAqXTLmDBWdn83Cbmcms=; b=XTIoH1BZhsW7OMYtz6CpVO2dvJ5IV+CkRdgSJo20Jc5uKw5NhEOuOMmxFmpPTIZWXt oyqZQZUzfbykpC8E5EjpD7HyLDzIAw3ljvYOU7wzT3zGFC6haDGmLjoBdW5OFHUhwkDn 4JP3BZ4wwVqdkFHnQgp1X9oN9/psM8wwKaR2Rtm/JwEu7Ygroi4NYOjfshUQPw+LXaPS CwekXDuxks/PfR+DcW5zOZMN+aQxqG4eLipNuDLgFvuiuc0dVTuZ7W0ep8/R53DhmRVv 6UKs5cdz+PiJPMNerSYDclrbKJ/6VJtS8VrSPnwtjOqYpJI7VZfeOW0Mi5YwEkg84Y7f C4LA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=Sp62LBmXTGm/+C8LvVg+7LXLAqXTLmDBWdn83Cbmcms=; b=XajWJ8FXOBAMdURmnqLz7R3OoiG5Z7Gza8j8r7JWBwIDURZtayXNIH3ZHfKoVxlQsi NS3hJlJlImwn6JTWYTrAIPUHNK+d0t+qS/NNFjam93zGyZG8/LMaVfxwr8g5v39jd+PC XeYKvSKK4rxhv5hvCUeznd0zOjHoIcGlbSwf7jOacOGhs8jJJjA+tYgrviOEm31rLpNE IiT2P7KysAyMiyLaIubF+BauLIVHQwQ2PyoYOOt45Z18UdCA0jnHrfsXUIXDVWo7rEFj PutHBbrln4Kn4usqsRF/ln11MV7f84p0KKHtZKUci+jOwFZqXFiJ1m/nnY+kTNo5e3DV rKKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=Sp62LBmXTGm/+C8LvVg+7LXLAqXTLmDBWdn83Cbmcms=; b=GFyH+X0CWD14JnlVB9q/VuOUbX5zOnwAga1C/osCbqIA6OT4R2Rxyy9FiLwuVrpoVv YZmrxxHVLJo2q36t6CSTcA7s4M5IsulLCeRMPGzW14/L7LiOUi8tLcPuqtIYSFUSJe3q Fm5Wyn/Ms+jirYkJc+APkQeJV+BFlWF9MnILqz/jlhUMh0atumBpzTr/wPTIbofI+cjq w8Db5+Lyy0wbz5Mb32Tb4VxvQVybR0+5tI+tT1OXYZomYiFOPOTzkZux1DNzfD+eUiaG rN5MOG7jLp2Z9Gn20oeJ5EIC6L2DpiMpInLzraAa38JT3ucTG49kBbbla/jhadN6e6dT xUrg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530pfGZdaZ2IoWbIrYSQFwWRVI3xRS5ajOacfbRvTre6lUmLdyqu BtXE4oKz5GeEWLJv9FE5T/M= X-Google-Smtp-Source: ABdhPJzYq1rCgBfl2m3qpSdrj/LOZVy2TirSi3vp/imASyndsK8+/1shBdaaZ5SwuymNVTWQnqCQIA== X-Received: by 2002:aa7:9ad6:0:b029:197:f49b:5c33 with SMTP id x22-20020aa79ad60000b0290197f49b5c33mr3685016pfp.2.1606415416576; Thu, 26 Nov 2020 10:30:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:c113:: with SMTP id 19ls1323214pli.11.gmail; Thu, 26 Nov 2020 10:30:15 -0800 (PST) X-Received: by 2002:a17:90a:4889:: with SMTP id b9mr4904467pjh.79.1606415415820; Thu, 26 Nov 2020 10:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415415; cv=none; d=google.com; s=arc-20160816; b=JKJK65onOhpVGsr1O3AiRrgTs9sLVvS8ZF2HFsAgBI4b0UGrTqmy+djT7LjrS9VVcg xsQ6z7JEOmEecmDlJyvQ/qfxGJDyXL4VQF8uuqoDohblXn6C6V3Acix//7P2ue10tMkh l6RobwNCHgsiDwJbvPTNM3dIQ+CdlK3OyfMTX0n4IxOKev6GMjjHAO8RR1fvv6dUUeaV ygXe4unrPbuc9YA9S6Eds9gCt03huFUuPMc8HxQCm9hlhA5DpCPCfnBBojb9v27hlBJP IOVfJVkJqKZZCuVD2INoWl1RI3KJwfs9wcH7A+Lp1G6vN/zR2qpqhjyis/sJ5eQGqJQ7 KXcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=zCM60qn8bOqoKIkeGM61WLPPGgFfAXgOTi4N8UHL+9s=; b=K2BEsARPoYGMJ7TxMbPlf2zKCetW1oXSpyiTq2aZcr7H40No0DT3Va/VIx8eWUuIcK MQhf6AT4qMGr8LQpnn+PqMwQaJnBkbmJ76KV7a/26DTda6tV2MWPjvHYHtME23m8kYiG q6SfvgXmh+wxH/fxoDQ17VGlX2Wx49x7Jf5f78dkCGFhDQoeLAC4dR6nrbktx7ff+/sY h58/OzrA5aIkpxploTVGEvaAHnM3vfs5rehJWQSpC7F5nRkobWjZPlueUSLK8h608NJk yB5nCB6bSVCfjAuE4li02qBpIn7HN5/E8lIgmuU4i0BPHtdDx64dV8ht1HpjRNcnbaPn 7IVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id s12si571207pjq.3.2020.11.26.10.30.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:30:15 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; IronPort-SDR: qwIPVDMxeoDjdZEyt2aeXL/ExeqK+dMXrORxI/Mdajodp2JVS66G2nwYzem4zsV6CwykV22oZZ csjhSD0hReYwBgx2Vq9R3rnR7aQIq5MHTac0SG2HD1b4b5qXkFl6LdA6SfRW4zYdis7tqVltUb A9yCV0yiE35FTPkHjp5RkVkISuFddTNUvIKUlli1SpA6/RlAO5UNINOlaU2o7MeLm3SdtnA5Bk umlV6Wiju9XAL61s3GMCc4UjDXzX4KZkkYMgKwXtb2k8TyF+Gy/ikKVw94YUPbkFEUqrxLbWU6 Qd4= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55536074" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:30:14 -0800 IronPort-SDR: x/ppN3qpSQQHSLyXMIpXKtUfeaIkhnzWY7zvXomEjKSM0BU+nlLkEm7hqzyxIv/iTcoXoXdIQx JPe1PmzgnONWz4lpcYx4a032Xads8KZRHAiiT5ufQlHoMsigpaNqub+0QkX4Wv13dqa+wLvIJU SLZBzaCC8C2JVl0L0xEhIvPE5qRb77T9k/kOaPfdUUjDxxk/ds4bPBtZWLGmAMEL8GAduOB64E SROZK1jJ/ns5PF2+iQv4Qbl/VWOuDIxXjIurTXbfGLS2ecu/KfnOxzn3JU/2nOivPhnAHRNKRd f0c= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 09/14] base-apt: Introduce BASE_REPO_FEATURES Date: Thu, 26 Nov 2020 23:59:48 +0530 Message-ID: <20201126182953.7518-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-9-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-9-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-07.mgc.mentorg.com (147.34.90.207) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684448652141011656?= X-GMAIL-MSGID: =?utf-8?q?1684448652141011656?= Eventhough we are collecting the debsrcs as part of postprocess, it could not be considered a ROOTFS_FEATURE, instead a base-apt one. Introduce BASE_REPO_FEATURES, to provide user with control to enable or disable cache-deb-src. Disabled by default, since it is not required for normal offline build to work. Signed-off-by: Vijai Kumar K --- meta-isar/conf/local.conf.sample | 4 ++++ meta/classes/image.bbclass | 4 +++- meta/classes/repository.bbclass | 9 +++++---- meta/classes/rootfs.bbclass | 1 - meta/recipes-devtools/base-apt/base-apt.bb | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 1db6b88..3e43572 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -181,6 +181,10 @@ ISAR_CROSS_COMPILE ?= "0" # NOTE: this works for amd64 and arm64 targets so far #ISAR_ENABLE_COMPAT_ARCH ?= "1" +# Uncomment this to enable caching of all source packages. +# Without this feature, only sources of packages downloaded with apt:// are downloaded. +#BASE_REPO_FEATURES ?= "cache-deb-src" + # # Uncomment this to enable use of cached base repository #ISAR_USE_CACHED_BASE_REPO ?= "1" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0cc31dd..74fc850 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,11 +63,13 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status cache-deb-src" +ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" +ROOTFS_POSTPROCESS_COMMAND_prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " + inherit rootfs inherit image-sdk-extension inherit image-tools-extension diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 7b6e47b..1f475dc 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -100,9 +100,10 @@ repo_contains_package() { repo_sanity_test() { local dir="$1" local dbdir="$2" - local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" - if [ -n "${output}" ]; then - bbwarn "One or more sources are missing in base-apt" - bbwarn "${output}" + if [ "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'yes', 'no', d)}" = "yes" ];then + local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" + if [ -n "${output}" ]; then + bbfatal "One or more sources are missing in repo. ${output}" + fi fi } diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 23643ce..b589dbc 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,7 +185,6 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)}" cache_deb_src() { rootfs_install_resolvconf deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 8940ae8..506a28f 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -10,6 +10,7 @@ SRC_URI = "file://distributions.in" BASE_REPO_KEY ?= "" KEYFILES ?= "" +BASE_REPO_FEATURES ?= "" populate_base_apt() { find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do