From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6566555412143800320 X-Received: by 2002:a1c:6507:: with SMTP id z7-v6mr418039wmb.12.1528895327629; Wed, 13 Jun 2018 06:08:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fe8c:: with SMTP id l12-v6ls1504024wrr.2.gmail; Wed, 13 Jun 2018 06:08:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL6iV2/dWpNeZwJqC+sInsK83WiPFwckUT5rJmZ0qONJWLCXs+AzSowHqUMixkpnwtIK8lw X-Received: by 2002:adf:f7c5:: with SMTP id a5-v6mr457710wrq.14.1528895327218; Wed, 13 Jun 2018 06:08:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528895327; cv=none; d=google.com; s=arc-20160816; b=bHNxOeqQEfmNTAMre4UiCrQeFxqesvqOM/lmBowM/buSO9vVH9ZocULuFLOjprGwxe sGzZk4nbtX0mwmatZjJe/vuo5doR2uHYTU9Jlq8JrXw2m2Cy8ToY7eKUxAxAnmty257z Va9Yl6tUbUFDxNQ7AzdpnwqbtB0RetQvJhOv5y2IlmpmZ1vfhlbqsM+jEYDkYkjR8N6Q BBxTTEvUs2x4p4+0b3dfrr8qBBgxDbKtwA7V1ex2nxS06wOG3P5UFxY2O1Ersj37SYx3 c4PzEv7l3vvTPgV7JV+LkWE55xd5JiiEdUDMq7P46gLsVXIWhvM2f086ENxBJZ/9nQQS JGxA== 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:cc:to:from :arc-authentication-results; bh=MXi9BEr6qLPqLZZ8+4kOX+Q4FeJ6vP9zh8pplhxfAMo=; b=txTHQvjD4oytx/pbNLJGt0mzYw32DZYWjxHSj62f2Vf04ahnuWk4n73476fWaWiGky I/oq/iPpgwZDKGJ5qsvSo1/2cZznrEPxI2E0w8o+44Z1uGeYOJL5Gq9KGBpsX4MRqdCg DuxXZRaejPtIPTTmH4RJK3bHN08fKD6mN0c6uIjunnOr9bPxkpnoAoAut7HiTr4XozcW aBzV+eRSDMOD1V9TeWtURFexWQ9PHVhHFUvBdpMzDfwtQ2H7iFwrxCBYaQzwTE0j3wId 24cuGKTJ+PPZmnU/VLrnuaZRGfYYhpbWxwsN7ghSaWov4jQl6f1wI1+SjIroTkmRdioW WMHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id c18-v6si74573wrq.5.2018.06.13.06.08.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 06:08:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@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 asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from azat.i.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 w5DD8P05030010 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT); Wed, 13 Jun 2018 15:08:37 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 6/9] classes/dpkg*: Relocate dependency from buildchroot Date: Wed, 13 Jun 2018 15:08:04 +0200 Message-Id: <20180613130807.2461-7-asmirnov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180613130807.2461-1-asmirnov@ilbers.de> References: <20180613130807.2461-1-asmirnov@ilbers.de> X-TUID: msRqWw16wQa8 Move dependency from buildchroot to the classes that actually require buildchroot. This will make possible to re-use dpkg-base class for buildchroot-cross. Signed-off-by: Alexander Smirnov --- meta/classes/dpkg-base.bbclass | 3 --- meta/classes/dpkg-raw.bbclass | 3 +++ meta/classes/dpkg.bbclass | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 75b45a7..24fe2ca 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -14,9 +14,6 @@ do_adjust_git[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" inherit patch addtask patch after do_adjust_git before do_build -# Add dependency from buildchroot creation -do_build[depends] = "buildchroot:do_build" - # Add dependency between Isar recipes DEPENDS ?= "" do_build[deptask] = "do_deploy_deb" diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index 28233ac..5c7be6b 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -6,6 +6,9 @@ inherit dpkg-base DEBIAN_DEPENDS ?= "" MAINTAINER ?= "FIXME Unknown maintainer" +# Add dependency from buildchroot creation +do_build[depends] = "buildchroot:do_build" + D = "${WORKDIR}/image/" # Populate folder that will be picked up as package diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c8d4ac5..c483fe2 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -3,6 +3,9 @@ inherit dpkg-base +# Add dependency from buildchroot creation +do_build[depends] = "buildchroot:do_build" + # Build package from sources using build script dpkg_runbuild() { E="${@ bb.utils.export_proxies(d)}" -- 2.1.4