From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6880878172096692224 X-Received: by 2002:a17:907:33d2:: with SMTP id zk18mr3600360ejb.145.1602079293782; 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-Google-Smtp-Source: ABdhPJxUDL+TmKDz1nWPVEFy+qO85d/u6PG+7fcnkEyIvzdWsoJ2D0bwDoYM1vi4QVX6Al33RKXM 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: 3C8Cv8qKpVHz 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 -- 2.26.2