From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6806948680239677440 X-Received: by 2002:a19:6101:: with SMTP id v1mr9936960lfb.56.1584866245257; Sun, 22 Mar 2020 01:37:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9a8a:: with SMTP id p10ls2188005lji.9.gmail; Sun, 22 Mar 2020 01:37:23 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvUqIqfMPhnK03fkdNkRKPfW+MfhXIqwiBFx7TQ4E0+zoJBgwwHrdbHpH3zqD4CLTFXJmu8 X-Received: by 2002:a2e:7d02:: with SMTP id y2mr10605485ljc.62.1584866243612; Sun, 22 Mar 2020 01:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584866243; cv=none; d=google.com; s=arc-20160816; b=P5N4eYA1ukNxsq1XbK/Z6icVXCIVy9KMNvJiGsfWKpS9umqRQ3bRLF5Lf21HatkkiN 3PpWifGVMTp38ptVI9Cs5JqBsiMO8FBvQKz9FnWxdgRaJGDoYMX0hFr3OVd/eOUNh6KC 7itdR2R+3n3sSt3cmspIlQmXu+4XGMdplyMet+QjOmmimO2YFSVAz8mMYq7qEBntj8pE RIzC8AHFmzuGHC6J3igLVhGEUKAaUPga/Sl7oNLtCCRmbRTAVAtb+MZQKTDvSc/Qesm7 n3hNIi5QjUFhU9f5AViYJUCacUKWEJWwkXpbXw3nRLO8FwK8/yIyS84gMHEUuXhW67J7 ID7w== 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=VZYm2bSn4+4SwRB/zr0+zfFSW7H+ZMZU5YoZiR5Me8R/a8/KOSmpjymzXHb0ebAX7O RXDKRIUCNiLcvgAZ5WjFqoI3LDGQF0WtdF27yGfgaQhAqHbaFSGVpVMoq8DAelo4169u BH9Hq5wy84lwSP7XSmEwFCL/tqEZiAzOU++Xfuji8dS+9zJWz/JyElOgVbbIl+VDWua0 hwcb68eJDa9ybdnpkktFpB4poPluTghI6DwyyyQFs2yYYc7CzyjgsTHoHJEKLcdidhbj 4DVkLPj+Yg+Vdnmib9gyE+lTb8s7l/z6NKtY3EfItOSS+y4nmxKbe6LKY7pIqZJqvoRE nQ3Q== 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 m11si490361ljj.2.2020.03.22.01.37.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Mar 2020 01:37:23 -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 02M8bM5G028730 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Mar 2020 09:37:22 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.6.154]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02M8bL9Y021520; Sun, 22 Mar 2020 09:37:22 +0100 From: Jan Kiszka To: isar-users Cc: Chao Zeng , Le Jin Subject: [PATCH 4/6] sdk: Do not ship the isar-apt repo Date: Sun, 22 Mar 2020 09:37:19 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 7o08yMPNiVvG 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