From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6572049490740510720 X-Received: by 2002:aa7:d2c9:: with SMTP id k9-v6mr2144131edr.7.1530174519103; Thu, 28 Jun 2018 01:28:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d68a:: with SMTP id d10-v6ls1896167edr.8.gmail; Thu, 28 Jun 2018 01:28:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcSWiNsHLXkdNa/FOZ2cyCNzPs9ZFjMYC1+nIB6GEzltS6Y592TJ0hlhCIg7x4qc4cwU0fH X-Received: by 2002:aa7:c6d7:: with SMTP id b23-v6mr2155425eds.0.1530174518738; Thu, 28 Jun 2018 01:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530174518; cv=none; d=google.com; s=arc-20160816; b=cfYJLElz02q95euc/yVnJV+vZq9ab9XQgQ4MVMtYBbXOxramJfywyeBnd3W9RBw0+W UQCCRLKSc+FO/YI617IfjD3c+tm7VA+mgRWPS9H0cC+2R7DtY7FvPpTVeApsaffZgb9+ CqEB/wMrpwK64NP/Pcoepjr5MS0rRHvLwmbtsxIrPz5wc3/eZBIrUeAw/4XgKjpzoIh1 UQ6a9PViwLTM/PPo61Ir9yva2XHEmCi3UiNKbOC/UmHcxOQfO1eBsArrVc750cmxxEVo GcmcUFT6lSsNyijjyHascYw/nSdmQ30LpQyN6gY5xlhqdaxoZEcdzPM4Sz9953dLOSEl evsg== 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=klqMt01LGfXvveGmdprX0MD809dXb7JVbH1lP8Bpf24=; b=pfdfM8jcp3MCZuy5PYPDKQz4U/81QgRZ+LxB5sAL5VLVHn7Yx6Q4AOZn/ghU8lMpHr SgMk02Y5ilm/mCdiLq5czND/cY8geO9mMPoaCjYt+zysLWFqpQOrIKvrQ/rqB3XlSe2z TAtg8nCCfeLJftbuicQJrJZO98KyRt4HBzauj6ApCmcW7FMHlouQwvOzDT/cZnfh7d72 oLU8+dy2wj+Jf3DHW26jnJWimqqIi9JqVLblw6iJfS57SoBL5hEcxT4FMmRYomYlhL1V 6677Yzc2H6en4nw6RBsEYFZQhgdc6HtULE69ik9MZEKx3/twu1akVatnVQBOvzD9U2RX gm+g== 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 x7-v6si282539edh.5.2018.06.28.01.28.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 01:28:38 -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 w5S8SEqG024070 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT); Thu, 28 Jun 2018 10:28:29 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 10/12] dpkg: Resolve dep from buildchroot Date: Thu, 28 Jun 2018 10:28:08 +0200 Message-Id: <20180628082810.3571-11-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: L5qyCL0x2A9t Automatically resolve the dependency from native or cross buildchroot. Signed-off-by: Alexander Smirnov --- meta/classes/dpkg-base.bbclass | 16 ++++++++++++++++ meta/classes/dpkg-cross.bbclass | 7 ++----- meta/classes/dpkg-raw.bbclass | 5 ----- meta/classes/dpkg.bbclass | 7 ++----- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 0668e25..ad440ad 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -1,6 +1,22 @@ # This software is a part of ISAR. # Copyright (C) 2017 Siemens AG +ISAR_CROSS_COMPILE ?= "0" + +# Add dependency from the correct buildchroot: cross or native +python __anonymous() { + mode = d.getVar('ISAR_CROSS_COMPILE', True) + if mode == "0": + dep = "buildchroot:do_build" + rootfs = d.getVar('BUILDCHROOT_DIR', True) + else: + dep = "buildchroot-cross:do_build" + rootfs = d.getVar('BUILDCHROOT_CROSS_DIR', True) + + d.setVarFlag('do_build', 'depends', dep) + d.setVar('ROOTFS_DIR', rootfs) +} + do_adjust_git() { if [ -f ${S}/.git/objects/info/alternates ]; then sed -i ${S}/.git/objects/info/alternates \ diff --git a/meta/classes/dpkg-cross.bbclass b/meta/classes/dpkg-cross.bbclass index 7e5a1fd..f097dec 100644 --- a/meta/classes/dpkg-cross.bbclass +++ b/meta/classes/dpkg-cross.bbclass @@ -1,12 +1,9 @@ # This software is a part of ISAR. # Copyright (C) 2015-2018 ilbers GmbH -inherit dpkg-base - -# Add dependency from buildchroot creation -do_build[depends] = "buildchroot-cross:do_build" +ISAR_CROSS_COMPILE := "1" -ROOTFS_DIR="${BUILDCHROOT_CROSS_DIR}" +inherit dpkg-base # Build package from sources using build script dpkg_runbuild() { diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index 1b661a7..a6865e7 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -6,11 +6,6 @@ inherit dpkg-base DEBIAN_DEPENDS ?= "" MAINTAINER ?= "FIXME Unknown maintainer" -# Add dependency from buildchroot creation -do_build[depends] = "buildchroot:do_build" - -ROOTFS_DIR = "${BUILDCHROOT_DIR}" - 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 87ffbce..5420289 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -1,12 +1,9 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -inherit dpkg-base - -# Add dependency from buildchroot creation -do_build[depends] = "buildchroot:do_build" +ISAR_CROSS_COMPILE := "0" -ROOTFS_DIR = "${BUILDCHROOT_DIR}" +inherit dpkg-base # Build package from sources using build script dpkg_runbuild() { -- 2.1.4