From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6806948680239677440 X-Received: by 2002:a17:906:848d:: with SMTP id m13mr3231814ejx.348.1585394697702; Sat, 28 Mar 2020 04:24:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:90d:: with SMTP id i13ls7063090ejd.1.gmail; Sat, 28 Mar 2020 04:24:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtBLj44jC4HS/VpA1d8dlGk5Y2Uv5k3TDytsVMkptKJoaPm3pDAu8uLasKPTYn/unBQnlNg X-Received: by 2002:a17:906:5954:: with SMTP id g20mr963996ejr.28.1585394697084; Sat, 28 Mar 2020 04:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585394697; cv=none; d=google.com; s=arc-20160816; b=pa3fhmxD2LQYSUQP/ETqjkvvwptsPkrINwhJSD0Cu8D01RCWUtdrnVY4M7V9ZcxQ7b CwQZt+91R9Xqb1SiMSAu0F36Fszvap5MdVb8/JiwX52adMeaBuv0YKTYp3pbPZtjNoko BfGcadSDrBMs1PuyWKvKtN+QM2Qhg3S9a1FAmXjgParNEHvjH7Cbb0ZU7yfbYiXSCps7 7aBwvjLoUqrqpkwth+j/Lwf4AwhmqZi38PM+Ih3eZ6FsOGzZTFQsWBYxMjH1pTOe7faf +U0qrBDvf4j6AXE0c6UF1JrG1JFs4T0QxV+vm082VX0FSPr/aeS6oj3kYO/wazz+fi2s WiwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=zn+lrQZMQ5m0Wowkv/1af1x/WXKSNlTB7b+rx7yq7Fc=; b=GdtcylHAusmMOvkC3MPAn6GNYw11lS3zaorApXd116MALtlr4Iso0DwwwEfNvhYiqF 9fJdXiLE7BV46euzQeF69Ir1zNdIk4vQuERQPKt81zWrLo+QaspHlFpqpsa+oxcTAH+G UX8NiUn98gjIaaHi+eelwgvZOLYyVJ0PqKqAYV886fT6WVG0Uv8jFIYc7jfWgUPQt+Qt xnObLRIlh6XSbFPEgy8+Y9ohm2oX877JEn8jUB7mAzss8kNyR+SY5QS7bF/2cDrKC2DK Qq+aJRFwrtBXucV2Hx4L0aT87dlxSvJESifRvaNUOyhQESnp0FTCUBDH9ZWeT0QRmr1M Dq8A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id be1si320991edb.3.2020.03.28.04.24.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Mar 2020 04:24:57 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 02SBOuV3015107 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Mar 2020 12:24:56 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.129.190]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02SBOlvr027066; Sat, 28 Mar 2020 12:24:54 +0100 From: Jan Kiszka To: isar-users Cc: Chao Zeng , Le Jin , Christopher Larson Subject: [PATCH v2 4/6] sdk: Do not ship the isar-apt repo Date: Sat, 28 Mar 2020 12:24:44 +0100 Message-Id: <9708c4cf69246480ff5209a40f2a273fd461ac3c.1585394686.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: cPsdknRNtooY From: Jan Kiszka Users can add what should be included via SDK_INSTALL now. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 6 +++--- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 84ac9c6d..6e76b04d 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -8,13 +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 - sudo umount -R ${SDKCHROOT_DIR}/dev || true sudo umount ${SDKCHROOT_DIR}/proc || true sudo umount -R ${SDKCHROOT_DIR}/sys || true + # Remove isar-apt repo entry + sudo rm -f ${SDKCHROOT_DIR}/etc/apt/sources.list.d/isar-apt.list + # Remove setup scripts sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${SDKCHROOT_DIR}/configscript.sh diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 2bc9d291..dc765046 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -49,12 +49,6 @@ SDK_PREINSTALL += " \ S = "${WORKDIR}/rootfs" -ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt_dir" -rootfs_configure_isar_apt_dir() { - # Copy isar-apt instead of mounting: - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt -} - ROOTFS_POSTPROCESS_COMMAND =+ "sdkchroot_install_files" sdkchroot_install_files() { # Configure root filesystem -- 2.16.4