From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6597651406325284864 X-Received: by 2002:a19:d71c:: with SMTP id o28-v6mr71906lfg.4.1536239513765; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:93c4:: with SMTP id p4-v6ls531123ljh.16.gmail; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) X-Google-Smtp-Source: ANB0VdablXJmYfdlsSJdAp/Y50E48EnPNSBqC0+FAv0Z74wN8mSA0hhnhL2t+A1jLQGbpShbYp3y X-Received: by 2002:a2e:7819:: with SMTP id t25-v6mr59993ljc.35.1536239513067; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536239513; cv=none; d=google.com; s=arc-20160816; b=ElRRja8xjzbiFgjr7OzOTpMUdM7Lhpgrj8lko5Kpt4ALrmXBWAsxpusqfxSB+JItVH lLeYUb27Nb4LDBMAzFHhWWTTcZTaVJhAV0U1EEzRfixG7o4gmzzWQDGaXnWi2gGpclkU nHaBtjYJcTLqQ+88ckTmWjOvLghJHd3+w70IWnbEVq/4JnJ/DdZ0q4TxXR8NFsvkwRtA 5m9KyUjbr3bwdYrj/ldrSuF981/V2AbNglFVf8sQ2Kf+V5UlFgWrPj82nhmkg2RoTLKY WhDdmo+R89hR5UDAViob6eAncQuvnd0FnjdKmMbj3KOh5xwrnKbChX+wq/Y9V3zKzS5A pGfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=Nby1Lqy+SVSzGfrl7l1xDjHDqzCgjx5PXuf4LRZ/xSk=; b=OMiWcSaxBpVYFnBYhws/pMPLGqct0HXHfBBAdMht3kqThSAmAJFFx7bAcwce5OU+aL XHBkQFUrHlP9S96kcEv+JPfpqYMofntsCjjaUqz2dy3HFHmTlvCNQLAGwkgMPakwK8jl taO39EvmCXsH8jNs70vO7u8PQJf0qxh2OwBRXQcImb4unruL9Kf1rsNDFm9GMtEJqwB8 4zD6DX72CMVxFg9Jg4Ji3ijLxgjYi8/WE7NRCBD0KSA24XwnhTyAgOa2FvjTYBA2BOEd gIVwbT0YosUYt40dqfK9s9vdieayEJi+naXz6NJfxlYF4bfdyfy847RXWGHkcejgL2Ip gFag== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id x16-v6si152019ljj.4.2018.09.06.06.11.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 06:11:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w86DBRQV015706 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 6 Sep 2018 15:11:51 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v3 1/3] isar-apt-host: Remove isar-apt-host Date: Thu, 6 Sep 2018 15:11:25 +0200 Message-Id: <20180906131127.19039-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180906131127.19039-1-mosipov@ilbers.de> References: <20180906131127.19039-1-mosipov@ilbers.de> X-TUID: 2y8qGJ6SajN5 isar-apt-host repo has no sense, as sdkchroot needs target arch/distro isar-apt repo. Signed-off-by: Maxim Yu. Osipov --- meta/classes/isar-bootstrap-helper.bbclass | 4 ++-- meta/recipes-devtools/isar-apt/isar-apt-host.bb | 31 ------------------------- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 2 +- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-devtools/isar-apt/isar-apt-host.bb diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index d45cdd7..4ad552f 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -93,9 +93,9 @@ setup_root_file_system() { sudo tee "$ROOTFSDIR/etc/apt/preferences.d/isar" >/dev/null if [ ${COPYISARAPT} ]; then - sudo cp -Trpfx ${DEPLOY_DIR_APT}/${ROOTFS_DISTRO} $ROOTFSDIR/isar-apt + sudo cp -Trpfx ${DEPLOY_DIR_APT}/${DISTRO} $ROOTFSDIR/isar-apt else - sudo mount --bind ${DEPLOY_DIR_APT}/${ROOTFS_DISTRO} $ROOTFSDIR/isar-apt + sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} $ROOTFSDIR/isar-apt fi sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs $ROOTFSDIR/dev sudo mount -t proc none $ROOTFSDIR/proc diff --git a/meta/recipes-devtools/isar-apt/isar-apt-host.bb b/meta/recipes-devtools/isar-apt/isar-apt-host.bb deleted file mode 100644 index 0cf5ce1..0000000 --- a/meta/recipes-devtools/isar-apt/isar-apt-host.bb +++ /dev/null @@ -1,31 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -inherit isar-bootstrap-helper - -SRC_URI = "file://distributions.in" - -CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${HOST_DISTRO}/conf" -do_cache_config[dirs] = "${CACHE_CONF_DIR}" -do_cache_config[stamp-extra-info] = "${HOST_DISTRO}" -do_cache_config[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock" - -# Generate reprepro config for current host distro if it doesn't exist. Once it's -# generated, this task should do nothing. -do_cache_config() { - if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then - sed -e "s#{DISTRO_NAME}#"${DEBDISTRONAME}"#g" \ - ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions - fi - - path_cache="${DEPLOY_DIR_APT}/${HOST_DISTRO}" - path_databases="${DEPLOY_DIR_DB}/${HOST_DISTRO}" - - if [ ! -d "${path_databases}" ]; then - reprepro -b ${path_cache} \ - --dbdir ${path_databases} \ - export ${DEBDISTRONAME} - fi -} - -addtask cache_config after do_unpack diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index e143ae7..d6c7bdd 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -31,7 +31,7 @@ do_build[stamp-extra-info] = "${HOST_DISTRO}-${HOST_ARCH}" do_build[root_cleandirs] = "${S} \ ${S}/isar-apt" -do_build[depends] = "isar-apt-host:do_cache_config isar-bootstrap-host:do_bootstrap" +do_build[depends] = "isar-apt:do_cache_config isar-bootstrap-host:do_bootstrap" do_build() { -- 2.11.0