From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6880878174534631424 X-Received: by 2002:adf:e6c4:: with SMTP id y4mr3303043wrm.423.1602079296588; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:428e:: with SMTP id k14ls3026684wrq.0.gmail; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/TS1nAXMpgFm8w7wsSGgKKMDF7AZ6dGwm+YryOJ4DQbCl2js5Ikh7ryD3+vc/FNSGgWP/ X-Received: by 2002:a5d:4908:: with SMTP id x8mr23428wrq.189.1602079295319; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079295; cv=none; d=google.com; s=arc-20160816; b=c4WBbNTc4iU8HBPOslSc0Mfq1y++aQpcp4sEoR3Vy0nigkOGVHex2J0bTXhWxv/b8U IBM2aeuKkvs1wwbIB3drS0/btTwH/Mo98hhNnwI/+R8pXf5k6lontyvS8jWYIS5INn6b kewdN+AJnHz0kNlUfmh2nM83iG5EGx9Yjo87MbIY7TnoymZTvuxW7R9QHm8pgv+4EY8f 9uIM8t+4qv5CbZ2GHw75oU0Q5QgUY6LH3ZD9WD/HPkdDfXK3X2qXTE1nXXCI3KJTaE9Q 4dKJWvxGuLyzfFJI1C/hkhCyaJcw1gNmpmAflUoPthWvXwnZd6yAWR2QcvM3bbaOal+7 26fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=JhadybXlyO5h1r6YpwOlkxXeCJbRhQKLlyniQILDszg=; b=NkKdSHHZzvC//fiSiXXlV04mcxjhukNaJaMyUIHmgmqL3KNAsQXPIOybvAVqRrbl/g pORVq52p7u4Jagv2lcVqmGw0Jbo5X9FHR2FBQDFfmj2OYlMYCS1+5iA6SmK2pJMDzvOR agRz7KluaafnXAw3KJYidu+Nt/9xntRTYRwBb22wbTvL4ORDHENegapNk5iWxiBSW303 lfb6Iz4Vm9yh+wLsZAmjI1ZiNaSY2KKdbs9iYCzJAqttz+ZHQrvRQS01uq3q4U3paTWe lV86CLBaT4Z1iK6Sv96BjtvGbmKtPC/MxJaaBTn7OSzyPBLSS+utgiX4W2rjDQ+OqF8o zTZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f3si233782wme.3.2020.10.07.07.01.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1Yph018032 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkG019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 13/13] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS Date: Wed, 7 Oct 2020 16:01:30 +0200 Message-Id: <78e84769718556b15a8a81b927df68c11db591bf.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 5PARE8EKp2eL From: Jan Kiszka Aligns this recipe with deb_debianize. Provide a compat path along with a warning to ease migration. Signed-off-by: Jan Kiszka --- RECIPE-API-CHANGELOG.md | 4 ++++ meta/recipes-bsp/u-boot/files/debian/control.tmpl | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 10 ++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index ac9d8d63..6e40fbcd 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -252,3 +252,7 @@ with ${D} which needs to be filled explicitly in do_install as before. ISARROOT variable is now removed from the bitbake environment. It is unset after the initial setup. It is replaced with dedicated variables like BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR. + +### Deprecate BUILD_DEPENDS in u-boot-custom.inc + +Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl index 0ab3a295..9379be7d 100644 --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl @@ -2,7 +2,7 @@ Source: ${PN} Section: admin Priority: optional Standards-Version: 3.9.6 -Build-Depends: ${BUILD_DEPENDS} +Build-Depends: ${DEBIAN_BUILD_DEPENDS} Maintainer: ISAR project Package: u-boot-${MACHINE} diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 41124fc3..34bf91bf 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -16,10 +16,16 @@ inherit dpkg SRC_URI += "file://debian/" -BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" +python() { + if d.getVar('BUILD_DEPENDS'): + bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS") + d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS')) +} + +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "MACHINE BUILD_DEPENDS" +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" U_BOOT_TOOLS_PACKAGE ?= "0" -- 2.26.2