From patchwork Tue Sep 22 07:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 71 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470934ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a05:651c:107b:: with SMTP id y27mr1560670ljm.338.1600788540546; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=j22Ot5OKSohJZfRz2wBi2t+AyI5teJQ2cDDAG9gfghhNuuzGp5bqzul+8tOBsQnQqI uWb1XUj8edgnAvwm6d7oKlfOzDXNP/MdelRSSgmoLkW2+rzNonkar6jbpj8cuOSfwbHQ ykmUwa8THNct/Pv9jyndafoV6HljHc4XlmwZUO7P7/VI0801VAbDh6rdgDLENyfaWAeX o5XM5dj/79K39B5RirJrzzDhqz+Zm9lGtRMJD5p2kHmCRg5k1++GF3GycfUwrcInUOnC Zhy/gfZHP2zUa9UjKY8UwFbWLvGpv/xUKL3h1pKFQq++l/HdlTaCmjRBRHMM9SVTUAhN AkjA== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=oTsx11Ikd8K3Q8u2LDGFttfSwCZr3oDyp3nL4xtMYDZHRiVpQ8ZA4PQj1xUsR8/loL EH1ezXoNtgO8m6CIrk42zN51txgtfH77OONpufxrld6RLJfgYUl9s/QqRlwhgFxepYBw zKwhbk35bqTjId5+EJxL0Irt+nu+GkRM6z3NysiHF/wjhBK/oqxyVft8kSXja8BkYDz6 y2x3wRf2RAwv6cZ/PM9Kiqp1eMH2UR/eQe9IFhP4uFQ8DffVR9iSGknS2PHxx49OPKxs CoM6CAuZ1F9opNHwbX81iyw+DKTt5R63XCkQzrUVpeK+ePpsJrABS7mJ8SucV6GdgB+5 q6bQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=KM9vKyP2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@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 c14sor5017567lji.35.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@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=KM9vKyP2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=Fyv7NWCAGch4b+cmdzxI1fWOOiHOoCFFn41sJkrZCfaniFO5Sko0YfmqPUp/7K91d0 q6rfcLYvPb7pcmIBpPrR+O8Jo6tQmxBp8SfVqX0QE6mUydDsZ8llCFtgDMROHgqT+yr3 wKbtky9q0Cyvdf7Vnso1MboQpl5MEWFZ/yCM3w8LxYQiz3sGgU0jHrnk+zjB9m6fx3Xs diu/ziNd6DfjJS+Bv4FPXPckxRla7bV+ESR6v2jK0XvxzXeq+0e9Tucf03QELQg4HCEa gAqNjo9fpcd9N83wrFXUwBvn/mDvcTF5GrDfgocrrZzrpWJr32rRAyMpGeY0JRGlCl0P Kq5Q== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=JjrISEht7Jdygp13S+OY4BS+OuZBqSlDxxgxunNJR0r95GLJGu8jdvQEwpeMA84zzY N8VxviTnw315U9/xeAOh3JHZpcKBii/TEUyLFqCzQupFdxPLed++L2g8woN0SdVxPDOi uFlNBy0yp4hdnfqnhApCGZ9b1PD/uUoQBepmu4xlO28T621EGZqpoHcs60rD7H1m1bli I+msIqa2sMrojxcgIfpWkE1jUJIE7vCx0kqDjXdfeeSGH/D7UeyIQBRkwrSiOGoZalvL rhA/vJh9xOn/aNyf4Ob4jpx51RbJr93tGVsA5AZdDkCFL1FVJNtsO1n+5lGVw8+58PTg MNUA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=KM9vKyP2yN5GzCFXTJiP8BjZoiJxPQr+6jnWO/FW8Hp/A/xWhqIexyJMGHPFdRQYV0 x9FCEqx+BEQ2+9SFlswZO9TWXuBpfiIoETR3fKWX/einOQBwIbCcDxEmKM/ovNzWJ4Eo z4Dm5g3jbYOUhUjLLrcSYZMsXx5taSqsDJAyCmdgkPWS30TcG3zIWL3yarXjMFCuWxOR Kq9jk/OmTi9wxlwrk39IotoR80HtdJc2JyA2Af9lbKyPGvyg9/HhUNYZPqE/EAQyO/rG /1eouqrxCbvXAs700T8QfUUGlIDYxmLM+OMh0Ax1+XLtlfDK2q6hi3Lj6EZO6suRceUT F61g== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=OPaJKe7IwgPgqTPlUpVYlyOAwQbVdPzsLPPebscfoV5Um/WlP0WPDxc1OK3p91kLyW J/dyJrGzhyTRPcd9gWxvIJN/V6r6CflunWKGJrVwRyDtAcb7sE3Bevz0mlu9cxuJYGij PnMh1UkzmylI4L043FD4MQqYRxBZmUmyWXZtIRDs6iExKiNvVGvdD+ud7K1oDQ9aiXe0 pSgIOVGUS3m2EuyjtpCfuaqjrP1Nl9ZNGTpgtqXk5HRyTNhaZhpT9dJ/m308FRODkjcU aNFU0BCf5vPtD2pCFXDzKEk6CyUgagZqmjYhwBDIFd8XkSGZvbF0RYfpVnnytyGS1ls4 lw6g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531qc9sJxwzWNKNns4fOltM+iz7DDvby5bJ2e58Z5kg4ajWqq48F NWGXZv5GRk3fabXg2jdqgQU= X-Google-Smtp-Source: ABdhPJy/UorMN8wE3LutZ/ZxnTepFRzszJ6PXBkH8vdb6uqFjhiRpg0WB4RXzLdY2VyzwOKouNj6pA== X-Received: by 2002:a2e:8884:: with SMTP id k4mr1763271lji.333.1600788539968; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:544e:: with SMTP id d14ls376246lfn.2.gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a05:6512:370f:: with SMTP id z15mr1715276lfr.289.1600788538795; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=DLtW8lfRVjhjI8CohNMq7Gd3Bv7tZv5hqvZ31JqACixv7fjTRZDrKFbuXw/BoL+YZ4 8F8kjynRD/mtcZrkMEccrEre76UMOzbt5oYWfG+oywvo9cl71dYhDVpuQG+1Fw2rPzxn MGBMSRi6KphSQuuVr3MqMb79tcudjPritS69t2gbvGff2z7km1cSZzKx1MYjL+TVPz0J mnyIu6Kz7d5T53ehUeMY64Byx47f+a6HK2/Oiadp7j9dwUQaFoLhhp0ykTecr5Bqv6AG ZkVNkcExIxtEjH2lOjlqkQIZc34I2wtu4YjFj/DlwgRdRhsjcvRuiivFhG81/B3SjmEH d7NQ== 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=KTA3tzWjq7+P3Atk0mAsFLqFG5Ob1SvgbkB9iYC33Ws=; b=CX7RvBTwheQO6XC6JeW1WpT7gHbYubLi2WOP7n0gHbIdyY9NB6DTlSaB0+VwZN9gHZ 2NKcW1TSFVshSaz9BbCFrCdlpcJQ7pVDhKh5jMUSIHXF09AoUKQUSp5/GwQ37RlK9iVB 3gK9FZpxPqHOPUgMIoDY6eDHVNRu645Uh8iUVhSJrAxnXvJKTkao7Q/b6Jtg/ffoWDns 0KrG9AllmtjHCIEDPmwhO5cCnQX6Cr+7gaCzzRku9zdR7belVTrRl9iztBbFYCNNTepl xkWVZiBujY/rCB8dGWoAz2QrNnkgNpeP/EreA8fgzVcZs9dAOjeesF1TypEoh5LY6BcN iMjQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 138si373323lfb.12.2020.09.22.08.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 08MFSwV8008501 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVC031723 for ; Tue, 22 Sep 2020 17:28:57 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 09/16] sdk: Make shipping the isar-apt repo opt-in Date: Tue, 22 Sep 2020 17:28:47 +0200 Message-Id: <727bf9c021e03e0fb9a90239c2062d624c0f7552.1600788534.git.jan.kiszka@siemens.com> 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 194.138.37.39 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?1678548445071139002?= X-GMAIL-MSGID: =?utf-8?q?1678548445071139002?= 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 | 9 +++++++-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 84ac9c6d..07a53410 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -8,8 +8,13 @@ do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" 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 2bc9d291..e5d44e73 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -47,9 +47,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