From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6875334414772994048 X-Received: by 2002:ac2:5193:: with SMTP id u19mr2094105lfi.518.1600788540046; Tue, 22 Sep 2020 08:29:00 -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-Google-Smtp-Source: ABdhPJzTHeq1eNy+Z7DRSDBSGx/UOsvxBKi7KW6IJsQvEzliA8VBRuYo07y71L1NXKq4Xf0ofrpv 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: upzXPZDbAvpV 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 -- 2.26.2