From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6572049490740510720 X-Received: by 2002:a50:fc04:: with SMTP id i4-v6mr2142581edr.10.1530174516914; Thu, 28 Jun 2018 01:28:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c806:: with SMTP id a6-v6ls1897570edt.7.gmail; Thu, 28 Jun 2018 01:28:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcfHyII3HtXn6N+i3VAzjp6jvLkQNZb/6ILovBybuHiUBLCIxt5mD0QlxM1yhWh/xMfSDfN X-Received: by 2002:aa7:dac7:: with SMTP id x7-v6mr2136640eds.11.1530174516542; Thu, 28 Jun 2018 01:28:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530174516; cv=none; d=google.com; s=arc-20160816; b=1JDnYezY0N99ZR0HBaw4tGy1EYlcvgpMZCjmA6xPkWpmeuQR82a4W3qjApQJdzpRc0 Evt23yrYQ2xL2PX10RUAO4Jjo3rQPZut3CAFTXUOoYMaHuSCjZRSKTyGcBmsGQjpU7ax /wdbLrCoaVet5SJHepcn9HUSLvzjB4+P3NBODuS2C1aZQ6Uga+DtOTL01PKjV0BHu1Zh aZT+p6WABGfajznhSztZUCt0cCJyxfKXlHJ+pdF826ogP0btH5EjhQJNYyzquy2vYVYn ji8Zf/1jvwyxE/T1JyBs/XenFzwqUsy9iZEp9K0ADMcxifxb64Lx2bI354OpL+b0RlZm YbvA== 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=CuLU9OMxDy07yLB3HxwRCjKzQEd3aMR8VLqSgzWehZc=; b=oux+BS16TdrZTli2Nm4J2IIfJ5vowGgG1pGxH427Qq68OxRPLP+JUor8z525GWtC0K fLRGCPr68NUxjdSwxFx2PaNUd1CgOrm3iWyaImsyiS8O/dvFRuAbWUrURXWT2+KZttAw RUjr6xzBkPCx6SnfxSuKJFSjUWZoxcjViBCaSSZBjhhEDD6C1cVxODlJNZIeIFXOZ3pM I5EtuxdRzkl8cqjq80o/xLPNOwJca4LF63f8N4jjyGQ63yA33fxlW7paaKvkxCwI8HNP qeVlSBnJwQ85/JGM+lXSQ47sUoPuj0n6dQp/MKSo/rbiOkJt0aDa6RalheTgviPiS7TG 9aJw== 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 l17-v6si151749edq.3.2018.06.28.01.28.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 01:28:36 -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 w5S8SEqC024070 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT); Thu, 28 Jun 2018 10:28:26 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 06/12] classes/dpkg*: Relocate dependency from buildchroot Date: Thu, 28 Jun 2018 10:28:04 +0200 Message-Id: <20180628082810.3571-7-asmirnov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180628082810.3571-1-asmirnov@ilbers.de> References: <20180628082810.3571-1-asmirnov@ilbers.de> X-TUID: Xil03co4atLJ 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 +++ meta/recipes-kernel/linux/linux-custom.inc | 2 ++ 4 files changed, 8 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)}" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 1176b25..8eccba8 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -9,6 +9,8 @@ FILESPATH =. "${LAYERDIR_core}/recipes-kernel/linux/files:" DESCRIPTION ?= "Custom kernel" +do_build[depends] = "buildchroot:do_build" + KERNEL_FLAVOR ?= "${@ d.getVar('PN', True).partition('linux-')[2]}" KERNEL_DEFCONFIG ?= "defconfig" -- 2.1.4