From patchwork Wed Oct 7 05:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 115 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441850ooj; Wed, 7 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a50:cc0c:: with SMTP id m12mr3604539edi.292.1602079294511; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079294; cv=pass; d=google.com; s=arc-20160816; b=urQtDCxh1UxEKWWLgg1pR4X4uzdFOCPF+S6dVdoy24JTLOK274cBwNrwG0m6QN8ddb R8BNhXYF+U6x6k/C7V6s0kDn5QHHRzsYhPW35Zqv3bFWIZjcnr0D1ciR4CC8Al3B/Q5t 1CIsJ4yAx4NQSJ9sEdkmRqa69gr08mAnegFhFES4HyRtZ+me5Od4BjGNDRjeD5uSa+DI kTz2e1zOutyu7/bMM+VqFvz/XIzUp0CtmYwiJgNeRsESygtM6C7btGyYYpwBMXDQScQL R8ftEAIhPFg3t4FnjqDNq7DoM7gNuNMAGrZGo9JEsHPgUThSC5fyj69qTb0WoKY+eyNT BEcQ== 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:to:from:sender:dkim-signature; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=G12yKDtA0hBHiVz1M+mOfl2gLPIjWFnRweZgOTf51dqrMY7ScCfkZrq3mlUwr3Ejj7 IlJBxzTP7f0bsFQZ7cVZIJH1aQx3qLBulyMSJYPVcd6n/SGUDZrvShbotdUKDNf8IyXB pDWX2ZbVDV+Ow9FZMhqreipRYg4XVzp8h2Q2n4seZ5/5KfsqXn5f2qXBCSyZ6ktR6slf 4+pQD5v/MHXhKdoDHakbbe1ikTg1fDC6YFrvNfVFNk+MzihtTUnsF6/OqFk/qhTGZbYO RtCFaF331MXwKyXZGvb8ftqcPSlrunsbCHwGj1MpoBtqbbIZ5J26UENhYTdm6ROUVUA+ lcFA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cBmGG+qq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id d9sor2284466edq.13.2020.10.07.07.01.33 (Google Transport Security); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@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=cBmGG+qq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079293; cv=pass; d=google.com; s=arc-20160816; b=KsHA1xONCaOxBJjANiA5jcPyoG2cHz1SOx4qXNMfw/pKCBBWJrRGlD+rwppktp/u5y TH6vWIHxVTrjD34+0ul1YQ71e5e05/FGEfItWy6vPnb/0C5NHd/Ja4gboyopLmRAJmJ4 yANfTB0Vcu0x+WJaVD8UC3qsYLNxjZcaq3cSOnNAt62VTozjSfrie3efypi3QS6WOG+U SI8GiNt9gARW4L/vkcZEAi3o+RHpvgC7oGAXvtqXrc1euXi76v+Z53sclvung5vB+1cq uilUwgL1o4b9KwgDzUc+4wSbsqMtLHQt69k1rHxfYjsrhZ026LcdL3a/mZ3S9Efo2Cnm 1C+w== 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:to:from:sender:dkim-signature; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=y8AQa+pAN3KhcP7M1zPh/pQo8T+WPdJRXSLEOUEK3ICo8bodn6/Iz62CBpftCSc/GP NeR3qZbTlv5vYKdvXzCLDg9uj3ppyrQHAUKGMlGrSZSP080sf6q9cvN/wMwuqc55wqNu hHtodYszLT5u40HrVLdiWTZGmsOEoGOnJqsPOgA2mIqDFbK+DQid9FfPLWPaf3w1GGPL tBLOb+ZKsgKN+5hWkk5+y5lUk6YUxsZGvnh7DdiXSmvNE9goPtMvhbBthQdcaGXWnjtm iQEqWxmxQS8I9V+M4y0ZLAsRWVIZ1gahPyy66xHKqthexmR3jdoQo3dCw3f1k+xUFhkn alnQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to: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=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=cBmGG+qqg6j1PO+xmdTFvQHeQ8v808RcRcr5rwOss004LNPSYaIYJ/jJAXaXNQdtlZ s6TA2OvG9lvQwDbPwVgDI/I9bM5Ngpn0wyHf+Zn7zmh33swnArt2jc59eECzNIJAFYmL RJndoPrfrKPhQzpyJlkdUEZK5QX6Nck45Oxh0jmKk+4tYQDdRQ6Y/IB2U6R00o670Qk4 LIrC7XTE2WXJiJOYiKz62BC/7zQPhj4h77uB+hIBg4FgY++lN5YJ2MtEOhc/6g8ZYbPi MfD9hqxRNSNN4lCARHh0c7tHrL6Xx8KcRwSNAual4rNqJQKmLG9HIg7z1bXomgKhgkk4 Srmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to: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=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=hvUUM4WdLBpnELfMdquo38sMXYJvxyFVgBu2/+DUclGnEuUzmvEYeOAhnlUvn810rs DKhgx82SpfK81cC6XtqQluEUVbrX/+6TyFRUypFsDcJMhtlFviAsunulPgfTVKOqQMRg 7MywqhmYWXeHG6gIJIav8BbUPwMWA6+y14YU7xzi7bP+RsGTjRKv7xLLYHMAZyui5mfh Rn/hCe1MnS2JU/s8NFVSG5+57HJ/m1XFn4RUFVDNuus7wY3Ht//8hQwMkWvt2Kb9KdFG gh3jviJCRri2vTH4lVH9bqP/iP8BLG5oKI4BVdVdiA15o5rUvLqAaWEKvOeRYAFQ9BzB wtvg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532gXJiacpDxM4KWEPH8y/OQTBqJlP/Vnk8RT123z8/axaszM6Wv 9WY1qXE9VBFBKGChunmUF5I= X-Google-Smtp-Source: ABdhPJy5jYeCl8cMjgkYu2s/HVIeNmQmzbYqJw2Y4JvmR/pdaIFMbfRE1EgAMLUujtRsp3168C7reA== X-Received: by 2002:a05:6402:1388:: with SMTP id b8mr3769497edv.1.1602079293737; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d3c:: with SMTP id dh28ls2645639edb.0.gmail; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) X-Received: by 2002:a50:ce06:: with SMTP id y6mr3779274edi.273.1602079292722; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079292; cv=none; d=google.com; s=arc-20160816; b=ICw88qU2BaRTjrXvwAVJK65hVsCy46HJfpUDT0zWs8hd+iha4tIueVRo9wpP9UDYGF XbuWNjhj4KkFOd68IE+iyJRfaQEcFuym5F3EE3RGPNW0VXLsRPfEktdemfhkJG/ZyCLc SONkuVI2yXM0meTrDD89RPx8RgEyDvTsOpWmSLqJ00aBJBlcn0Whh+PnR+rWR560OIzy GjX+XeHttzM+1d1eUZVjZEz1AxU+VwiYyqR3d+87I3knTPdjrvnQWG7fajaftdnUyUuG cu7cJf0A1/BCrwd++aWJaU5z69DjVCxaTSHQt8OsUfyuXX5SLMI1J6oqakeUt1Fm56oC VlUg== 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:to:from; bh=CFPDpFUkZTHfSNPmedrcRjABPWniaOUri6zmQA3qcCY=; b=yP5hKZsr2/56I8Xj/bhBoYsXArAqjaOuH+DC6EwgRI3tnYXM77wX9fq0hTKem+O7yQ 1A1n9xl7rqfPfRH5C8uNou/IW9YyigwKwnOkJweIkrpZ4thL/pLYZ2zeEG7JZM27nCRn cqQG+gvg+lylwSMtxg6eeSsyHxELlO0Gr5krfpJ7hyW4P4jV34MDusFwRLwZjlhNlQ7Q CQClYr5sEY3zWI6pZ8t/8eAaqegHy6oy35YosI80RsYhfK3qs2bW/42r2YRRTymJGOs/ nBjTGGfDOvjQ1NCQNoDh5Pbi6b/iH0IUh222Dj52qI6mbxG+c2vEPwozlrQXFiREGDtV ZJVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id g25si61706eds.3.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1WmJ017881 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk7019880 for ; Wed, 7 Oct 2020 16:01:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 04/13] sdk: Make shipping the isar-apt repo opt-in Date: Wed, 7 Oct 2020 16:01:21 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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?1679901898636117128?= X-GMAIL-MSGID: =?utf-8?q?1679901898636117128?= From: Jan Kiszka Users can add what should be included via SDK_INSTALL now, so this should be the exception. Keep it around until we decide if we can drop it completely. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 12 ++++++++++-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index b6e9ab09..cb4fb55d 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -5,11 +5,19 @@ # # This class extends the image.bbclass to supply the creation of a sdk +SDK_INCLUDE_ISAR_APT ?= "0" + do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" +do_populate_sdk[vardeps] += "SDK_INCLUDE_ISAR_APT" do_populate_sdk() { - # Copy isar-apt with deployed Isar packages - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt + if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then + # Copy isar-apt with deployed Isar packages + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt + else + # Remove isar-apt repo entry + sudo rm -f ${SDKCHROOT_DIR}/etc/apt/sources.list.d/isar-apt.list + fi sudo umount -R ${SDKCHROOT_DIR}/dev || true sudo umount ${SDKCHROOT_DIR}/proc || true diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 5fba09c3..06f8a6e0 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -48,9 +48,11 @@ SDK_PREINSTALL += " \ devscripts \ equivs" +SDK_INCLUDE_ISAR_APT ?= "0" + S = "${WORKDIR}/rootfs" -ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt_dir" +ROOTFS_CONFIGURE_COMMAND += "${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" rootfs_configure_isar_apt_dir() { # Copy isar-apt instead of mounting: sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt